katello 4.5.1 → 4.8.0.rc2

data/app/models/katello/alternate_content_source.rb

@@ -1,5 +1,7 @@
 module Katello
   class AlternateContentSource < Katello::Model
+    audited
+
     include Ext::LabelFromName
     include Encryptable
     include ::ScopedSearchExtensions
@@ -8,34 +10,62 @@ module Katello
 
     self.table_name = :katello_alternate_content_sources
 
-    # TODO: simplified, rhui
-    ACS_TYPES = %w(custom).freeze
+    ACS_TYPES = %w(custom simplified rhui).freeze
     CONTENT_TYPES = [::Katello::Repository::YUM_TYPE, ::Katello::Repository::FILE_TYPE].freeze
+    AUDIT_REFRESH_ACTION = 'refresh'.freeze
 
     encrypts :upstream_password
 
     belongs_to :ssl_ca_cert, inverse_of: :ssl_ca_alternate_content_sources, class_name: "Katello::ContentCredential"
     belongs_to :ssl_client_cert, inverse_of: :ssl_client_alternate_content_sources, class_name: "Katello::ContentCredential"
     belongs_to :ssl_client_key, inverse_of: :ssl_key_alternate_content_sources, class_name: "Katello::ContentCredential"
-    belongs_to :http_proxy, inverse_of: :alternate_content_sources
-    has_many :smart_proxy_alternate_content_sources, dependent: :destroy,
+    # We breakout ssl-* validation into a function to allow for us to set
+    # the object name correctly in complex error messages
+    validate :validate_ssl_ids
+
+    has_many :alternate_content_source_products, dependent: :delete_all, inverse_of: :alternate_content_source,
+             class_name: "Katello::AlternateContentSourceProduct"
+    has_many :products, through: :alternate_content_source_products, inverse_of: :alternate_content_sources,
+             class_name: "Katello::Product"
+
+    has_many :smart_proxy_alternate_content_sources, dependent: :delete_all,
              inverse_of: :alternate_content_source
-    has_many :smart_proxies, through: :smart_proxy_alternate_content_sources
+    has_many :smart_proxies, -> { distinct }, through: :smart_proxy_alternate_content_sources
 
-    validates :base_url, if: :custom?, presence: true
-    validates :verify_ssl, if: :custom?, exclusion: [nil]
+    validates :base_url, :subpaths, :upstream_username,
+              :upstream_password, if: :simplified?, absence: true
+    validates :base_url, if: -> { custom? || rhui? }, presence: true
+    validates :products, if: -> { custom? || rhui? }, absence: true
+    validates :label, :uniqueness => true
+    validates :name, :uniqueness => true, presence: true
+    # verify ssl must be validated this way due to presence: <bool> failing on a value of false
+    validates :verify_ssl, if: -> { custom? || rhui? }, inclusion: {
+      in: [true, false],
+      message: "can't be blank"
+    }
+    validates :verify_ssl, if: :simplified?, inclusion: {
+      in: [nil],
+      message: "must be blank"
+    }
     validates :alternate_content_source_type, inclusion: {
       in: ->(_) { ACS_TYPES },
       allow_blank: false,
       message: ->(_, _) { _("is not a valid type. Must be one of the following: %s") % ACS_TYPES.join(',') }
     }
