katello 4.13.0 → 4.14.0.rc1

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

@@ -11,8 +11,7 @@ module Katello
 
       module Overrides
         def refresh
-          errors = super
-          errors
+          super
         end
       end
 
@@ -254,10 +253,11 @@ module Katello
       end
 
       def pulp3_ssl_configuration(config, connection_adapter = Faraday.default_adapter)
-        if connection_adapter == :excon
+        case connection_adapter
+        when :excon
           config.ssl_client_cert = ::Cert::Certs.ssl_client_cert_filename
           config.ssl_client_key = ::Cert::Certs.ssl_client_key_filename
-        elsif connection_adapter == :net_http
+        when :net_http
           config.ssl_client_cert = ::Cert::Certs.ssl_client_cert
           config.ssl_client_key = ::Cert::Certs.ssl_client_key
         else

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

@@ -28,6 +28,7 @@ module Katello
         scoped_search :on => :registered_through, :relation => :subscription_facet, :complete_value => true, :only_explicit => true
         scoped_search :on => :registered_at, :relation => :subscription_facet, :rename => :registered_at, :only_explicit => true
         scoped_search :on => :uuid, :relation => :subscription_facet, :rename => :subscription_uuid, :only_explicit => true
+        scoped_search :on => :convert2rhel_through_foreman, :relation => :subscription_facet, :only_explicit => true
         scoped_search :relation => :activation_keys, :on => :name, :rename => :activation_key, :complete_value => true, :ext_method => :find_by_activation_key
         scoped_search :relation => :activation_keys, :on => :id, :rename => :activation_key_id, :complete_value => true, :ext_method => :find_by_activation_key_id,
                       :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
@@ -42,6 +43,7 @@ module Katello
       end
 
       def update_candlepin_associations(consumer_params = nil)
+        Rails.logger.debug "Updating Candlepin associations for host #{name}"
         content_facet.cves_changed = false if content_facet
         content_facet&.save!
 

data/app/models/katello/content_view.rb

@@ -712,6 +712,7 @@ module Katello
     end
 
     def check_remove_from_environment!(env)
