katello 3.4.5 → 3.5.0.rc1

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

@@ -3,7 +3,10 @@ module Katello
     module HostsControllerExtensions
       extend ActiveSupport::Concern
       include ForemanTasks::Triggers
+
       included do
+        alias_method_chain :action_permission, :katello
+
         def destroy
           sync_task(::Actions::Katello::Host::Destroy, @host)
           process_success(:success_redirect => hosts_path)
@@ -23,6 +26,36 @@ module Katello
           cvpe = Katello::ContentViewPuppetEnvironment.where(:environment_id => environment, :content_view_version_id => version).first
           render :json => cvpe.nil? ? nil : {:name => cvpe.puppet_environment.name, :id => cvpe.puppet_environment.id}
         end
+
+        def content_hosts
+          respond_to do |format|
+            format.csv do
+              @hosts = resource_base_with_search.where(organization_id: params[:organization_id])
+                         .preload(:subscription_facet, :host_statuses, :operatingsystem,
+                                  :applicable_rpms, :lifecycle_environment, :content_view)
+              csv_response(@hosts,
+                [:name, :subscription_status_label, 'applicable_errata.security.size',
+                 'applicable_errata.bugfix.size', 'applicable_errata.enhancement.size',
+                 'applicable_rpms.size', :operatingsystem, :lifecycle_environment, :content_view,
+                 'subscription_facet.registered_at', 'subscription_facet.last_checkin'],
+                ['Name', 'Subscription Status', 'Installable Updates - Security',
+                 'Installable Updates - Bug Fixes', 'Installable Updates - Enhancements',
+                 'Installable Updates - Package Count', 'OS', 'Environment', 'Content View',
+                 'Registered', 'Last Checkin'])
+            end
+          end
+        end
+      end
+
+      private
+
+      def action_permission_with_katello
+        case params[:action]
+        when 'content_hosts'
+          'view'
+        else
+          action_permission_without_katello
+        end
       end
     end
   end

data/app/helpers/katello/hosts_and_hostgroups_helper.rb

@@ -191,12 +191,13 @@ module Katello
         # case 1
         selected_host_group = options.fetch(:selected_host_group, nil)
         host = selected_host_group.present? ? selected_host_group : param_host
-        return [] unless host.operatingsystem.is_a?(Redhat)
 
         new_host = ::Host.new
         new_host.operatingsystem = param_host.operatingsystem.present? ? param_host.operatingsystem : host.operatingsystem
         new_host.architecture = param_host.architecture.present? ? param_host.architecture : host.architecture
 
+        return [] unless new_host.operatingsystem.is_a?(Redhat)
+
         if (host.is_a? Hostgroup)
           new_host.content_facet = ::Katello::Host::ContentFacet.new(:lifecycle_environment_id => host.inherited_lifecycle_environment_id,
                                                           :content_view_id => host.inherited_content_view_id,

data/app/helpers/katello/organizations_helper.rb

@@ -2,7 +2,7 @@ module Katello
   module OrganizationsHelper
     def organization_servicelevel(org)
       _("%{sla}") %
-        { :sla => ((org.service_level.nil? || org.service_level.empty?) ? _("No Service Level Preference") : (_("Service Level %s") % org.service_level))}
+        { :sla => (org.service_level.blank? ? _("No Service Level Preference") : (_("Service Level %s") % org.service_level))}
     end
 
     def organization_servicelevel_edit(org)

data/app/helpers/katello/providers_helper.rb

@@ -56,7 +56,7 @@ module Katello
 
     # make the structure plain setting it's attributes according to the tree (namely id and class)
     def normalize(children, parent_set = [], data = [], item_type = nil)
-      children.sort { |a, b| a[:name] <=> b[:name] }.each do |child|
+      children.sort_by { |a| a[:name] }.each do |child|
         new_set = parent_set + [child[:id]]
 
         item = { :id    => id(new_set),

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

@@ -26,7 +26,7 @@ module Actions
       end
 
       def done?
-        ! ::Katello::Resources::Candlepin::Job.not_finished?(external_task)
+        !::Katello::Resources::Candlepin::Job.not_finished?(external_task)
       end
 
       private

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

@@ -40,13 +40,23 @@ module Actions
       end
 
       def retrieve
-        return @receiver.fetch(TIMEOUT)
+        result = @receiver.fetch(TIMEOUT)
+        result
       rescue => e
         if e.class.name.include? "TransportFailure"
           raise ::Actions::Candlepin::ConnectionError, "failed to connect to #{@url}"
         else
           raise e unless e.class.name.include? NO_MESSAGE_AVAILABLE_ERROR_TYPE
         end
+      ensure
+        safe_release(result) if result
+      end
+
+      def safe_release(message)
+        @session.acknowledge(:message => message, :sync => true)
+      rescue => e
+        @session.release(message)
+        raise e
       end
 
       def start(suspended_action)
@@ -78,17 +88,18 @@ module Actions
           loop do
             begin
               message = fetch_message
-              if (message[:result].nil? && message[:error].nil?) || count >= LOOP_RECEIVE_COUNT
-                sleep 1
-                count = 0
-              elsif message[:result]
+              if message[:result]
                 result = 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])
                 break
               end
