katello 3.16.0.rc1 → 3.16.0.rc1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 50d0debf5f9051e065167937b3354840869f66883b76f317b5539ff1d0ac6d6b
-  data.tar.gz: ed132fe6776f18ab484f6a8e23523e4386446de37c6366b92237ea015108c74b
+  metadata.gz: 49e88fab5fb43375d053afea798096a12e7141395144dfab26d48323e304fbac
+  data.tar.gz: ee2095edb5cb2ce6f48966c9f7a7f73ee893f2d5c08e31930d080e8b07895321
 SHA512:
-  metadata.gz: 2eabc43ae7c6d400b882c119164d81bbf1a16c1e2c2c0e24846d425dcae98cb7fc42d3131cc976997f0d1cc1451350ea01ee0ee848e6349778362fcb87efb781
-  data.tar.gz: 2e9726cf094952556a6d02f05f446949cf54fcfb9fe5f2c971a804a9107170a9ae057f441808d4fda73c4c4f66f2f45fd2a1cf93345f406177acc7684b35028a
+  metadata.gz: 27d9a1ab44ddd37d5ec67ebdcb918be9a0f86cf179a02c5e93b1188cf461fcd31c3205cd4748c893aa24f940dfd0f599b8649abef5291161b02fbdaf9a99778e
+  data.tar.gz: 9ecb92e8ff4000c0564762fc4eb2355a0c265e34f97e2ebe47c6e6636afc17d320519dfc0d73fe83d7e44ee7dd1d8a23f96e3e5a1fdcab8f0c1a9f62cabc4d83

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

@@ -33,16 +33,42 @@ module Actions
           Dynflow::Action::Rescue::Skip
         end
 
+        def self.upload_modules_to_pulp(available_streams, host)
+          query_name_streams = available_streams.map do |profile|
+            ::Katello::ModuleStream.where(profile.slice(:name, :stream))
+          end
+
+          query_name_streams = query_name_streams.inject(&:or)
+
+          bound_library_instances = host.content_facet.bound_repositories.map(&:library_instance_or_self)
+          query = ::Katello::ModuleStream.in_repositories(bound_library_instances).
+                                          select(:name, :stream, :version, :context, :arch).
+                                            merge(query_name_streams)
+
+          updated_profiles = query.map do |module_stream|
+            module_stream.slice(:name, :stream, :version, :context, :arch)
+          end
+
+          # We also need to pass module streams that are not found in the ModuleStream table
+          # but are present on the content host
+          unassociated_profiles = available_streams.select do |profile|
+            updated_profiles.none? { |p| p[:name] == profile[:name] && p[:stream] == profile[:stream] }
+          end
+
+          ::Katello::Pulp::Consumer.new(host.content_facet.uuid).
+              upload_module_stream_profile(updated_profiles + unassociated_profiles)
+        rescue RestClient::ResourceNotFound
+          Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % host.id)
+        end
+
         def import_module_streams(payload, host)
           enabled_payload = payload.map do |profile|
-            profile.slice("name", "stream", "version", "context", "arch") if profile["status"] == "enabled"
+            profile.slice("name", "stream", "version", "context", "arch").with_indifferent_access if profile["status"] == "enabled"
           end
           enabled_payload.compact!
 
-          ::Katello::Pulp::Consumer.new(host.content_facet.uuid).upload_module_stream_profile(enabled_payload)
+          UploadProfiles.upload_modules_to_pulp(enabled_payload, host)
           host.import_module_streams(payload)
-        rescue RestClient::ResourceNotFound
-          Rails.logger.warn("Host with ID %s was not known to Pulp, continuing" % input[:host_id])
         end
 
         def import_deb_package_profile(host, profile)
@@ -69,6 +95,7 @@ module Actions
             payload = profiles.dig("deb_package_profile", "deb_packages") || []
             import_deb_package_profile(host, payload)
           else
+            module_streams = []
             profiles.each do |profile|
               payload = profile["profile"]
               case profile["content_type"]
@@ -79,9 +106,13 @@ module Actions
               when "enabled_repos"
                 host.import_enabled_repositories(payload)
               else
-                import_module_streams(payload, host)
+                module_streams << payload
               end
             end
+
+            module_streams.each do |module_stream_payload|
+              import_module_streams(module_stream_payload, host)
+            end
           end
         end
       end

