katello 3.0.2 → 3.1.0.rc1

data/app/controllers/katello/application_controller.rb

@@ -54,7 +54,7 @@ module Katello
       end
     end
 
-    rescue_from ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved  do |e|
+    rescue_from ActiveRecord::RecordInvalid, ActiveRecord::RecordNotSaved do |e|
       notify.exception e
       log_exception e, :info
 
@@ -168,7 +168,7 @@ module Katello
           response.headers['X-Message'] = @enc.gsub("%2B", "+")
           response.headers['X-Message-Type'] = type.to_s
           response.headers['X-Message-Request-Type'] = requested_action
-          flash.delete(type)  # clear the flash
+          flash.delete(type) # clear the flash
           return
         end
       end
@@ -246,6 +246,19 @@ module Katello
       render :template => "katello/common/403"
     end
 
+    # Parse the input provided and return the value of displayMessage. If displayMessage is not available, return "".
+    # (Note: this can be used to pull the displayMessage from a Candlepin exception.)
+    # This assumes that the input follows a syntax similar to:
+    #   "{\"displayMessage\":\"Import is older than existing data\"}"
+    def self.parse_display_message(input)
+      unless input.nil?
+        if input.include? 'displayMessage'
+          return JSON.parse(input)['displayMessage']
+        end
+      end
+      input
+    end
+
     private # why bother? methods below are not testable/tested
 
     def require_org
@@ -309,9 +322,6 @@ module Katello
       User.current = nil
     end
 
-    # TODO: break up method
-    # rubocop:disable MethodLength
-
     # render bad params to user
     # @overload render_bad_parameters()
     #   render bad_parameters with `default_message` and status `400`
@@ -654,19 +664,6 @@ module Katello
       logger.send level, "#{exception} (#{exception.class})\n#{exception.backtrace.join("\n")}" if exception
     end
 
-    # Parse the input provided and return the value of displayMessage. If displayMessage is not available, return "".
-    # (Note: this can be used to pull the displayMessage from a Candlepin exception.)
-    # This assumes that the input follows a syntax similar to:
-    #   "{\"displayMessage\":\"Import is older than existing data\"}"
-    def self.parse_display_message(input)
-      unless input.nil?
-        if input.include? 'displayMessage'
-          return JSON.parse(input)['displayMessage']
-        end
-      end
-      input
-    end
-
     def default_notify_options
       {:organization => current_organization}
     end

data/app/controllers/katello/concerns/api/v2/hosts_controller_extensions.rb

@@ -5,6 +5,8 @@ module Katello
       include ForemanTasks::Triggers
 
       included do
+        alias_method_chain :action_permission, :katello
+
         def destroy
           sync_task(::Actions::Katello::Host::Destroy, @host)
           process_response(:object => @host)
@@ -18,14 +20,16 @@ module Katello
           @host.save!
           render(:locals => { :resource => @host }, :template => 'katello/api/v2/hosts/show', :status => 200)
         end
+      end
+
+      private
 
-        def action_permission
-          case params[:action]
-          when 'host_collections'
-            'edit'
-          else
-            super
-          end
+      def action_permission_with_katello
+        case params[:action]
+        when 'host_collections'
+          'edit'
+        else
+          action_permission_without_katello
         end
       end
     end

data/app/controllers/katello/concerns/api/v2/repository_content_controller.rb

@@ -33,7 +33,7 @@ module Katello
         if default_sort.is_a?(Array)
           sort_options = default_sort
         elsif default_sort.is_a?(Proc)
-          options[:custom_sort] =  default_sort
+          options[:custom_sort] = default_sort
         else
           fail "Unsupported default_sort type"
         end

data/app/controllers/katello/concerns/authorization/api/v2/content_views_controller.rb

@@ -37,7 +37,7 @@ module Katello
                               :key_environment_id,
                               :content_view_version_ids => [],
                               :environment_ids => []
-                              )
+                             )
       options = options.reject { |_k, v| v.blank? }
 
       authorize_remove_versions(view, options) &&

data/app/controllers/katello/concerns/organizations_controller_extensions.rb

@@ -30,7 +30,7 @@ module Katello
             sync_task(::Actions::Katello::Organization::Create, @taxonomy)
             @taxonomy.reload
             if @count_nil_hosts > 0
-              redirect_to send("step2_#{taxonomy_single}_path",   @taxonomy)
+              redirect_to send("step2_#{taxonomy_single}_path", @taxonomy)
             else
               process_success(:object => @taxonomy, :success_redirect => send("edit_#{taxonomy_single}_path", @taxonomy))
             end

data/app/controllers/katello/concerns/smart_proxies_controller_extensions.rb

@@ -19,7 +19,7 @@ module Katello
         rescue ::Foreman::WrappedException => e
           Rails.logger.warn _('Error connecting. Got: %s') % e
           respond_to do |format|