-    validates :content_type, if: :custom?, inclusion: {
+    validates :content_type, inclusion: {
       in: ->(_) { RepositoryTypeManager.defined_repository_types.keys & CONTENT_TYPES },
       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"
+    }
+    validate :constraint_acs_update, on: :update
     validates_with Validators::AlternateContentSourcePathValidator, :attributes => [:base_url, :subpaths], :if => :custom?
 
+    scope :uses_http_proxies, -> { where(use_http_proxies: true) }
+
     scoped_search on: :name, complete_value: true
     scoped_search on: :label, complete_value: true
     scoped_search on: :description, complete_value: true
@@ -44,16 +74,32 @@ module Katello
     scoped_search on: :content_type, complete_value: true
     scoped_search on: :alternate_content_source_type, complete_value: true
     scoped_search on: :upstream_username, complete_value: true
-    scoped_search on: :smart_proxy_id, relation: :smart_proxy_alternate_content_sources, validator: ScopedSearch::Validators::INTEGER, only_explicit: true
+    scoped_search on: :id, relation: :smart_proxies, rename: :smart_proxy_id, validator: ScopedSearch::Validators::INTEGER, only_explicit: true
+    scoped_search on: :name, relation: :smart_proxies, rename: :smart_proxy_name, complete_value: true
+    scoped_search on: :id, relation: :products, rename: :product_id, validator: ScopedSearch::Validators::INTEGER, only_explicit: true
+    scoped_search on: :name, relation: :products, rename: :product_name, complete_value: true
 
-    def backend_service(smart_proxy)
-      @service ||= ::Katello::Pulp3::AlternateContentSource.new(self, smart_proxy)
+    def backend_service(smart_proxy, repository = nil)
+      @service ||= ::Katello::Pulp3::AlternateContentSource.new(self, smart_proxy, repository)
     end
 
     def custom?
       alternate_content_source_type == 'custom'
     end
 
+    def simplified?
+      alternate_content_source_type == 'simplified'
+    end
+
+    def rhui?
+      alternate_content_source_type == 'rhui'
+    end
+
+    def self.with_products(products)
+      products = [products] unless products.is_a?(Array)
+      joins(:alternate_content_source_products).where('katello_alternate_content_source_products.product_id in (:product_ids)', product_ids: products.pluck(:id))
+    end
+
     def self.with_type(content_type)
       where(content_type: content_type)
     end
@@ -67,5 +113,55 @@ module Katello
       @latest_dynflow_refresh_task ||= ForemanTasks::Task::DynflowTask.where(:label => Actions::Katello::AlternateContentSource::Refresh.name).
           for_resource(self).order(:started_at).last
     end
+
+    def audit_refresh
+      write_audit(action: AUDIT_REFRESH_ACTION, comment: _('Successfully refreshed.'), audited_changes: {})
+    end
+
+    def audit_updated_products(old_product_ids)
+      write_audit(action: 'update', comment: _('Products updated.'), audited_changes: { 'product_ids' => [old_product_ids, product_ids] })
+    end
+
+    def self.humanize_class_name(_name = nil)
+      "Alternate Content Sources"
+    end
+
+    # Disallow static properties from being modified on update
+    def constraint_acs_update
+      if changes.keys.include? "content_type"
+        errors.add(:content_type, "cannot be modified once an ACS is created")
+      end
+      if changes.keys.include? "alternate_content_source_type"
+        errors.add(:alternate_content_source_type, "cannot be modified once an ACS is created")
+      end
+    end
+
+    # Validate ssl-* ids which require complex/custom error messages
+    def validate_ssl_ids
+      # Simplified ACS's should never have ssl-* params populated
+      if simplified?
+        if changes.keys.include? "ssl_ca_cert_id"
+          errors.add(:ssl_ca_cert, "must be blank")
+        end
+        if changes.keys.include? "ssl_client_cert_id"
+          errors.add(:ssl_client_cert, "must be blank")
+        end
+        if changes.keys.include? "ssl_client_key_id"
+          errors.add(:ssl_client_key, "must be blank")
+        end
+
+      # Custom and RHUI ACS's should have valid keys where populated
+      else
+        if ssl_ca_cert_id.present? && ssl_ca_cert.nil?
+          errors.add(:ssl_ca_cert, "with ID '#{ssl_ca_cert_id}' couldn't be found")
+        end
+        if ssl_client_cert_id.present? && ssl_client_cert.nil?
+          errors.add(:ssl_client_cert, "with ID '#{ssl_client_cert_id}' couldn't be found")
+        end
+        if ssl_client_key_id.present? && ssl_client_key.nil?
+          errors.add(:ssl_client_key, "with ID '#{ssl_client_key_id}' couldn't be found")
+        end
+      end
+    end
   end
 end

data/app/models/katello/alternate_content_source_product.rb

@@ -0,0 +1,13 @@
+module Katello
+  class AlternateContentSourceProduct < Katello::Model
+    audited
+    # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
+    self.table_name = :katello_alternate_content_source_products
+    belongs_to :alternate_content_source, inverse_of: :alternate_content_source_products, class_name: 'Katello::AlternateContentSource'
+    belongs_to :product, inverse_of: :alternate_content_source_products, class_name: 'Katello::Product'
+    delegate :custom?, :rhui?, to: :alternate_content_source
+    delegate :simplified?, to: :alternate_content_source
+
+    validates_with Validators::AlternateContentSourceProductsValidator, :attributes => [:product_id], if: :simplified?
+  end
+end

data/app/models/katello/authorization/repository.rb

@@ -6,12 +6,12 @@ module Katello
 
     def deletable?(remove_from_content_view_versions = true)
       return false unless product.editable?
-      remove_from_content_view_versions || !promoted? || (self.content_views.exists? && !self.content_views.generated_for_none.exists?)
+      remove_from_content_view_versions || !promoted? || (self.content_views_all(include_composite: true).exists? && !self.content_views_all(include_composite: true).generated_for_none.exists?)
     end
 
     def redhat_deletable?(remove_from_content_view_versions = false)
       return false unless product.editable?
-      remove_from_content_view_versions || !self.promoted? || (self.content_views.exists? && !self.content_views.generated_for_none.exists?)
+      remove_from_content_view_versions || !self.promoted? || (self.content_views_all(include_composite: true).exists? && !self.content_views_all(include_composite: true).generated_for_none.exists?)
     end
 
     def readable?

data/app/models/katello/cdn_configuration.rb

@@ -5,8 +5,9 @@ module Katello
     CDN_TYPE = 'redhat_cdn'.freeze
     NETWORK_SYNC = 'network_sync'.freeze
     EXPORT_SYNC = 'export_sync'.freeze
+    CUSTOM_CDN_TYPE = 'custom_cdn'.freeze
 
-    TYPES = [CDN_TYPE, NETWORK_SYNC, EXPORT_SYNC].freeze
+    TYPES = [CDN_TYPE, NETWORK_SYNC, EXPORT_SYNC, CUSTOM_CDN_TYPE].freeze
 
     belongs_to :organization, :inverse_of => :cdn_configuration
 
@@ -32,6 +33,14 @@ module Katello
       type == CDN_TYPE
     end
 
+    def custom_cdn?
+      type == CUSTOM_CDN_TYPE
+    end
+
+    def redhat_cdn_url?
+      Katello::Resources::CDN::CdnResource.redhat_cdn?(url)
+    end
+
     def export_sync?
       type == EXPORT_SYNC
     end
@@ -46,11 +55,11 @@ module Katello
       return if network_sync?
 
       self.url = nil if export_sync?
-      self.url ||= SETTINGS[:katello][:redhat_repository_url] if redhat_cdn?
+      self.url = SETTINGS[:katello][:redhat_repository_url] if redhat_cdn?
       self.username = nil
       self.password = nil
       self.upstream_organization_label = nil
-      self.ssl_ca_credential_id = nil
+      self.ssl_ca_credential_id = nil unless custom_cdn?
       self.upstream_content_view_label = nil
       self.upstream_lifecycle_environment_label = nil
       self.ssl_cert = nil

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

@@ -6,10 +6,30 @@ module Katello
       include ForemanTasks::Concerns::ActionSubject
 
       module Overrides
+        def update(attrs)
+          if attrs[:content_facet_attributes]
+            cv_id = attrs[:content_facet_attributes].delete(:content_view_id)
+            lce_id = attrs[:content_facet_attributes].delete(:lifecycle_environment_id)
+            if cv_id && lce_id
+              content_facet.assign_single_environment(content_view_id: cv_id, lifecycle_environment_id: lce_id)
+            end
+            if (cv_id.present? && lce_id.blank?) || (cv_id.blank? && lce_id.present?)
+              fail "content_view_id and lifecycle_environment_id must be provided together"
+            end
+          end
+          super
+        end
+
         def validate_media?
           (content_source_id.blank? || (content_facet && content_facet.kickstart_repository.blank?)) && super
         end
 
+        def inherited_attributes
+          inherited_attrs = super
+          inherited_attrs.delete('medium_id') if content_facet && !content_facet.kickstart_repository.blank?
+          inherited_attrs
+        end
+
         def smart_proxy_ids
           ids = super
           ids << content_source_id
@@ -45,8 +65,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
@@ -86,6 +110,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
 
@@ -105,8 +133,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
@@ -118,8 +146,10 @@ module Katello
       end
 
       def refresh_content_host_status
-        self.host_statuses.where(type: ::Katello::HostStatusManager::STATUSES.map(&:name)).each do |status|
-          status.refresh!
+        if content_facet&.present?
+          self.host_statuses.where(type: ::Katello::HostStatusManager::STATUSES.map(&:name)).each do |status|
+            status.refresh!
+          end
         end
         refresh_global_status
       end
@@ -204,7 +234,16 @@ module Katello
 
       def import_package_profile_in_bulk(simple_packages)
         nvreas = simple_packages.map { |sp| sp.nvrea }
-        found = InstalledPackage.where(:nvrea => nvreas).select(:id, :nvrea).to_a
+        found_nvrea = InstalledPackage.where(:nvrea => nvreas)
+        nil_vendor_installed_packages = found_nvrea.where(vendor: nil)
+        unless nil_vendor_installed_packages.blank?
+          packages_to_update = simple_packages.select { |sp| !sp.vendor.blank? && nil_vendor_installed_packages&.map(&:nvrea)&.include?(sp.nvrea) }
+          packages_to_update.each do |simple_package|
+            nil_vendor_installed_packages.where(nvrea: simple_package.nvrea).update(vendor: simple_package.vendor)
+          end
+        end
+
+        found = found_nvrea.select(:id, :nvrea).to_a
         found_nvreas = found.map(&:nvrea)
 
         new_packages = simple_packages.select { |sp| !found_nvreas.include?(sp.nvrea) }
@@ -217,7 +256,8 @@ module Katello
                                           :epoch => simple_package.epoch,
                                           :version => simple_package.version,
                                           :release => simple_package.release,
-                                          :arch => simple_package.arch)
+                                          :arch => simple_package.arch,
+                                          :vendor => simple_package.vendor)
         end
         InstalledPackage.import(installed_packages, validate: false, on_duplicate_key_ignore: true)
         #re-lookup all imported to pickup any duplicates/conflicts