data/app/lib/katello/concerns/base_template_scope_extensions.rb

@@ -8,7 +8,8 @@ module Katello
           super + [:errata, :host_subscriptions, :host_applicable_errata_ids, :host_applicable_errata_filtered,
                    :host_latest_applicable_rpm_version, :load_pools, :load_errata_applications, :host_content_facet,
                    :host_sla, :host_products, :sub_name, :sub_sku, :registered_through, :last_checkin, :host_collections,
-                   :host_subscriptions_names, :host_subscriptions, :host_products_names, :host_collections_names]
+                   :host_subscriptions_names, :host_subscriptions, :host_products_names, :host_collections_names,
+                   :host_redhat_subscription_names]
         end
       end
 
@@ -28,6 +29,10 @@ module Katello
         host.subscriptions.map(&:name)
       end
 
+      def host_redhat_subscription_names(host)
+        host.subscriptions.redhat.pluck(:name)
+      end
+
       def host_content_facet(host)
         host.content_facet
       end

data/app/models/katello/concerns/host_managed_extensions.rb

@@ -226,11 +226,13 @@ module Katello
       end
 
       def import_tracer_profile(tracer_profile)
-        host_traces.delete_all
         traces = []
         tracer_profile.each do |trace, attributes|
+          next if attributes[:helper].blank?
+
           traces << { host_id: self.id, application: trace, helper: attributes[:helper], app_type: attributes[:type] }
         end
+        host_traces.delete_all
         Katello::HostTracer.import(traces, validate: false)
         update_trace_status
       end

data/app/models/katello/host/content_facet.rb

@@ -120,6 +120,7 @@ module Katello
 
         ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::Rpm, bound_repos).calculate_and_import
         ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::Erratum, bound_repos).calculate_and_import
+        ::Katello::Applicability::ApplicableContentHelper.new(self, ::Katello::ModuleStream, bound_repos).calculate_and_import
       end
 
       def import_applicability(partial = false)

data/app/models/katello/repository.rb

@@ -431,8 +431,12 @@ module Katello
       path
     end
 
+    def library_instance_or_self
+      self.library_instance || self
+    end
+
     def generate_repo_path(content_path = nil)