+
+              if count >= LOOP_RECEIVE_COUNT || (message[:result].nil? && message[:error].nil?)
+                sleep 1
+                count = 0
+              end
             rescue => e
               suspended_action.notify_fatal(e)
               raise e

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

@@ -1,21 +1,5 @@
 module Actions
   module Candlepin
-    class MessageWrapper
-      attr_accessor :message
-
-      def initialize(message)
-        @message = message
-      end
-
-      def subject
-        @message.subject
-      end
-
-      def content
-        JSON.parse(@message.content)
-      end
-    end
-
     class ImportPoolHandler
       def initialize(logger)
         @logger = logger
@@ -27,56 +11,37 @@ module Actions
 
         ::User.current = ::User.anonymous_admin
 
-        wrapped_message = MessageWrapper.new(message)
-        case message.subject
+        message_handler = ::Katello::Candlepin::MessageHandler.new(message)
+
+        case message_handler.subject
         when /entitlement\.created/
-          import_pool(wrapped_message.content['referenceId'])
+          message_handler.import_pool_by_reference_id
+          message_handler.create_pool_on_host
         when /entitlement\.deleted/
-          import_pool(wrapped_message.content['referenceId'])
+          message_handler.import_pool_by_reference_id
+          message_handler.remove_pool_from_host
         when /pool\.created/
-          import_pool(wrapped_message.content['entityId'])
+          message_handler.import_pool_by_entity_id
         when /pool\.deleted/
-          remove_pool(wrapped_message.content['entityId'])
+          message_handler.import_pool_by_entity_id
         when /compliance\.created/
-          reindex_consumer(wrapped_message)
+          reindex_consumer(message_handler)
         end
       end
 
       private
 
-      def import_pool(pool_id)
-        pool = ::Katello::Pool.find_by(:cp_id => pool_id)
-        if pool
-          ::Katello::EventQueue.push_event(::Katello::Events::ImportPool::EVENT_TYPE, pool.id)
-        else
-          ::Katello::Pool.import_pool(pool_id)
-        end
-      end
-
-      def remove_pool(pool_id)
-        pool = ::Katello::Pool.find_by(:cp_id => pool_id)
-        if pool
-          pool.destroy!
-        else
-          @logger.debug "Couldn't find pool with candlepin id #{pool_id} in the database"
-        end
-      end
-
-      def reindex_consumer(message)
-        if message.content['newEntity']
-          parsed = JSON.parse(message.content['newEntity'])
-          uuid = parsed['consumer']['uuid']
-          sub_status = parsed['status']['status']
-          subscription_facet = ::Katello::Host::SubscriptionFacet.find_by_uuid(uuid)
-
-          if subscription_facet && sub_status
-            @logger.debug "re-indexing content host #{subscription_facet.host.name}"
-            subscription_facet.update_subscription_status(sub_status)
-          elsif subscription_facet.nil?
-            @logger.debug "skip re-indexing of non-existent content host #{uuid}"
-          elsif sub_status.nil?
-            @logger.debug "skip re-indexing of empty subscription status #{uuid}"
-          end
+      def reindex_consumer(message_handler)
+        subscription_facet = message_handler.subscription_facet
+        sub_status = message_handler.sub_status
+        uuid = message_handler.consumer_uuid
+        if subscription_facet && sub_status
+          @logger.debug "re-indexing content host #{subscription_facet.host.name}"
+          subscription_facet.update_subscription_status(sub_status)
+        elsif subscription_facet.nil?
+          @logger.debug "skip re-indexing of non-existent content host #{uuid}"
+        elsif sub_status.nil?
+          @logger.debug "skip re-indexing of empty subscription status #{uuid}"
         end
       end
     end

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