@@ -245,9 +285,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)
@@ -400,7 +440,7 @@ module Katello
         ::Katello::HostTracer.helpers_for(traces)
       end
 
-      def package_names_for_job_template(action:, search:)
+      def package_names_for_job_template(action:, search:, versions: nil)
         actions = %w(install remove update).freeze
         case action
         when 'install'
@@ -412,9 +452,16 @@ module Katello
         when 'update'
           return [] if search.empty?
 
+          versions_by_name = {}
+          if versions.present?
+            JSON.parse(versions).each do |nvra|
+              nvra =~ /([^.]*)-\d+\.[-.\w]*/
+              versions_by_name[Regexp.last_match(1)] = nvra
+            end
+          end
           pkg_names = installed_packages.search_for(search).distinct.pluck(:name)
           upgrades = ::Katello::Rpm.installable_for_hosts([self]).select(:id, :name, :nvra, :evr).order(evr: :desc).group_by(&:name)
-          pkg_names.map { |p| upgrades[p]&.first&.nvra }.compact
+          pkg_names.map { |p| versions_by_name[p] || upgrades[p]&.first&.nvra }.compact
         else
           fail ::Foreman::Exception.new(N_("package_names_for_job_template: Action must be one of %s"), actions.join(', '))
         end
@@ -446,9 +493,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/http_proxy_extensions.rb