-            format.html { render :text =>  _('Error retrieving Pulp storage') }
+            format.html { render :text => _('Error retrieving Pulp storage') }
             format.json { render :json => {:success => false, :message => e} }
           end
         end
@@ -30,7 +30,7 @@ module Katello
           if @pulp_status['fatal']
             Rails.logger.warn @pulp_status['fatal']
             respond_to do |format|
-              format.html { render :text =>  _('Error connecting to Pulp service') }
+              format.html { render :text => _('Error connecting to Pulp service') }
               format.json { render :json => {:success => false, :message => @pulp_status['fatal']} }
             end
           else

data/app/helpers/katello/application_helper.rb

@@ -103,7 +103,7 @@ module Katello
     end
 
     def notification_polling_time
-      time  = 120
+      time = 120
       return time.to_i * 1_000 if time
       return 120_000
     end

data/app/helpers/katello/concerns/settings_helper_extensions.rb

@@ -16,7 +16,8 @@ module Katello
           'katello_default_ptable',
           'katello_default_PXELinux',
           'katello_default_user_data',
-          'katello_default_kexec'
+          'katello_default_kexec',
+          'katello_default_atomic_provision'
         ].include?(setting.name)
 
         case setting.name
@@ -26,7 +27,7 @@ module Katello
           edit_select(setting, :value, :select_values => katello_template_setting_values("finish"))
         when "katello_default_iPXE"
           edit_select(setting, :value, :select_values => katello_template_setting_values("iPXE"))
-        when "katello_default_provision"
+        when "katello_default_provision", "katello_default_atomic_provision"
           edit_select(setting, :value, :select_values => katello_template_setting_values("provision"))
         when "katello_default_ptable"
           edit_select(setting, :value, :select_values => Hash[Template.all.where(:type => "Ptable").map { |tmp| [tmp[:name], tmp[:name]] }].to_json)

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -215,7 +215,7 @@ module Katello
                                                     :content_view_id => content_view.id)
         host.content_source = SmartProxy.find(params[:content_source_id])
         if host.operatingsystem.is_a?(Redhat)
-          view_options =  host.operatingsystem.kickstart_repos(host).map { |repo| OpenStruct.new(repo) }
+          view_options = host.operatingsystem.kickstart_repos(host).map { |repo| OpenStruct.new(repo) }
         end
       end
       view_options

data/app/helpers/katello/katello_form_builder.rb

@@ -132,7 +132,7 @@ module Katello
     end
 
     def field_label(name, options)
-      required = object.class.validators_on(name).any? do|v|
+      required = object.class.validators_on(name).any? do |v|
         v.is_a? ActiveModel::Validations::PresenceValidator
       end
 

data/app/helpers/katello/katello_url_helper.rb

@@ -1,8 +1,8 @@
 module Katello
   module KatelloUrlHelper
     unless defined? CONSTANTS_DEFINED
-      FILEPREFIX = ['file']
-      PROTOCOLS = ['http', 'https', 'ftp']
+      FILEPREFIX = ['file'].freeze
+      PROTOCOLS = ['http', 'https', 'ftp'].freeze
 
       CONSTANTS_DEFINED = true
     end

data/app/lib/actions/candlepin/candlepin_listening_service.rb

@@ -6,8 +6,8 @@ module Actions
 
     class CandlepinListeningService
       RECONNECT_ATTEMPTS = 30
-      TIMEOUT =  Qpid::Messaging::Duration::SECOND
-      NO_MESSAGE_AVAILABLE_ERROR_TYPE = 'NoMessageAvailable'
+      TIMEOUT = Qpid::Messaging::Duration::SECOND
+      NO_MESSAGE_AVAILABLE_ERROR_TYPE = 'NoMessageAvailable'.freeze
 
       class << self
         attr_reader :instance
@@ -77,7 +77,7 @@ module Actions
               message = fetch_message
               if message[:result]
                 result = message[:result]
-                @session.acknowledge(:message => result)
+                @session.acknowledge(:message => result, :sync => true)
                 suspended_action.notify_message_received(result.message_id, result.subject, result.content)
               elsif message[:error]
                 suspended_action.notify_not_connected(message[:error])

data/app/lib/actions/candlepin/consumer/remove_subscription.rb

@@ -7,11 +7,17 @@ module Actions
         input_format do
           param :uuid, String
           param :entitlement_id, String
+          param :pool_id, String
         end
 
         def run
           ::Katello::Resources::Candlepin::Consumer.remove_entitlement(input[:uuid], input[:entitlement_id])
         end
+
+        def finalize
+          pool = ::Katello::Pool.where(:cp_id => input[:pool_id]).first
+          pool.import_data if pool
+        end
       end
     end
   end

data/app/lib/actions/candlepin/import_pool_handler.rb