@@ -182,6 +182,7 @@ module Actions
           output[:connection] = "Connected"
           Actions::Candlepin::ImportPoolHandler.new(Rails.logger).handle(event)
           output[:last_message] = "#{event.message_id} - #{event.subject}"
+          output[:last_message_time] = DateTime.now.to_s
           output[:messages] = event.message_id
         rescue => e
           output[:last_event_error] = e.message

data/app/lib/actions/candlepin/owner/import_products.rb

@@ -8,9 +8,7 @@ module Actions
 
         def run
           organization = ::Organization.find(input[:organization_id])
-          User.as_anonymous_admin do
-            organization.redhat_provider.import_products_from_cp
-          end
+          organization.redhat_provider.import_products_from_cp
         end
       end
     end

data/app/lib/actions/candlepin/product/content_create.rb

@@ -5,6 +5,7 @@ module Actions
         input_format do
           param :name
           param :type
+          param :arches
           param :label
           param :content_url
           param :owner
@@ -16,6 +17,7 @@ module Actions
                      name: input[:name],
                      contentUrl: input[:content_url],
                      type: input[:type],
+                     arches: input[:arches],
                      label: input[:label],
                      metadataExpire: 1,
                      vendor: ::Katello::Provider::CUSTOM)

data/app/lib/actions/candlepin/product/content_update.rb

@@ -6,6 +6,7 @@ module Actions
           param :content_id
           param :name
           param :type
+          param :arches
           param :label
           param :content_url
           param :gpg_key_url
@@ -20,6 +21,7 @@ module Actions
                      contentUrl: input[:content_url],
                      gpgUrl: input[:gpg_key_url],
                      type: input[:type],
+                     arches: input[:arches],
                      label: input[:label],
                      metadataExpire: 1,
                      vendor: ::Katello::Provider::CUSTOM)

data/app/lib/actions/candlepin/product/create.rb

@@ -4,6 +4,7 @@ module Actions
       class Create < Candlepin::Abstract
         input_format do
           param :name, String
+          param :id
           param :multiplier
           param :attributes
           param :owner
@@ -11,19 +12,10 @@ module Actions
 
         def run
           output[:response] = ::Katello::Resources::Candlepin::Product.create(input[:owner], :name => input[:name],
-                                                                              :id => unused_product_id,
+                                                                              :id => input[:id],
                                                                               :multiplier => input[:multiplier],
                                                                               :attributes => input[:attributes])
         end
-
-        def unused_product_id
-          id = SecureRandom.random_number(999_999_999_999)
-          if ::Katello::Product.find_by(:cp_id => id)
-            unused_product_id
-          else
-            id
-          end
-        end
       end
     end
   end

data/app/lib/actions/candlepin/product/create_unlimited_subscription.rb

@@ -5,11 +5,18 @@ module Actions
         input_format do
           param :owner_key, String
           param :product_id, String
+          param :start_time, Time
         end
 
         def run
+          if input[:start_time]
+            start_time = Time.iso8601(input[:start_time])
+          else
+            start_time = nil
+          end
           output[:response] = ::Katello::Resources::Candlepin::Product.create_unlimited_subscription(input[:owner_key],
-                                                                                                     input[:product_id])
+                                                                                                     input[:product_id],
+                                                                                                     start_time)
         end
       end
     end

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

@@ -30,6 +30,7 @@ module Actions
           repository = ::Katello::Repository.find(repository_id) if repository_id
           content_view_id = options.fetch(:content_view_id, nil)
           content_view = ::Katello::ContentView.find(content_view_id) if content_view_id
+          skip_metadata_check = options.fetch(:skip_metadata_check, false)
 
           fail _("Action not allowed for the default capsule.") if capsule_content.default_capsule?
 