-      _org, _content, content_path = (self.library_instance || self).relative_path.split("/", 3) if content_path.blank?
+      _org, _content, content_path = library_instance_or_self.relative_path.split("/", 3) if content_path.blank?
       content_path = content_path.sub(%r|^/|, '')
       if self.environment
         cve = ContentViewEnvironment.where(:environment_id => self.environment,
@@ -505,7 +509,7 @@ module Katello
         end
       end
       clone = Repository.new(:environment => to_env,
-                     :library_instance => self.library_instance || self,
+                     :library_instance => library_instance_or_self,
                      :root => self.root,
                      :content_view_version => to_version,
                      :saved_checksum_type => checksum_type)

data/app/models/katello/subscription.rb

@@ -11,6 +11,8 @@ module Katello
 
     scope :in_organization, ->(org) { where(:organization => org) }
 
+    scope :redhat, -> { joins(:products).merge(Katello::Product.redhat).distinct }
+
     def self.subscribable
       product_ids = Product.subscribable.pluck(:id) + [nil]
       joins(:pools).joins("LEFT OUTER JOIN #{Katello::PoolProduct.table_name} pool_prod ON #{Pool.table_name}.id = pool_prod.pool_id")

data/app/services/katello/applicability/applicable_content_helper.rb

@@ -23,7 +23,7 @@ module Katello
         if self.content_unit_class == ::Katello::Erratum
           fetch_errata_content_ids
         elsif self.content_unit_class == ::Katello::ModuleStream
-          fail NotImplementedError
+          fetch_module_stream_content_ids
         else
           fetch_rpm_content_ids
         end
@@ -31,18 +31,32 @@ module Katello
 
       def fetch_errata_content_ids
         # Query for all Errata ids that are attached to the host's applicable packages
-        query = 'select katello_repository_errata.erratum_id as id from katello_repository_errata
-                     inner join katello_erratum_packages
-                        on  katello_repository_errata.erratum_id  = katello_erratum_packages.erratum_id
-                     inner join katello_rpms
-                        on katello_rpms.nvra = katello_erratum_packages.nvrea
-                     inner join katello_content_facet_applicable_rpms on
-                         katello_content_facet_applicable_rpms.rpm_id = katello_rpms.id
-                     where
-                          "katello_content_facet_applicable_rpms"."content_facet_id" = :content_facet_id
-                     AND katello_repository_errata.repository_id IN (:repo_ids)'
-
-        return Katello::Erratum.find_by_sql([query, {content_facet_id: content_facet.id, repo_ids: self.bound_library_instance_repos} ]).map(&:id).uniq
+        query = 'SELECT DISTINCT katello_repository_errata.erratum_id AS id FROM katello_repository_errata
+                     INNER JOIN katello_erratum_packages
+                        ON katello_repository_errata.erratum_id = katello_erratum_packages.erratum_id
+                     INNER JOIN katello_rpms
+                        ON katello_rpms.nvra = katello_erratum_packages.nvrea
+                     INNER JOIN katello_content_facet_applicable_rpms
+                        ON katello_content_facet_applicable_rpms.rpm_id = katello_rpms.id
+                     WHERE katello_content_facet_applicable_rpms.content_facet_id = :content_facet_id
+                        AND katello_repository_errata.repository_id IN (:repo_ids)'
+
+        return Katello::Erratum.find_by_sql([query, { content_facet_id: content_facet.id, repo_ids: self.bound_library_instance_repos }]).map(&:id)
+      end
+
+      def fetch_module_stream_content_ids
+        # Query for all applicable module stream ids
+        query = 'SELECT DISTINCT katello_repository_module_streams.module_stream_id AS id FROM katello_repository_module_streams
+                     INNER JOIN katello_module_stream_rpms
+                        ON katello_repository_module_streams.module_stream_id = katello_module_stream_rpms.module_stream_id
+                     INNER JOIN katello_rpms
+                        ON katello_rpms.id = katello_module_stream_rpms.rpm_id
+                     INNER JOIN katello_content_facet_applicable_rpms
+                        ON katello_content_facet_applicable_rpms.rpm_id = katello_rpms.id
+                     WHERE katello_content_facet_applicable_rpms.content_facet_id = :content_facet_id
+                        AND katello_repository_module_streams.repository_id IN (:repo_ids)'
+
+        return Katello::ModuleStream.find_by_sql([query, { content_facet_id: content_facet.id, repo_ids: self.bound_library_instance_repos }]).map(&:id)
       end
 
       def fetch_rpm_content_ids

data/app/services/katello/pulp3/pulp_content_unit.rb

@@ -62,13 +62,7 @@ module Katello
             break unless (
               (response["count"] && page_opts["offset"] < response["count"]) ||
               page_opts["offset"] == 0)
-            if self == Katello::Pulp3::Rpm
-              # Get all packages where arch != "src"
-              # FIXME change once reverse filtering is in Pulp3
-              page_opts["arch__in"] = Katello::Pulp3::Rpm.rpm_architectures.join(",")
-            elsif self == Katello::Pulp3::Srpm
-              page_opts["arch"] = "src"
-            end
+            page_opts = page_options page_opts
             response = fetch_content_list page_opts
             response = response.as_json.with_indifferent_access
             yielder.yield response[:results]
@@ -77,6 +71,10 @@ module Katello
         end
       end
 
+      def self.page_options(page_opts = {})
+        page_opts
+      end
+
       def self.pulp_data(href)
         content_unit = self.content_api.read(href)
         content_unit.as_json

data/app/services/katello/pulp3/rpm.rb

@@ -20,20 +20,9 @@ module Katello
         repo_content_list.map { |content| content.try(:pulp_href) }
       end
 
-      def self.rpm_architectures
-        ['i386', 'i486', 'i586', 'i686', 'athlon', 'geode', 'pentium3', 'pentium4',
-         'x86_64', 'amd64',
-         'ia64',
-         'alpha', 'alphaev5', 'alphaev56', 'alphapca56', 'alphaev6', 'alphaev67',
-         'sparc', 'sparcv8', 'sparcv9', 'sparc64', 'sparc64v', 'sun4', 'sun4c', 'sun4d', 'sun4m', 'sun4u',
-         'armv3l', 'armv4b', 'armv4l', 'armv5tel', 'armv5tejl', 'armv6l', 'armv7l',
-         'mips', 'mipsel',
-         'ppc', 'ppciseries', 'ppcpseries', 'ppc64', 'ppc8260', 'ppc8560', 'ppc32dy4',
-         'm68k', 'm68kmint', 'atarist', 'atariste', 'ataritt', 'falcon', 'atariclone', 'milan', 'hades',
-         'Sgi',
-         'rs6000',
-         'i370', 's390x', 's390',
-         'noarch']
+      def self.page_options(page_opts = {})
+        page_opts["arch__ne"] = "src"
+        page_opts
       end
 
       def requires

data/app/services/katello/pulp3/srpm.rb

@@ -17,6 +17,11 @@ module Katello
         PulpRpmClient::ContentPackagesApi.new(Katello::Pulp3::Api::Yum.new(SmartProxy.pulp_master!).api_client)
       end
 
+      def self.page_options(page_opts = {})
+        page_opts["arch"] = "src"
+        page_opts
+      end
+
       def self.ids_for_repository(repo_id)
         repo = Katello::Pulp3::Repository::Yum.new(Katello::Repository.find(repo_id), SmartProxy.pulp_master)
         repo_content_list = repo.content_list

data/db/seeds.d/111-upgrade_tasks.rb

@@ -12,6 +12,7 @@ UpgradeTask.define_tasks(:katello) do
     {:name => 'katello:upgrades:3.12:remove_pulp2_notifier'},
     {:name => 'katello:upgrades:3.13:republish_deb_metadata'},
     {:name => 'katello:upgrades:3.15:set_sub_facet_dmi_uuid'},
-    {:name => 'katello:upgrades:3.15:reindex_rpm_modular'}
+    {:name => 'katello:upgrades:3.15:reindex_rpm_modular'},
+    {:name => 'katello:upgrades:3.16:update_applicable_el8_hosts'}
   ]
 end