@@ -45,7 +45,8 @@ module Actions
       private
 
       def import_or_remove_pool(pool_id)
-        ::Katello::Pool.find_by(:cp_id => pool_id).import_data
+        pool = ::Katello::Pool.find_by(:cp_id => pool_id)
+        pool.nil? ? remove_pool(pool_id) : pool.import_data
       rescue RestClient::ResourceNotFound
         remove_pool(pool_id)
       end

data/app/lib/actions/katello/capsule_content/create_repos.rb

@@ -8,7 +8,7 @@ module Actions
 
           current_repos_on_capsule = capsule_content.current_repositories(environment, content_view)
           list_of_repos_to_sync = capsule_content.repos_available_to_capsule(environment, content_view)
-          need_creation =  list_of_repos_to_sync - current_repos_on_capsule
+          need_creation = list_of_repos_to_sync - current_repos_on_capsule
 
           need_creation.each do |repo|
             create_repo_in_pulp(capsule_content, repo)

data/app/lib/actions/katello/capsule_content/sync.rb

@@ -11,6 +11,7 @@ module Actions
         end
 
         def plan(capsule_content, options = {})
+          capsule_content.ping_pulp
           action_subject(capsule_content.capsule)
 
           environment = options.fetch(:environment, nil)
@@ -29,12 +30,10 @@ module Actions
 
               plan_action(ConfigureCapsule, capsule_content, environment, content_view)
 
-              smart_proxy = SmartProxy.where(:content_host_id => capsule_content.consumer.id).first
-              fail _("Smart Proxy not found for capsule.") unless smart_proxy
               concurrence do
                 repository_ids.each do |repo_id|
                   plan_action(Pulp::Consumer::SyncCapsule,
-                              capsule_id: smart_proxy.id,
+                              capsule_id: capsule_content.capsule.id,
                               repo_pulp_id: repo_id)
                 end
               end
@@ -81,8 +80,8 @@ module Actions
           repos.select do |repo|
             repo_details = capsule.pulp_repo_facts(repo.pulp_id)
             next unless repo_details
-            capsule_importer = repo_details["importers"][0].try(:[], "config")
-            capsule_importer.nil? || !(repo.importer_matches?(capsule_importer))
+            capsule_importer = repo_details["importers"][0]
+            !(repo.importer_matches?(capsule_importer))
           end
         end
 

data/app/lib/actions/katello/content_view/errata_mail.rb

@@ -14,7 +14,7 @@ module Actions
           users = ::User.select { |user| user.receives?(:katello_promote_errata) && user.can?(:view_content_views, content_view) }
 
           begin
-            MailNotification[:katello_promote_errata].deliver(:users => users, :content_view => content_view, :environment  => environment) unless users.blank?
+            MailNotification[:katello_promote_errata].deliver_now(:users => users, :content_view => content_view, :environment => environment) unless users.blank?
           rescue => e
             message = _('Unable to send errata e-mail notification: %{error}' % {:error => e})
             Rails.logger.error(message)

data/app/lib/actions/katello/content_view/presenters/incremental_updates_presenter.rb

@@ -7,7 +7,7 @@ module Actions
             ::Katello::Erratum::CONTENT_TYPE => "Errata",
             ::Katello::Rpm::CONTENT_TYPE => "Packages",
             ::Katello::PuppetModule::CONTENT_TYPE => "Puppet Modules"
-          }
+          }.freeze
 
           def humanized_output
             if action.output[:changed_content]

data/app/lib/actions/katello/content_view/promote.rb

@@ -1,3 +1,4 @@
+# rubocop:disable HandleExceptions
 module Actions
   module Katello
     module ContentView
@@ -43,9 +44,13 @@ module Actions
         end
 
         def run
-          ForemanTasks.async_task(ContentView::CapsuleGenerateAndSync,
-                                  ::Katello::ContentView.find(input[:content_view_id]),
-                                  ::Katello::KTEnvironment.find(input[:environment_id]))
+          environment = ::Katello::KTEnvironment.find(input[:environment_id])
+          if ::Katello::CapsuleContent.sync_needed?(environment)
+            ForemanTasks.async_task(ContentView::CapsuleGenerateAndSync,
+                                    ::Katello::ContentView.find(input[:content_view_id]),
+                                    environment)
+          end
+        rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
         end
 
         def rescue_strategy_for_self

data/app/lib/actions/katello/content_view/publish.rb

@@ -1,3 +1,4 @@
+# rubocop:disable HandleExceptions
 module Actions
   module Katello
     module ContentView
@@ -49,9 +50,13 @@ module Actions
         end
 
         def run