@@ -42,12 +43,12 @@ module Actions
                 plan_action(Pulp::Repository::Refresh, repo, capsule_id: capsule_content.capsule.id)
               end
               plan_action(ConfigureCapsule, capsule_content, environment, content_view, repository)
-              sync_repos_to_capsule(capsule_content, repository_ids)
+              sync_repos_to_capsule(capsule_content, repository_ids, skip_metadata_check)
             end
           end
         end
 
-        def sync_repos_to_capsule(capsule_content, repository_ids)
+        def sync_repos_to_capsule(capsule_content, repository_ids, skip_metadata_check)
           concurrence do
             repository_ids.each do |repo_id|
               sequence do
@@ -60,10 +61,18 @@ module Actions
                               capsule_id: capsule_content.capsule.id,
                               repo_pulp_id: repo_id)
                 end
+                pulp_options = { remove_missing: repo && ["puppet", "yum"].include?(repo.content_type) }
+                pulp_options[:force_full] = true if skip_metadata_check && repo.content_type == "yum"
                 plan_action(Pulp::Consumer::SyncCapsule,
                             capsule_id: capsule_content.capsule.id,
                             repo_pulp_id: repo_id,
-                            sync_options: { remove_missing: repo && ["puppet", "yum"].include?(repo.content_type) })
+                            sync_options: pulp_options)
+                if skip_metadata_check
+                  plan_action(Katello::Repository::MetadataGenerate,
+                              repo,
+                              capsule_id: capsule_content.capsule.id,
+                              force: true)
+                end
               end
             end
           end

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

@@ -27,7 +27,7 @@ module Actions
         end
 
         def finalize
-          ::Katello::Pool.where(:id => input[:pool_ids]).each(&:import_data)
+          ::Katello::Pool.where(:id => input[:pool_ids]).map { |pool| pool.import_data(false) }
           host = ::Host.find_by(:id => input[:host_id])
           host.subscription_facet.update_subscription_status
         end

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

@@ -16,9 +16,7 @@ module Actions
           hypervisors = input[:hypervisors]
 
           if hypervisors
-            User.as_anonymous_admin do
-              hypervisors.each { |hypervisor| update_or_create_hypervisor(hypervisor) }
-            end
+            hypervisors.each { |hypervisor| update_or_create_hypervisor(hypervisor) }
           end
         end
 
@@ -49,7 +47,7 @@ module Actions
           location ||= Location.unscoped.find_by_title(
             Setting[:default_location_subscribed_hosts])
           host = ::Host::Managed.new(:name => name, :organization => organization,
-                                     :location => location, :managed => false)
+                                     :location => location, :managed => false, :enabled => false)
           host.save!
           host
         end

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

@@ -26,7 +26,7 @@ module Actions
         end
 
         def finalize
-          ::Katello::Pool.where(:cp_id => input[:pool_ids]).each(&:import_data)
+          ::Katello::Pool.where(:cp_id => input[:pool_ids]).map { |pool| pool.import_data(false) }
           host = ::Host.find_by(:id => input[:host_id])
           host.subscription_facet.update_subscription_status
         end

data/app/lib/actions/katello/organization/create.rb

@@ -5,8 +5,8 @@ module Actions
         def plan(organization)
           organization.setup_label_from_name
           organization.create_library
-          organization.create_anonymous_provider unless organization.anonymous_provider
-          organization.create_redhat_provider unless organization.redhat_provider
+          organization.create_anonymous_provider
+          organization.create_redhat_provider
           cp_create = nil
 
           organization.save!

data/app/lib/actions/katello/organization/manifest_refresh.rb

@@ -31,8 +31,7 @@ module Actions
             import_products = plan_action(Candlepin::Owner::ImportProducts, :organization_id => organization.id, :dependency => owner_import.output)
 
             if manifest_update && SETTINGS[:katello][:use_pulp]
-              repositories = ::Katello::Repository.in_default_view.where(:product_id => ::Katello::Product.redhat.in_org(organization))
-              repositories.each do |repo|
+              organization.products.redhat.flat_map(&:repositories).each do |repo|
                 plan_action(Katello::Repository::RefreshRepository, repo, :dependency => import_products.output)
               end
             end