data/lib/katello/tasks/upgrades/3.16/update_applicable_el8_hosts.rake

@@ -0,0 +1,29 @@
+namespace :katello do
+  namespace :upgrades do
+    namespace '3.16' do
+      desc <<-DESCRIPTION
+      Update the applicability calculations for Rhel8 hosts.
+      This migration is to be run to address -> https://bugzilla.redhat.com/show_bug.cgi?id=1814095
+      DESCRIPTION
+      task :update_applicable_el8_hosts, [:input_file] => ["environment"] do
+        User.current = User.anonymous_api_admin
+
+        # Find me only those hosts that follow ALL the conditions below
+        # 1) Have a module stream enabled.
+        # 2) Bound to Non Library repositories. (i.e must belong to a CV thats not the default)
+        # 3) Bound repositories must have module streams in them
+        hosts = Host.joins(:content_facet => :content_facet_repositories).
+                 where("#{Host.table_name}.id" => ::Katello::HostAvailableModuleStream.enabled.select(:host_id)).
+                 where("#{Katello::ContentFacetRepository.table_name}.repository_id" =>
+                        ::Katello::Repository.joins(:repository_module_streams).
+                                          in_non_default_view.
+                                          non_archived)
+        hosts.each do |host|
+          available_streams = ::Katello::HostAvailableModuleStream.joins(:available_module_stream).
+                                                enabled.where(:host_id => host).select(:name, :stream)
+          ::Actions::Katello::Host::UploadProfiles.upload_modules_to_pulp(available_streams, host)
+        end
+      end
+    end
+  end
+end

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.16.0.rc1".freeze
+  VERSION = "3.16.0.rc1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.16.0.rc1
+  version: 3.16.0.rc1.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4325,6 +4325,7 @@ files:
 - lib/katello/tasks/upgrades/3.13/republish_deb_metadata.rake
 - lib/katello/tasks/upgrades/3.15/reindex_rpm_modular.rake
 - lib/katello/tasks/upgrades/3.15/set_sub_facet_dmi_uuid.rake
+- lib/katello/tasks/upgrades/3.16/update_applicable_el8_hosts.rake
 - lib/katello/tasks/upgrades/3.8/clear_checksum_type.rake
 - lib/katello/tasks/virt_who_report.rake
 - lib/katello/url_constrained_cookie_store.rb