-          ForemanTasks.async_task(ContentView::CapsuleGenerateAndSync,
-                                  ::Katello::ContentView.find(input[:content_view_id]),
-                                  ::Katello::KTEnvironment.find(input[:environment_id]))
+          environment = ::Katello::KTEnvironment.find(input[:environment_id])
+          if ::Katello::CapsuleContent.sync_needed?(environment)
+            ForemanTasks.async_task(ContentView::CapsuleGenerateAndSync,
+                                    ::Katello::ContentView.find(input[:content_view_id]),
+                                    environment)
+          end
+        rescue ::Katello::Errors::CapsuleCannotBeReached # skip any capsules that cannot be connected to
         end
 
         def rescue_strategy_for_self

data/app/lib/actions/katello/content_view/remove.rb

@@ -111,13 +111,13 @@ module Actions
         def system_cve(options)
           ::Katello::ContentViewEnvironment.where(:environment_id => options[:system_environment_id],
                                                   :content_view_id => options[:system_content_view_id]
-                                      ).first
+                                                 ).first
         end
 
         def activation_key_cve(options)
           ::Katello::ContentViewEnvironment.where(:environment_id => options[:key_environment_id],
                                                   :content_view_id => options[:key_content_view_id]
-                                      ).first
+                                                 ).first
         end
       end
     end

data/app/lib/actions/katello/content_view_version/incremental_update.rb

@@ -195,7 +195,7 @@ module Actions
           puppet_module = find_puppet_modules([module_id]).first
           possible_repos = puppet_module.repositories.in_organization(new_repo.organization).in_default_view
           plan_action(Pulp::Repository::CopyPuppetModule, :source_pulp_id => possible_repos.first.pulp_id,
-                    :target_pulp_id => new_repo.pulp_id, :clauses =>  {'unit_id' => puppet_module.uuid}, :include_result => true)
+                    :target_pulp_id => new_repo.pulp_id, :clauses => {'unit_id' => puppet_module.uuid}, :include_result => true)
         end
 
         def plan_copy(action_class, source_repo, target_repo, clauses = nil, override_config = nil)

data/app/lib/actions/katello/host/erratum/applicable_errata_install.rb

@@ -13,7 +13,7 @@ module Actions
           end
 
           def humanized_name
-            if input[:hostname]
+            if input.try(:[], :hostname).nil?
               _("Install Applicable Errata")
             else
               _("Install Applicable Errata on %s") % input[:hostname]

data/app/lib/actions/katello/host/generate_applicability.rb

@@ -15,7 +15,7 @@ module Actions
         def finalize
           ::Host.where(:id => input[:host_ids]).each do |host|
             host.content_facet.try(:import_applicability)
-            host.get_status(::Katello::ErrataStatus).refresh!
+            host.content_facet.update_errata_status
           end
         end
       end

data/app/lib/actions/katello/host/hypervisors_update.rb

@@ -9,6 +9,10 @@ module Actions
                     :hypervisor_results => hypervisor_results)
         end
 
+        def run
+          output[:results] = input[:results]
+        end
+
         def finalize
           environment = ::Katello::KTEnvironment.find(input[:environment_id])
           content_view = ::Katello::ContentView.find(input[:content_view_id])
@@ -29,19 +33,20 @@ module Actions
           # Since host names must be unique yet hypervisors may have unique subscription
           # facets in different orgs
           duplicate_name = "virt-who-#{name}-#{content_view.organization.id}"
-          host = ::Host.find_by(:name => name)
+          host = find_host_by_uuid_or_name(hypervisor_json)
           if host
-            fail _("Host '%{name}' does not belong to an organization" % name) unless host.organization
+            fail _("Host '%{name}' does not belong to an organization") % {:name => name} unless host.organization
             if host.organization.id != content_view.organization.id
               name = duplicate_name
+              host = nil
             end
-          elsif ::Host.find_by(:name => name)
+          else
             name = duplicate_name
           end
 
-          host = ::Katello::Host::SubscriptionFacet.find_or_create_host_for_hypervisor(name,
-                                    content_view.organization)
+          host ||= create_host_for_hypervisor(name, content_view.organization)
           host.subscription_facet ||= ::Katello::Host::SubscriptionFacet.new
+          host.subscription_facet.host_id = host.id
           host.subscription_facet.update_from_consumer_attributes(hypervisor_json)
           host.subscription_facet.uuid = hypervisor_json[:uuid]
           host.subscription_facet.save!
@@ -61,6 +66,19 @@ module Actions
 
           host.save!
         end
+
+        def find_host_by_uuid_or_name(hypervisor_json)
+          facet = ::Katello::Host::SubscriptionFacet.find_by(:uuid => hypervisor_json[:uuid])
+          facet.nil? ? ::Host.find_by(:name => hypervisor_json[:name]) : facet.host
+        end
+
+        def create_host_for_hypervisor(name, organization, location = nil)
+          location ||= Location.default_location
+          host = ::Host::Managed.new(:name => name, :organization => organization,
+                                     :location => location, :managed => false)
+          host.save!
+          host
+        end
       end
     end
   end