katello 4.7.4 → 4.8.0.rc1

data/app/lib/actions/pulp3/orchestration/content_view_version/syncable_export.rb

@@ -8,6 +8,7 @@ module Actions
             param :content_view_version_id, Integer
             param :export_history_id, Integer
             param :export_path, String
+            param :from_content_view_version_id, Integer
           end
 
           output_format do
@@ -18,12 +19,14 @@ module Actions
           def plan(content_view_version:,
                    smart_proxy:,
                    fail_on_missing_content: false,
-                   destination_server:)
+                   destination_server:,
+                   from_content_view_version:)
             format = ::Katello::Pulp3::ContentViewVersion::Export::SYNCABLE
             sequence do
               export_service = ::Katello::Pulp3::ContentViewVersion::Export.create(
                   smart_proxy: smart_proxy,
                   content_view_version: content_view_version,
+                  from_content_view_version: from_content_view_version,
                   format: format,
                   destination_server: destination_server)
               export_service.validate!(fail_on_missing_content: fail_on_missing_content)
@@ -42,7 +45,8 @@ module Actions
                             smart_proxy_id: smart_proxy.id,
                             exporter_data: action_output[:exporter_data],
                             format: format,
-                            repository_id: repository.id)
+                            repository_id: repository.id,
+                            from_content_view_version_id:  from_content_view_version&.id)
 
                 plan_action(::Actions::Pulp3::ContentViewVersion::DestroyExporter,
                           smart_proxy_id: smart_proxy.id,
@@ -55,6 +59,7 @@ module Actions
                   ::Actions::Pulp3::ContentViewVersion::CreateSyncableExportHistory,
                   smart_proxy_id: smart_proxy.id,
                   content_view_version_id: content_view_version.id,
+                  from_content_view_version_id:  from_content_view_version&.id,
                   destination_server: destination_server,
                   format: format,
                   base_path: base_path

data/app/lib/actions/pulp3/repository/refresh_distribution.rb

@@ -23,8 +23,7 @@ module Actions
 
         def invoke_external_task
           repo = ::Katello::Repository.find(input[:repository_id])
-          #used in switchover, need to assume pulp3
-          repo.backend_service(smart_proxy, true).with_mirror_adapter.refresh_distributions
+          repo.backend_service(smart_proxy).with_mirror_adapter.refresh_distributions
         end
       end
     end

data/app/lib/actions/pulp3/repository/save_distribution_references.rb

@@ -12,9 +12,9 @@ module Actions
             distribution_hrefs.compact!
             repo = ::Katello::Repository.find(input[:repository_id])
             if distribution_hrefs.any?
-              repo.backend_service(smart_proxy, true).save_distribution_references(distribution_hrefs)
+              repo.backend_service(smart_proxy).save_distribution_references(distribution_hrefs)
             else
-              repo.backend_service(smart_proxy, true).update_distribution
+              repo.backend_service(smart_proxy).update_distribution
             end
           end
         end

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

@@ -8,7 +8,7 @@ module Katello
           super
 
           medium_provider = Katello::ManagedContentMediumProvider.new(host)
-          content_view = host.try(:content_facet).try(:content_view) || host.try(:content_view)
+          content_view = host.try(:content_facet).try(:single_content_view) || host.try(:single_content_view)
 
           if content_view && host.operatingsystem.is_a?(Redhat) &&
                   host.operatingsystem.kickstart_repos(host).first.present? &&

data/app/lib/katello/event_daemon/runner.rb

@@ -6,10 +6,6 @@ module Katello
       @cache = ActiveSupport::Cache::MemoryStore.new
 
       class << self
-        def initialize
-          FileUtils.touch(lock_file)
-        end
-
         def settings
           SETTINGS[:katello][:event_daemon]
         end
@@ -24,12 +20,16 @@ module Katello
           pid_dir.join('katello_event_daemon.pid')
         end
 
+        def tmp_dir
+          Rails.root.join('tmp')
+        end
+
         def pid_dir
-          Rails.root.join('tmp', 'pids')
+          tmp_dir.join('pids')
         end
 
         def lock_file
-          Rails.root.join('tmp', 'katello_event_daemon.lock')
+          tmp_dir.join('katello_event_daemon.lock')
         end
 
         def write_pid_file
@@ -49,10 +49,13 @@ module Katello
 
         def start
           return unless runnable?
-          lockfile = File.open(lock_file, 'r')
-          begin
+
+          FileUtils.mkdir_p(tmp_dir)
+          FileUtils.touch(lock_file)
+
+          File.open(lock_file, 'r') do |lockfile|
             lockfile.flock(File::LOCK_EX)
-            return if started? # ensure it wasn't started while we waited for the lock
+            return nil if started? # ensure it wasn't started while we waited for the lock
             start_monitor_thread
             write_pid_file
 

data/app/lib/katello/resources/candlepin/consumer.rb

@@ -34,10 +34,11 @@ module Katello
             consumers
           end
 
-          def create(env_id, parameters, activation_key_cp_ids)
+          def create(env_ids, parameters, activation_key_cp_ids, org)
             parameters['installedProducts'] ||= [] #if installed products is nil, candlepin won't attach custom products
-            url = "/candlepin/environments/#{env_id}/consumers/"
-            url += "?activation_keys=" + activation_key_cp_ids.join(",") if activation_key_cp_ids.length > 0
+            parameters['environments'] = env_ids.map { |cp_id| { id: cp_id } }
+            url = "/candlepin/consumers/?owner=#{org.label}"
+            url += "&activation_keys=" + activation_key_cp_ids.join(",") if activation_key_cp_ids.length > 0
 
             response = self.post(url, parameters.to_json, self.default_headers).body
             JSON.parse(response).with_indifferent_access
@@ -92,7 +93,7 @@ module Katello
             self.put(path(uuid), {:lastCheckin => checkin_date}.to_json, self.default_headers).body
           end
 
-          def available_pools(owner_label, uuid, listall = false)
+          def available_pools(owner_label, uuid, listall: false)
             url = Resources::Candlepin::Pool.path(nil, owner_label) + "?consumer=#{uuid}&listall=#{listall}&add_future=true"
             response = Candlepin::CandlepinResource.get(url, self.default_headers).body
             JSON.parse(response)
@@ -107,8 +108,7 @@ module Katello
             # Export is a zip file
             headers = self.default_headers
             headers['accept'] = 'application/zip'
-            response = Candlepin::CandlepinResource.get(join_path(path(uuid), 'export'), headers)
-            response
+            Candlepin::CandlepinResource.get(join_path(path(uuid), 'export'), headers)
           end
 
           def entitlements(uuid)

data/app/lib/katello/resources/candlepin/owner.rb

@@ -60,7 +60,7 @@ module Katello
             Product.all(organization_name, [:id, :productContent])
           end
 
-          def destroy_imports(organization_name, wait_until_complete = false)
+          def destroy_imports(organization_name, wait_until_complete: false)
             response_json = self.delete(join_path(path(organization_name), 'imports'), self.default_headers)
             response = JSON.parse(response_json).with_indifferent_access
             if wait_until_complete && response['state'] == 'CREATED'

data/app/lib/katello/resources/candlepin/upstream_consumer.rb

@@ -42,15 +42,14 @@ module Katello
 
           def get_export(url, client_cert, client_key, ca_file)
             logger.debug "Sending GET request to upstream Candlepin: #{url}"
-            return resource(url, client_cert, client_key, ca_file).get
+            return resource(url: url, client_cert: client_cert, client_key: client_key, ca_file: ca_file).get
           rescue RestClient::Exception => e
             raise e
           end
 
           def update(url, client_cert, client_key, ca_file, attributes)
-            logger.debug "Sending POST request to upstream Candlepin: #{url} #{attributes.to_json}"
-
-            return resource(url, client_cert, client_key, ca_file).put(attributes.to_json,
+            logger.debug "Sending PUT request to upstream Candlepin: #{url} #{attributes.to_json}"
+            return resource(url: url, client_cert: client_cert, client_key: client_key, ca_file: ca_file).put(attributes.to_json,
                                                                        'accept' => 'application/json',
                                                                        'accept-language' => I18n.locale,
                                                                        'content-type' => 'application/json')

data/app/lib/katello/resources/candlepin.rb

@@ -88,7 +88,7 @@ module Katello
         class << self
           delegate :[], to: :json_resource
 
-          def resource(url = self.site + self.path, client_cert = self.client_cert, client_key = self.client_key, ca_file = nil, options = {})
+          def resource(options = {}, url: self.site + self.path, client_cert: self.client_cert, client_key: self.client_key, ca_file: nil)
             cert_store = OpenSSL::X509::Store.new
             cert_store.add_file(ca_file) if ca_file
 
@@ -107,9 +107,9 @@ module Katello
                                     )
           end
 
-          def json_resource(url = self.site + self.path, client_cert = self.client_cert, client_key = self.client_key, ca_file = nil, options = {})
+          def json_resource(options = {}, url: self.site + self.path, client_cert: self.client_cert, client_key: self.client_key, ca_file: nil)
             options.deep_merge!(headers: self.default_headers)
-            resource(url, client_cert, client_key, ca_file, options)
+            resource(options, url: url, client_cert: client_cert, client_key: client_key, ca_file: ca_file)
           end
 
           def rest_client(_http_type = nil, method = :get, path = self.path)
@@ -117,7 +117,7 @@ module Katello
             self.consumer_secret = nil
             self.consumer_key = nil
 
-            resource(self.site + path, client_cert, client_key, nil, http_method: method)
+            resource({ http_method: method }, url: self.site + path, client_cert: client_cert, client_key: client_key, ca_file: nil)
           end
 
           def client_cert

data/app/lib/katello/util/errata.rb

@@ -46,19 +46,21 @@ module Katello
         end
       end
 
-      def filter_errata_by_pulp_href(errata, package_pulp_hrefs, source_repo_rpm_filenames)
-        return [] if package_pulp_hrefs.empty?
-        rpms = Katello::Rpm.where(:pulp_id => package_pulp_hrefs)
-        srpms = Katello::Srpm.where(:pulp_id => package_pulp_hrefs)
-        rpm_filenames = rpms.map { |rpm| File.basename(rpm.filename) }
-        srpm_filenames = srpms.map { |srpm| File.basename(srpm.filename) }
+      def filter_errata_by_pulp_href(errata, content_pulp_hrefs, source_repo_rpm_filenames, source_repo_module_stream_specs)
+        return [] if content_pulp_hrefs.empty?
+
         source_repo_rpm_filenames = source_repo_rpm_filenames.map { |rpm| File.basename(rpm) }
+        rpm_filenames = Katello::Rpm.where(:pulp_id => content_pulp_hrefs).map { |rpm| File.basename(rpm.filename) }
+        srpm_filenames = Katello::Srpm.where(:pulp_id => content_pulp_hrefs).map { |srpm| File.basename(srpm.filename) }
+        module_stream_specs = Katello::ModuleStream.where(:pulp_id => content_pulp_hrefs).map(&:module_spec)
+
         matching_errata = []
         errata.each do |erratum|
-          # The erratum should be copied if package_pulp_hrefs has all of its packages that are available in the source repo.
-          rpms_in_erratum_and_source_repo = erratum.packages.pluck(:filename) & source_repo_rpm_filenames
-          if (rpms_in_erratum_and_source_repo - rpm_filenames - srpm_filenames).empty? ||
-              erratum.packages.empty? || rpms_in_erratum_and_source_repo.empty?
+          # The erratum should be copied if content_pulp_hrefs has all of its packages/modules that are available in the source repo.
+          content_in_erratum_and_source_repo =
+            (erratum.packages.pluck(:filename) + erratum.module_stream_specs) & (source_repo_rpm_filenames + source_repo_module_stream_specs)
+          if (content_in_erratum_and_source_repo - rpm_filenames - srpm_filenames - module_stream_specs).empty? ||
+              (erratum.packages.empty? && erratum.module_streams.empty?) || content_in_erratum_and_source_repo.empty?
             matching_errata << erratum
           end
         end

data/app/lib/katello/util/search.rb

@@ -42,7 +42,6 @@ module Katello
         classes = get_subclasses(ActiveRecord::Base)
         classes = classes.select { |c| !ignore_list.include?(c.name) && c.respond_to?(:index) }
 
-        #we need index base classes first (TaskStatus) before child classes (PulpTaskStatus)
         initial_list = classes.select { |c| c.superclass == ActiveRecord::Base }
         subclass_list = classes - initial_list
         initial_list + subclass_list

data/app/lib/katello/validators/content_view_environment_org_validator.rb

@@ -5,8 +5,11 @@ module Katello
         environment_id = record.respond_to?(:lifecycle_environment_id) ? record.lifecycle_environment_id : record.environment_id
         view = ContentView.where(:id => record.content_view_id).first
         environment = KTEnvironment.where(:id => environment_id).first
-        unless view.organization == environment.organization
-          record.errors[:base] << _("%{view_label} could not be promoted to %{environment_label} because the content view and the environment are not in the same organization!") % {:view_label => view.label, :environment_label => environment.label}
+        unless view && environment
+          record.errors[:base] << _("Content view environments must have both a content view and an environment")
+        end
+        unless view&.organization == environment&.organization
+          record.errors[:base] << _("%{view_label} could not be promoted to %{environment_label} because the content view and the environment are not in the same organization!") % {:view_label => view&.label, :environment_label => environment&.label}
         end
       end
     end

data/app/lib/katello/validators/content_view_environment_validator.rb

@@ -4,7 +4,6 @@ module Katello
       def validate(record)
         #support lifecycle_environment_id for foreman models
         environment_id = record.respond_to?(:lifecycle_environment_id) ? record.lifecycle_environment_id : record.environment_id
-
         if record.content_view_id
           view = ContentView.where(:id => record.content_view_id).first
           if environment_id
@@ -15,7 +14,7 @@ module Katello
             end
           end
           if view&.generated_for_repository?
-            record.errors[:base] << _("Generated Content views cannot be assigned to Host/Activation Keys")
+            record.errors[:base] << _("Generated content views cannot be assigned to hosts or activation keys")
           end
         end
       end

data/app/lib/katello/validators/generated_content_view_validator.rb

@@ -0,0 +1,16 @@
+module Katello
+  module Validators
+    class GeneratedContentViewValidator < ActiveModel::Validator
+      def validate(record)
+        record.content_view_environments.each do |cve|
+          if cve.content_view_id
+            view = ContentView.where(:id => cve.content_view_id).first
+            if view&.generated_for_repository?
+              record.errors[:base] << _("Content view '%{cv_name}' is a generated content view, which cannot be assigned to hosts or activation keys.") % { :cv_name => view.name }
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/app/mailers/katello/errata_mailer.rb

@@ -33,8 +33,10 @@ module Katello
       ::User.as(user.login) do
         @content_view = options[:content_view]
         @environment = options[:environment]
-        @content_facets = Katello::Host::ContentFacet.where(:lifecycle_environment_id => @environment.id,
-                                                            :content_view_id => @content_view.id)
+        @content_facets = Katello::Host::ContentFacet.in_content_views_and_environments(
+          :lifecycle_environments => [@environment],
+          :content_views => [@content_view]
+        )
         @hosts = ::Host::Managed.authorized("view_hosts").where(:id => @content_facets.pluck(:host_id))
         @errata = @content_facets.map(&:installable_errata).flatten.uniq
 

data/app/models/katello/alternate_content_source.rb

@@ -34,7 +34,7 @@ module Katello
     validates :base_url, if: -> { custom? || rhui? }, presence: true
     validates :products, if: -> { custom? || rhui? }, absence: true
     validates :label, :uniqueness => true
-    validates :name, :uniqueness => true
+    validates :name, :uniqueness => true, presence: true
     validates :verify_ssl, if: :custom?, exclusion: [nil]
     validates :alternate_content_source_type, inclusion: {
       in: ->(_) { ACS_TYPES },
@@ -46,6 +46,10 @@ module Katello
       allow_blank: false,
       message: ->(_, _) { _("is not allowed for ACS. Must be one of the following: %s") % (RepositoryTypeManager.defined_repository_types.keys & CONTENT_TYPES).join(',') }
     }
+    validates :content_type, if: -> { rhui? }, inclusion: {
+      in: [::Katello::Repository::YUM_TYPE],
+      message: "'%{value}' is not valid for RHUI ACS"
+    }
     validates_with Validators::AlternateContentSourcePathValidator, :attributes => [:base_url, :subpaths], :if => :custom?
 
     scope :uses_http_proxies, -> { where(use_http_proxies: true) }

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

@@ -25,8 +25,11 @@ module Katello
                      :complete_value => TRACE_STATUS_MAP
 
         #associations for simpler scoped searches
-        has_one :content_view, :through => :content_facet
-        has_one :lifecycle_environment, :through => :content_facet
+        has_many :content_view_environment_content_facets, through: :content_facet, class_name: 'Katello::ContentViewEnvironmentContentFacet'
+        has_many :content_view_environments, through: :content_view_environment_content_facets
+        has_many :content_views, through: :content_view_environments
+        has_many :lifecycle_environments, through: :content_view_environments
+
         has_one :content_source, :through => :content_facet
         has_many :content_facet_errata, :through => :content_facet, :class_name => 'Katello::ContentFacetErratum'
         has_many :applicable_errata, :through => :content_facet_errata, :source => :erratum
@@ -37,10 +40,8 @@ module Katello
         has_many :bound_root_repositories, :through => :content_facet
         has_many :bound_content, :through => :content_facet
 
-        scoped_search :relation => :content_view, :on => :name, :complete_value => true, :rename => :content_view
-        scoped_search :relation => :content_facet, :on => :content_view_id, :rename => :content_view_id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
-        scoped_search :relation => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment
-        scoped_search :relation => :content_facet, :on => :lifecycle_environment_id, :rename => :lifecycle_environment_id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
+        scoped_search :relation => :content_views, :on => :name, :complete_value => true, :rename => :content_views
+        scoped_search :relation => :lifecycle_environments, :on => :name, :complete_value => true, :rename => :lifecycle_environments
         scoped_search :relation => :applicable_errata, :on => :errata_id, :rename => :applicable_errata, :complete_value => true, :ext_method => :find_by_applicable_errata, :only_explicit => true
         scoped_search :relation => :applicable_errata, :on => :errata_id, :rename => :installable_errata, :complete_value => true, :ext_method => :find_by_installable_errata, :only_explicit => true
         scoped_search :relation => :applicable_errata, :on => :issued, :rename => :applicable_errata_issued, :complete_value => true, :only_explicit => true
@@ -68,8 +69,8 @@ module Katello
         end
 
         apipie :class do
-          property :content_view, 'ContentView', desc: 'Returns content view associated with the host'
-          property :lifecycle_environment, 'KTEnvironment', desc: 'Returns lifecycle environment object associated with the host'
+          property :content_views, 'ContentView', desc: 'Returns content views associated with the host'
+          property :lifecycle_environments, 'KTEnvironment', desc: 'Returns lifecycle environment objects associated with the host'
           property :content_source, 'SmartProxy', desc: 'Returns Smart Proxy object as the content source for the host'
           property :applicable_errata, array_of: 'Erratum', desc: 'Returns errata applicable to the host'
         end
@@ -154,15 +155,25 @@ module Katello
           end
         end
 
-        def in_content_view_environment(content_view: nil, lifecycle_environment: nil)
-          relation = self.joins(:content_facet)
-          relation = relation.where("#{::Katello::Host::ContentFacet.table_name}.content_view_id" => content_view) if content_view
-          relation = relation.where("#{::Katello::Host::ContentFacet.table_name}.lifecycle_environment_id" => lifecycle_environment) if lifecycle_environment
+        def in_content_view_environments(content_views: nil, lifecycle_environments: nil)
+          relation = self.joins(:content_facet => {:content_view_environment_content_facets => :content_view_environment })
+          relation = relation.where("#{::Katello::ContentViewEnvironment.table_name}.content_view_id" => content_views) if content_views
+          relation = relation.where("#{::Katello::ContentViewEnvironment.table_name}.environment_id" => lifecycle_environments) if lifecycle_environments
           relation
         end
 
+        def in_environments(lifecycle_environments)
+          in_content_view_environments(:lifecycle_environments => lifecycle_environments)
+        end
+
+        def in_content_view_environment(content_view: nil, lifecycle_environment: nil)
+          Rails.logger.warn "DEPRECATION WARNING: in_content_view_environment is deprecated and will be removed in Katello 4.8.  Please use in_content_view_environments instead."
+          in_content_view_environments(:content_views => content_view, :lifecycle_environments => lifecycle_environment)
+        end
+
         def in_environment(lifecycle_environment)
-          in_content_view_environment(:lifecycle_environment => lifecycle_environment)
+          Rails.logger.warn "DEPRECATION WARNING: in_environment is deprecated and will be removed in Katello 4.9.  Please use in_environments instead."
+          in_environments(lifecycle_environment)
         end
 
         private
@@ -189,5 +200,5 @@ module Katello
 end
 
 class ::Host::Managed::Jail < Safemode::Jail
-  allow :content_view, :lifecycle_environment, :content_source, :applicable_errata
+  allow :content_source, :applicable_errata
 end

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

@@ -51,8 +51,12 @@ module Katello
         prepend ::ForemanRemoteExecution::HostExtensions if ::Katello.with_remote_execution?
         prepend Overrides
 
-        delegate :content_source_id, :content_view_id, :lifecycle_environment_id, :kickstart_repository_id, :bound_repositories, to: :content_facet, allow_nil: true
+        delegate :content_source_id, :single_content_view, :single_lifecycle_environment, :default_environment?, :single_content_view_environment?, :multi_content_view_environment?, :kickstart_repository_id, :bound_repositories, to: :content_facet, allow_nil: true
 
+        has_many :content_view_environment_content_facets, through: :content_facet, class_name: 'Katello::ContentViewEnvironmentContentFacet'
+        has_many :content_view_environments, through: :content_view_environment_content_facets
+        has_many :content_views, through: :content_view_environments
+        has_many :lifecycle_environments, through: :content_view_environments
         has_many :dispatch_histories, :class_name => "::Katello::Agent::DispatchHistory", :foreign_key => :host_id, :dependent => :delete_all
 
         has_many :host_installed_packages, :class_name => "::Katello::HostInstalledPackage", :foreign_key => :host_id, :dependent => :delete_all
@@ -92,6 +96,10 @@ module Katello
         scoped_search :relation => :host_traces, :on => :application, :complete_value => true, :rename => :trace_app, :only_explicit => true
         scoped_search :relation => :host_traces, :on => :app_type, :complete_value => true, :rename => :trace_app_type, :only_explicit => true
         scoped_search :relation => :host_traces, :on => :helper, :complete_value => true, :rename => :trace_helper, :only_explicit => true
+        scoped_search :relation => :lifecycle_environments, :on => :name, :complete_value => true, :rename => :lifecycle_environment, :only_explicit => true
+        scoped_search :relation => :content_views, :on => :name, :complete_value => true, :rename => :content_view, :only_explicit => true
+        scoped_search :relation => :lifecycle_environments, :on => :id, :complete_value => true, :rename => :lifecycle_environment_id, :only_explicit => true
+        scoped_search :relation => :content_views, :on => :id, :complete_value => true, :rename => :content_view_id, :only_explicit => true
 
         scoped_search relation: :pools, on: :pools_expiring_in_days, ext_method: :find_with_expiring_pools, only_explicit: true
 
@@ -111,8 +119,8 @@ module Katello
           property :host_collections, array_of: 'HostCollection', desc: 'Returns list of the host collections the host belongs to'
           property :pools, array_of: 'Pool', desc: 'Returns subscription pool objects associated with the host'
           property :hypervisor_host, 'Host', desc: 'Returns hypervisor host object of this host'
-          property :lifecycle_environment, 'KTEnvironment', desc: 'Returns lifecycle environment object associated with the host'
-          property :content_view, 'ContentView', desc: 'Returns content view associated with the host'
+          property :lifecycle_environments, 'KTEnvironment', desc: 'Returns lifecycle environments associated with the host'
+          property :content_views, 'ContentView', desc: 'Returns content views associated with the host'
           property :installed_packages, array_of: 'InstalledPackage', desc: 'Returns a list of packages installed on the host'
         end
       end
@@ -263,9 +271,9 @@ module Katello
       def import_module_streams(module_streams)
         streams = {}
         module_streams.each do |module_stream|
-          stream = AvailableModuleStream.where(name: module_stream["name"],
+          stream = AvailableModuleStream.create_or_find_by!(name: module_stream["name"],
                                                context: module_stream["context"],
-                                               stream: module_stream["stream"]).first_or_create!
+                                               stream: module_stream["stream"])
           streams[stream.id] = module_stream
         end
         sync_available_module_stream_associations(streams)
@@ -433,7 +441,7 @@ module Katello
           versions_by_name = {}
           if versions.present?
             JSON.parse(versions).each do |nvra|
-              nvra =~ /([^\.]*)-\d+\.[-\.\w]*/
+              nvra =~ /([^.]*)-\d+\.[-.\w]*/
               versions_by_name[Regexp.last_match(1)] = nvra
             end
           end
@@ -471,9 +479,10 @@ end
 
 class ::Host::Managed::Jail < Safemode::Jail
   allow :content_source, :subscription_manager_configuration_url, :rhsm_organization_label,
-        :host_collections, :pools, :hypervisor_host, :lifecycle_environment, :content_view,
+        :host_collections, :pools, :hypervisor_host, :installed_debs,
         :installed_packages, :traces_helpers, :advisory_ids, :package_names_for_job_template,
-        :filtered_entitlement_quantity_consumed, :bound_repositories
+        :filtered_entitlement_quantity_consumed, :bound_repositories,
+        :single_content_view, :single_lifecycle_environment
 end
 
 class ActiveRecord::Associations::CollectionProxy::Jail < Safemode::Jail

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

@@ -63,20 +63,30 @@ module Katello
       def variant_repos(host, variant)
         if variant && host.content_source
           product_id = host.try(:content_facet).try(:kickstart_repository).try(:product_id) || host.try(:kickstart_repository).try(:product_id)
-          distros = distribution_repositories(host)
+          distribution_repositories(host)
             .joins(:product)
             .where("#{Katello::Repository.table_name}.distribution_variant LIKE :variant", { variant: "%#{variant}%" })
             .where("#{Katello::Product.table_name}.id": product_id).collect { |repo| repo.to_hash(host.content_source, true) }
-          distros
         end
       end
 
       def distribution_repositories(host, content_facet: nil)
         content_facet ||= host.content_facet
-        content_view = content_facet.try(:content_view) || host.try(:content_view)
-        lifecycle_environment = content_facet.try(:lifecycle_environment) || host.try(:lifecycle_environment)
-        if content_view && lifecycle_environment && host.os && host.architecture
-          Katello::Repository.in_environment(lifecycle_environment).in_content_views([content_view]).
+        case content_facet
+        when ::Katello::Host::ContentFacet
+          if content_facet.new_record?
+            content_views = ::Katello::ContentView.where(id: content_facet.content_view_environments.map(&:content_view_id))
+            lifecycle_environments = ::Katello::KTEnvironment.where(id: content_facet.content_view_environments.map(&:environment_id))
+          else
+            content_views = content_facet.try(:content_views) || host.try(:content_views)
+            lifecycle_environments = content_facet.try(:lifecycle_environments) || host.try(:lifecycle_environments)
+          end
+        when ::Katello::Hostgroup::ContentFacet
+          content_views = [content_facet.try(:content_view), host.try(:content_views)].flatten.compact
+          lifecycle_environments = [content_facet.try(:lifecycle_environment), host.try(:lifecycle_environments)].flatten.compact
+        end
+        if content_views.present? && lifecycle_environments.present? && host.os && host.architecture
+          Katello::Repository.in_environment(lifecycle_environments).in_content_views(content_views).
               where(:distribution_arch => host.architecture.name).
               where("#{Katello::Repository.table_name}.distribution_version = :release or #{Katello::Repository.table_name}.distribution_version like :match",
                       release: host.os.release, match: "#{host.os.release}.%")

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

@@ -235,14 +235,6 @@ module Katello
         end
       end
 
-      def backend_service_type(repository)
-        if pulp3_support?(repository)
-          Actions::Pulp3::Abstract::BACKEND_SERVICE_TYPE
-        else
-          Actions::Pulp::Abstract::BACKEND_SERVICE_TYPE
-        end
-      end
-
       def pulp3_enabled?
         self.has_feature? PULP3_FEATURE
       end
@@ -451,10 +443,6 @@ module Katello
         repos_in_env_cv(environment, content_view) - repos_in_sync_history
       end
 
-      def smart_proxy_service
-        @smart_proxy_service ||= Pulp::SmartProxyRepository.new(self)
-      end
-
       def rhsm_url
         # Since Foreman 3.1 this setting is set
         if (rhsm_url = setting(SmartProxy::PULP3_FEATURE, 'rhsm_url'))

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

@@ -63,6 +63,7 @@ module Katello
       end
 
       def update_candlepin_associations(consumer_params = nil)
+        content_facet.cves_changed = false if content_facet
         content_facet&.save!
 
         auto_attach_enabled_via_checkin = consumer_params.try(:[], 'autoheal')

data/app/models/katello/content_view.rb

@@ -39,10 +39,13 @@ module Katello
 
     has_many :activation_keys, :class_name => "Katello::ActivationKey", :dependent => :restrict_with_exception
 
-    has_many :content_facets, :class_name => "Katello::Host::ContentFacet",
-             :inverse_of => :content_view, :dependent => :restrict_with_exception
+    has_many :content_view_environment_content_facets, :class_name => "Katello::ContentViewEnvironmentContentFacet",
+             :through => :content_view_environments
+    has_many :content_facets, :class_name => "Katello::Host::ContentFacet", :through => :content_view_environment_content_facets,
+             :inverse_of => :content_views
     has_many :hosts, :class_name => "::Host::Managed", :through => :content_facets,
-             :inverse_of => :content_view
+             :inverse_of => :content_views
+
     has_many :hostgroup_content_facets, :class_name => "Katello::Hostgroup::ContentFacet",
              :inverse_of => :content_view, :dependent => :nullify
     has_many :hostgroups, :class_name => "::Hostgroup", :through => :hostgroup_content_facets,
@@ -421,8 +424,10 @@ module Katello
       # update errata applicability counts for all hosts in the CV & LE
       Location.no_taxonomy_scope do
         User.as_anonymous_admin do
-          ::Katello::Host::ContentFacet.where(:content_view_id => self,
-                                              :lifecycle_environment_id => environment).each do |facet|
+          ::Katello::Host::ContentFacet.in_content_views_and_environments(
+            content_views: [self],
+            lifecycle_environments: [environment]
+          ).each do |facet|
             facet.update_applicability_counts
             facet.update_errata_status
           end
@@ -599,6 +604,7 @@ module Katello
         fail _("Import-only content views can not be published directly") if import_only? && !syncable
         check_composite_action_allowed!(organization.library)
         check_docker_repository_names!([organization.library])
+        check_orphaned_content_facets!(environments: self.environments)
       end
 
       true
@@ -645,6 +651,17 @@ module Katello
       true
     end
 
+    def check_orphaned_content_facets!(environments: [])
+      ::Katello::Host::ContentFacet.in_content_views_and_environments(
+        content_views: [self],
+        lifecycle_environments: environments
+      ).each do |facet|
+        unless facet.host
+          fail _("Orphaned content facets for deleted hosts exist for the content view and environment. Please run rake task : katello:clean_orphaned_facets and try again!")
+        end
+      end
+    end
+
     def check_remove_from_environment!(env)
       errors = []