@@ -6,7 +6,8 @@ module Katello
       included do
         has_many :root_repositories, :class_name => "::Katello::RootRepository", :foreign_key => :http_proxy_id,
           :inverse_of => :http_proxy, :dependent => :nullify
-        has_many :alternate_content_sources, :class_name => "::Katello::AlternateContentSource", :foreign_key => :http_proxy_id,
+        # A smart proxy's HTTP proxy is used for all related alternate content sources.
+        has_many :smart_proxies, :class_name => "::SmartProxy", :foreign_key => :http_proxy_id,
           :inverse_of => :http_proxy, :dependent => :nullify
         after_update :update_default_proxy_setting
         after_commit :update_repository_proxy_details
@@ -31,7 +32,6 @@ module Katello
 
       def remove_references_to_proxy
         root_repos = repositories_with_proxy(nil).uniq.sort
-        acss = ::Katello::AlternateContentSource.where(http_proxy_id: id)
 
         setting = Setting.find_by(name: 'content_default_http_proxy')
         if setting&.value && setting.value == self.name
@@ -47,14 +47,9 @@ module Katello
             http_proxy_id: nil)
         end
 
-        unless acss.empty?
-          acss.each do |acs|
-            ForemanTasks.async_task(
-              ::Actions::Katello::AlternateContentSource::Update,
-              acs,
-              acs.smart_proxies,
-              http_proxy_id: nil
-            )
+        unless smart_proxies.empty?
+          smart_proxies.each do |smart_proxy|
+            smart_proxy.update(http_proxy_id: nil)
           end
         end
       end

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

@@ -90,6 +90,10 @@ module Katello
           self.providers.anonymous.first
         end
 
+        def simple_content_access_eligible?
+          self.content_access_mode_list.include?('org_environment')
+        end
+
         def manifest_imported?(cached: false)
           Rails.cache.fetch("#{self.label}_manifest_imported?", expires_in: 1.minute, force: !cached) do
             owner_details['upstreamConsumer'].present?
@@ -238,10 +242,6 @@ module Katello
           # doesn't provide much benefit for the frustration it creates.
           self.save(validate: false)
         end
-
-        def upstream_consumer
-          Katello::Candlepin::UpstreamConsumer.new(self)
-        end
       end
     end
   end

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

@@ -156,8 +156,8 @@ module Katello
         end
 
         self.joins(repository_association_units).
-            where(repository_association_class.table_name => {:repository_id => facet_repos,
-                                                              content_unit_association_id => facet_content_units}).distinct
+          where(repository_association_class.table_name => { :repository_id => facet_repos,
+                                                             content_unit_association_id => facet_content_units }).distinct
       end
 
       def with_identifiers(ids)

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}.%")