+      check_orphaned_content_facets!(environments: [env])
       errors = []
 
       dependencies = { hosts: _("hosts"),
@@ -730,6 +731,7 @@ module Katello
     end
 
     def check_ready_to_destroy!
+      check_orphaned_content_facets!(environments: self.environments)
       errors = []
 
       dependencies = { environments: _("environments"),
@@ -862,7 +864,9 @@ module Katello
       }
 
       table = Audit.arel_table
-      repository_condition = table[:auditable_id].eq(id).and(audited_changes_like.call("repository_ids"))
+      repository_condition = table[:auditable_id].eq(id)
+                                                 .and(table[:auditable_type].eq('Katello::ContentView'))
+                                                 .and(audited_changes_like.call("repository_ids"))
 
       cv_repository_condition = table[:auditable_id].in(cv_repository_ids)
                                                     .and(table[:auditable_type].eq('Katello::Repository'))

data/app/models/katello/content_view_environment.rb

@@ -24,12 +24,23 @@ module Katello
     before_save :generate_info
 
     scope :non_default, -> { joins(:content_view).where("katello_content_views.default" => false) }
+    scope :default, -> { joins(:content_view).where("katello_content_views.default" => true) }
     alias :lifecycle_environment :environment
 
     def self.for_content_facets(content_facets)
       joins(:content_view_environment_content_facets, :content_facets).where("#{Katello::ContentViewEnvironmentContentFacet.table_name}.content_facet_id" => content_facets).uniq
     end
 
+    def self.with_candlepin_name(cp_name, organization: Organization.current)
+      lce_name, cv_name = cp_name.split('/')
+      if cv_name.blank? && lce_name == 'Library'
+        return default.find_by(
+          environment: ::Katello::KTEnvironment.library.where(organization: organization)&.first
+        )
+      end
+      joins(:environment, :content_view).where("#{Katello::KTEnvironment.table_name}.label" => lce_name, "#{Katello::ContentView.table_name}.label" => cv_name).first
+    end
+
     # retrieve the owning environment for this content view environment.
     def owner
       self.environment
@@ -47,10 +58,14 @@ module Katello
       content_view.default? && environment.library?
     end
 
-    # TODO: uncomment when we need to start showing multiple CVE names in UI
-    # def candlepin_name
-    #   "#{environment.label}/#{content_view.label}"
-    # end
+    def candlepin_name
+      return environment.label if default_environment?
+      "#{environment.label}/#{content_view.label}"
+    end
+
+    def priority(content_facet)
+      content_view_environment_content_facets.find_by(:content_facet_id => content_facet.id).try(:priority)
+    end
 
     private
 

data/app/models/katello/content_view_environment_content_facet.rb

@@ -3,6 +3,8 @@ module Katello
     belongs_to :content_view_environment, :class_name => "::Katello::ContentViewEnvironment", :inverse_of => :content_view_environment_content_facets
     belongs_to :content_facet, :class_name => "::Katello::Host::ContentFacet", :inverse_of => :content_view_environment_content_facets
 
+    default_scope { order(:priority => :asc) }
+
     validates :content_view_environment_id, presence: true
     validates :content_facet_id, presence: true, unless: :new_record?
     validate :ensure_valid_content_source, if: proc { Setting['validate_host_lce_content_source_coherence'] }
@@ -19,5 +21,14 @@ module Katello
         errors.add(:base, error_msg)
       end
     end
+
+    def self.reprioritize_for_content_facet(content_facet, new_cves)
+      new_order = new_cves.map do |cve|
+        content_facet.content_view_environment_content_facets.find_by(:content_view_environment_id => cve.id)
+      end
+      new_order.compact.each_with_index do |cvecf, index|
+        cvecf.update_column(:priority, index)
+      end
+    end
   end
 end

data/app/models/katello/erratum.rb

@@ -67,7 +67,7 @@ module Katello
     end
 
     def self.applicable_to_hosts(hosts)
-      # Note: ContentFacetErrata actually holds the "Applicable Errata" to that host
+      # NOTE: ContentFacetErrata actually holds the "Applicable Errata" to that host
       # It is not the errata "belonging" to the host. Its rather the errata that is "applicable"
       # which is calculated elsewhere.
 

data/app/models/katello/event.rb

@@ -1,7 +1,7 @@
 module Katello
   class Event < Katello::Model
     validate :validate_event_type
-    # Note: Do not use active record call backs or dependent references on this class
+    # NOTE: Do not use active record call backs or dependent references on this class
     # Direct deletes are made in EventQueue#clear_events (instead of destroys).
 
     serialize :metadata, Hash

data/app/models/katello/glue/provider.rb

@@ -34,7 +34,7 @@ module Katello
       API_URL = 'https://subscription.rhsm.redhat.com/subscription/consumers/'.freeze
       def api_url(upstream = {})
         # Default to Red Hat
-        upstream['apiUrl'] || API_URL
+        ENV['REDHAT_RHSM_API_URL'] || upstream['apiUrl'] || API_URL
       end
 
       def sync
@@ -65,7 +65,6 @@ module Katello
           Rails.logger.error "Upstream identity certificate not available"
           fail _("Upstream identity certificate not available")
         end
-
         params = {}
         params[:capabilities] = Resources::Candlepin::CandlepinPing.ping['managerCapabilities'].inject([]) do |result, element|
           result << {'name' => element}

data/app/models/katello/hash_util.rb

@@ -16,7 +16,7 @@ module Katello
       subhash = hash[params.first]
       # If we don't have a subhash don't try and recurse down
       if !subhash.nil? && !subhash.empty?
-        self.null_safe_get(subhash, default, params[1..-1])
+        self.null_safe_get(subhash, default, params[1..])
       else
         default
       end

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

@@ -64,6 +64,7 @@ module Katello
       end
 
       def mark_cves_changed(_cve)
+        Rails.logger.debug("ContentFacet: Marking CVEs changed for host #{host&.to_label}")
         self.cves_changed = true
       end
 
@@ -99,6 +100,17 @@ module Katello
         content_view_environments&.first&.lifecycle_environment
       end
 
+      def content_view_environments=(new_cves)
+        if new_cves.length > 1 && !Setting['allow_multiple_content_views']
+          fail ::Katello::Errors::MultiEnvironmentNotSupportedError,
+          _("Assigning a host to multiple content view environments is not enabled.")
+        end
+        super(new_cves)
+        Katello::ContentViewEnvironmentContentFacet.reprioritize_for_content_facet(self, new_cves)
+        self.content_view_environments.reload unless self.new_record?
+        self.host&.update_candlepin_associations unless self.host&.new_record?
+      end
+
       # rubocop:disable Metrics/CyclomaticComplexity
       def assign_single_environment(
         content_view_id: nil, lifecycle_environment_id: nil, environment_id: nil,
@@ -126,9 +138,10 @@ module Katello
       end
 
       def default_environment?
-        content_view_environments.any? do |cve|
-          cve.content_view.default? && cve.lifecycle_environment.library?
-        end
+        return if content_view_environments.blank?
+        # if default cve is first, this is equivalent to default being the only one.
+        # if default cve is not first, candlepin will prioritize CV repos over library repos in case of conflicts.
+        content_view_environments.first.default_environment?
       end
 
       def update_repositories_by_paths(paths)

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

@@ -162,10 +162,22 @@ module Katello
         end
       end
 
+      def candlepin_environments_cp_ids
+        candlepin_environments.map { |e| e[:id] }
+      end
+
       def content_view_environments
         self.host.content_facet.try(:content_view_environments)
       end
 
+      def consumer_cve_order_from_candlepin
+        Katello::Resources::Candlepin::Consumer.get(uuid)['environments'].map { |e| e['id'] }
+      end
+
+      def cves_ordered_correctly?
+        consumer_cve_order_from_candlepin == candlepin_environments_cp_ids
+      end
+
       def organization
         self.host.organization
       end
@@ -229,10 +241,8 @@ module Katello
         setting_fact = Setting[:register_hostname_fact]
         only_use_custom_fact = Setting[:register_hostname_fact_strict_match]
 
-        if !setting_fact.blank? && !facts[setting_fact].blank?
-          if only_use_custom_fact || ::Host.where(:name => setting_fact.downcase).any?
-            facts[setting_fact]
-          end
+        if !setting_fact.blank? && !facts[setting_fact].blank? && (only_use_custom_fact || ::Host.where(:name => setting_fact.downcase).any?)
+          facts[setting_fact]
         end
       end
 
@@ -287,6 +297,19 @@ module Katello
         false
       end
 
+      def self.populate_fields_from_facts(host, parser, _type, _source_proxy)
+        has_convert2rhel = parser.facts.key?('conversions.env.CONVERT2RHEL_THROUGH_FOREMAN')
+        return unless host.subscription_facet || has_convert2rhel
+        # Add in custom convert2rhel fact if system was converted using convert2rhel through Katello
+        # We want the value nil unless the custom fact is present otherwise we get a 0 in the database which if debugging
+        # might make you think it was converted2rhel but not with satellite, that is why I have the tenary below.
+        facet = host.subscription_facet || host.build_subscription_facet
+        facet.attributes = {
+          convert2rhel_through_foreman: has_convert2rhel ? ::Foreman::Cast.to_bool(parser.facts['conversions.env.CONVERT2RHEL_THROUGH_FOREMAN']) : nil
+        }.compact
+        facet.save unless facet.new_record?
+      end
+
       private
 
       def update_status(status_class, **args)

data/app/models/katello/host_collection.rb

@@ -58,8 +58,12 @@ module Katello
       consumer_ids
     end
 
-    def errata(type = nil)
-      query = Erratum.joins(:content_facets).where("#{Katello::Host::ContentFacet.table_name}.host_id" => self.host_ids)
+    def errata(type = nil, installable_only: false)
+      query = if installable_only
+                Katello::Erratum.installable_for_hosts(self.hosts)
+              else
+                Katello::Erratum.applicable_to_hosts(self.hosts)
+              end
       type ? query.of_type(type) : query
     end
 
@@ -95,16 +99,16 @@ module Katello
       return host_collections_hash[:critical].to_a, host_collections_hash[:warning].to_a, host_collections_hash[:ok].to_a
     end
 
-    def security_updates?
-      errata(Erratum::SECURITY).any?
+    def security_updates?(installable_only: false)
+      errata(Erratum::SECURITY, installable_only: installable_only).any?
     end
 
-    def bugzilla_updates?
-      errata(Erratum::BUGZILLA).any?
+    def bugzilla_updates?(installable_only: false)
+      errata(Erratum::BUGZILLA, installable_only: installable_only).any?
     end
 
-    def enhancement_updates?
-      errata(Erratum::ENHANCEMENT).any?
+    def enhancement_updates?(installable_only: false)
+      errata(Erratum::ENHANCEMENT, installable_only: installable_only).any?
     end
 
     def self.humanize_class_name(_name = nil)

data/app/models/katello/pool.rb

@@ -55,6 +55,10 @@ module Katello
 
     validate :subscription_matches_organization
 
+    def product_host_count
+      Katello::Host::ContentFacet.joins(bound_repositories: { product: :pools }).where(pools: { id: id }).distinct.count
+    end
+
     def subscription_matches_organization
       return if errors[:subscription].any? || errors[:organization].any? # let other validations catch this
       unless subscription&.organization_id == self.organization_id
@@ -147,7 +151,7 @@ module Katello
       property :days_until_expiration, Integer, desc: 'Returns number of days until expiration'
     end
     class Jail < ::Safemode::Jail
-      allow :id, :name, :available, :quantity, :product_id, :contract_number, :type, :account_number, :start_date, :end_date, :organization, :consumed, :days_until_expiration
+      allow :id, :name, :available, :quantity, :product_id, :contract_number, :type, :account_number, :start_date, :end_date, :organization, :consumed, :days_until_expiration, :product_host_count
     end
   end
 end

data/app/models/katello/product.rb

@@ -84,6 +84,10 @@ module Katello
 
     before_create :assign_unique_label
 
+    def acs_compatible_repositories
+      repositories.has_url.not_uln.library
+    end
+
     def orphaned?
       self.pool_products.empty?
     end
@@ -122,13 +126,12 @@ module Katello
       options = {} if options.nil?
 
       hash = super(options.merge(:except => [:cp_id, :id]))
-      hash = hash.merge(:multiplier => self.multiplier,
+      hash.merge(:multiplier => self.multiplier,
                         :attributes => self.attrs,
                         :id => self.cp_id,
                         :sync_plan_name => self.sync_plan ? self.sync_plan.name : nil,
                         :sync_state => self.sync_state,
                         :last_sync => self.last_sync)
-      hash
     end
 
     def redhat?
@@ -168,8 +171,8 @@ module Katello
       self.label = Util::Model.labelize(self.name) if self.label.blank?
 
       # if the object label is already being used in this org, append the id to make it unique
-      if Product.all_in_org(self.organization).where("#{Katello::Product.table_name}.label = ?", self.label).count > 0
-        self.label = self.label + "_" + self.cp_id unless self.cp_id.blank?
+      if Product.all_in_org(self.organization).where("#{Katello::Product.table_name}.label = ?", self.label).count > 0 && !self.cp_id.blank?
+        self.label = self.label + "_" + self.cp_id
       end
     end
 

data/app/models/katello/provider.rb

@@ -84,9 +84,8 @@ module Katello
     def serializable_hash(options = {})
       options = {} if options.nil?
       hash = super(options)
-      hash = hash.merge(:sync_state => self.sync_state,
+      hash.merge(:sync_state => self.sync_state,
                         :last_sync => self.last_sync)
-      hash
     end
 
     def manifest_task

data/app/models/katello/repository.rb

@@ -32,6 +32,8 @@ module Katello
 
     EXPORTABLE_TYPES = [YUM_TYPE, FILE_TYPE, ANSIBLE_COLLECTION_TYPE, DOCKER_TYPE, DEB_TYPE].freeze
 
+    ALLOWED_UPDATE_FIELDS = ['version_href', 'last_indexed'].freeze
+
     define_model_callbacks :sync, :only => :after
 
     belongs_to :root, :inverse_of => :repositories, :class_name => "Katello::RootRepository"
@@ -119,8 +121,10 @@ module Katello
 
     before_validation :set_pulp_id
     before_validation :set_container_repository_name, :unless => :skip_container_name?
+    before_update :prevent_updates, :unless => :allow_updates?
 
     scope :has_url, -> { joins(:root).where.not("#{RootRepository.table_name}.url" => nil) }
+    scope :not_uln, -> { joins(:root).where("#{RootRepository.table_name}.url NOT LIKE 'uln%'") }
     scope :on_demand, -> { joins(:root).where("#{RootRepository.table_name}.download_policy" => ::Katello::RootRepository::DOWNLOAD_ON_DEMAND) }
     scope :immediate, -> { joins(:root).where("#{RootRepository.table_name}.download_policy" => ::Katello::RootRepository::DOWNLOAD_IMMEDIATE) }
     scope :non_immediate, -> { joins(:root).where.not("#{RootRepository.table_name}.download_policy" => ::Katello::RootRepository::DOWNLOAD_IMMEDIATE) }
@@ -166,7 +170,7 @@ module Katello
     scoped_search :on => :name, :relation => :product, :rename => :product_name
     scoped_search :on => :id, :relation => :product, :rename => :product_id, :only_explicit => true
     scoped_search :on => :label, :relation => :root, :complete_value => true, :only_explicit => true
-    scoped_search :on => :content_label, :ext_method => :search_by_content_label
+    scoped_search :on => :content_label, :ext_method => :search_by_content_label, :default_operator => :like
 
     delegate :product, :redhat?, :custom?, :to => :root
     delegate :yum?, :docker?, :deb?, :file?, :ostree?, :ansible_collection?, :generic?, :to => :root
@@ -179,7 +183,7 @@ module Katello
              :deb_components, :deb_architectures, :ssl_ca_cert_id, :ssl_ca_cert, :ssl_client_cert, :ssl_client_cert_id,
              :ssl_client_key_id, :os_versions, :ssl_client_key, :ignorable_content, :description, :include_tags, :exclude_tags,
              :ansible_collection_requirements, :ansible_collection_auth_url, :ansible_collection_auth_token,
-             :http_proxy_policy, :http_proxy_id, :to => :root
+             :http_proxy_policy, :http_proxy_id, :prevent_updates, :to => :root
 
     delegate :content_id, to: :root, allow_nil: true
     delegate :repository_type, to: :root
@@ -345,9 +349,10 @@ module Katello
     def content_counts
       content_counts = {}
       RepositoryTypeManager.defined_repository_types[content_type].content_types_to_index.each do |content_type|
-        if content_type&.model_class::CONTENT_TYPE == DockerTag::CONTENT_TYPE
+        case content_type&.model_class::CONTENT_TYPE
+        when DockerTag::CONTENT_TYPE
           content_counts[DockerTag::CONTENT_TYPE] = docker_tags.count
-        elsif content_type&.model_class::CONTENT_TYPE == GenericContentUnit::CONTENT_TYPE
+        when GenericContentUnit::CONTENT_TYPE
           content_counts[content_type.content_type] = content_type&.model_class&.in_repositories(self)&.where(:content_type => content_type.content_type)&.count
         else
           content_counts[content_type.label] = content_type&.model_class&.in_repositories(self)&.count
@@ -791,6 +796,8 @@ module Katello
           return true
         elsif !self.custom? && self.redhat_deletable?(remove_from_content_view_versions)
           return true
+        elsif Setting.find_by(name: 'delete_repo_across_cv')&.value
+          return true
         else
           errors.add(:base, _("Repository cannot be deleted since it has already been included in a published Content View. " \
                               "Please delete all Content View versions containing this repository before attempting to delete it "\
@@ -1007,6 +1014,7 @@ module Katello
         repository_type.index_additional_data_proc&.call(self)
       end
       self.update!(last_indexed: DateTime.now)
+
       true
     end
 
@@ -1048,6 +1056,12 @@ module Katello
       DockerMetaTag.cleanup_tags
     end
 
+    def allow_updates?
+      # allow the update if this repo is not in the default view
+      return true unless in_default_view?
+      root.allow_updates?(::Katello::Repository::ALLOWED_UPDATE_FIELDS)
+    end
+
     apipie :class, desc: "A class representing #{model_name.human} object" do
       name 'Repository'
       refs 'Repository'

data/app/models/katello/root_repository.rb

@@ -46,6 +46,8 @@ module Katello
     MIRRORING_POLICY_COMPLETE = 'mirror_complete'.freeze
     MIRRORING_POLICIES = [MIRRORING_POLICY_ADDITIVE, MIRRORING_POLICY_COMPLETE, MIRRORING_POLICY_CONTENT].freeze
 
+    ALLOWED_UPDATE_FIELDS = ['updated_at', 'content_id'].freeze
+
     belongs_to :product, :inverse_of => :root_repositories, :class_name => "Katello::Product"
     has_one :provider, :through => :product
 
@@ -60,6 +62,8 @@ module Katello
     has_many :repository_references, :class_name => 'Katello::Pulp3::RepositoryReference',
              :dependent => :destroy, :inverse_of => :root_repository
 
+    before_validation :remove_sha1_checksum_type, if: :sha1_checksum?
+
     validates_lengths_from_database :except => [:label]
     validates_with Validators::KatelloLabelFormatValidator, :attributes => :label
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
@@ -113,6 +117,7 @@ module Katello
       }
 
     validates :container_push_name_format, inclusion: { in: ['label', 'id'].freeze, allow_nil: true}
+    before_update :prevent_updates, :unless => :allow_updates?
 
     scope :subscribable, -> { where(content_type: RootRepository::SUBSCRIBABLE_TYPES) }
     scope :skipable_metadata_check, -> { where(content_type: RootRepository::SKIPABLE_METADATA_TYPES) }
@@ -157,6 +162,14 @@ module Katello
       joins(:product).where("#{Katello::Product.table_name}.organization_id" => org)
     end
 
+    def sha1_checksum?
+      checksum_type == 'sha1'
+    end
+
+    def remove_sha1_checksum_type
+      self.checksum_type = nil
+    end
+
     def ensure_content_attribute_restrictions
       CONTENT_ATTRIBUTE_RESTRICTIONS.each do |attribute, value|
         if self.send(attribute).present? && !value.include?(self.content_type)
@@ -445,6 +458,22 @@ module Katello
       end
     end
 
+    def allow_updates?(additional_allowed_fields = [])
+      # allow updates for non-container-push repos, repos not in default view, and
+      # repos with a library instance
+      return true unless is_container_push && library_instance.present?
+
+      # let updates that contain ONLY allowed strings through
+      allowed_fields = ::Katello::RootRepository::ALLOWED_UPDATE_FIELDS + additional_allowed_fields
+      return true if (changed - allowed_fields).empty?
+
+      false
+    end
+
+    def prevent_updates
+      fail _("Cannot update properties of a container push repository")
+    end
+
     apipie :class, desc: 'A class representing Repository object' do
       name 'Repository'
       refs 'Repository'

data/app/models/katello/rpm.rb

@@ -53,7 +53,7 @@ module Katello
       # https://github.com/wvanbergen/scoped_search/blob/master/lib/scoped_search/query_builder.rb
       if ['LIKE', 'NOT LIKE'].include?(operator)
         conditions = "#{self.table_name}.#{column} #{operator} ?"
-        parameter = (value !~ /^\%|\*/ && value !~ /\%|\*$/) ? "%#{value}%" : value.tr_s('%*', '%')
+        parameter = (value !~ /^%|\*/ && value !~ /%|\*$/) ? "%#{value}%" : value.tr_s('%*', '%')
         return { :conditions => conditions, :parameter => [parameter] }
       elsif ['IN', 'NOT IN'].include?(operator)
         conditions = "#{self.table_name}.#{column} #{operator} (#{value.split(',').collect { '?' }.join(',')})"
@@ -124,7 +124,7 @@ module Katello
     end
 
     def self.scoped_search_evr_like(operator, value)
-      val = (value !~ /^\%|\*/ && value !~ /\%|\*$/) ? "%#{value}%" : value.tr_s('%*', '%')
+      val = (value !~ /^%|\*/ && value !~ /%|\*$/) ? "%#{value}%" : value.tr_s('%*', '%')
       evr = Util::Package.parse_evr(val)
       (e, v, r) = [evr[:epoch], evr[:version], evr[:release]]
       conditions = []

data/app/models/katello/subscription_facet_pool.rb

@@ -1,6 +1,6 @@
 module Katello
   class SubscriptionFacetPool < Katello::Model
-    # Note: Do not use active record call backs or dependent references on this class
+    # NOTE: Do not use active record call backs or dependent references on this class
     # Direct deletes are made in Pool#import_hosts (instead of destroys).
     belongs_to :subscription_facet, :inverse_of => :subscription_facet_pools, :class_name => 'Katello::Host::SubscriptionFacet'
     belongs_to :pool, :inverse_of => :subscription_facet_pools, :class_name => 'Katello::Pool'

data/app/models/katello/sync_plan.rb

@@ -148,13 +148,14 @@ module Katello
       if interval.nil?
         fail _("Interval cannot be nil")
       end
-      if (interval.downcase.eql? "hourly")
+      case interval.downcase
+      when "hourly"
         cron = min.to_s + " * * * *"
-      elsif (interval.downcase.eql? "daily")
+      when "daily"
         cron = min.to_s + " " + hour.to_s + " * * *"
-      elsif (interval.downcase.eql? "weekly")
+      when "weekly"
         cron = min.to_s + " " + hour.to_s + " * * " + day.to_s
-      elsif (interval.downcase.eql? CUSTOM_CRON)
+      when CUSTOM_CRON
         cron = cron_expression
       else
         fail _("Interval not set correctly")

data/app/models/katello/task_status.rb

@@ -154,18 +154,16 @@ module Katello
       when :package
         p = self.parameters[:packages]
         first_package = p.first.is_a?(Hash) ? p.first[:name] : p.first
-        unless p && p.length > 0
-          if self.task_type == "package_update"
-            case self.overall_status
-            when "running"
-              return "updating"
-            when "waiting"
-              return "updating"
-            when "error"
-              return _("all packages update failed")
-            else
-              return _("all packages update")
-            end
+        if !p && p.length > 0 && (self.task_type == "package_update")
+          case self.overall_status
+          when "running"
+            return "updating"
+          when "waiting"
+            return "updating"
+          when "error"
+            return _("all packages update failed")
+          else
+            return _("all packages update")
           end
         end
 
@@ -229,14 +227,15 @@ module Katello
       ret = []
       task_type = self.task_type.to_s
 
-      if task_type =~ /^package_group/
+      case task_type
+      when /^package_group/
         action = task_type.include?("remove") ? :removed : :installed
         ret = packages_change_description(result[:details][:package_group], action)
-      elsif task_type == "package_install" || task_type == "errata_install"
+      when "package_install", "errata_install"
         ret = packages_change_description(result[:details][:rpm], :installed)
-      elsif task_type == "package_update"
+      when "package_update"
         ret = packages_change_description(result[:details][:rpm], :updated)
-      elsif task_type == "package_remove"
+      when "package_remove"
         ret = packages_change_description(result[:details][:rpm], :removed)
       end
       ret
@@ -246,13 +245,14 @@ module Katello
       errors, stacktrace = self.result[:errors]
       return "" unless errors
       # Handle not very friendly Pulp message
-      if errors =~ /^\(.*\)$/
+      case errors
+      when /^\(.*\)$/
         if stacktrace.class == Array
           stacktrace.last.split(":").first
         else
           stacktrace.split("(").first
         end
-      elsif errors =~ /^\[.*,.*\]$/m
+      when /^\[.*,.*\]$/m
         result = errors.split(",").map do |error|
           error.gsub(/^\W+|\W+$/, "")
         end

data/app/presenters/katello/product_host_count_presenter.rb

@@ -0,0 +1,10 @@
+module Katello
+  class ProductHostCountPresenter < SimpleDelegator
+    attr_reader :product_host_count
+
+    def initialize(pool)
+      @product_host_count = pool.product_host_count
+      super(pool)
+    end
+  end
+end