katello 3.3.2 → 3.4.0.rc1

data/app/models/katello/candlepin/product_content.rb

@@ -30,9 +30,17 @@ module Katello
       @repos ||= self.product.repos(self.product.organization.library).where(:content_id => self.content.id)
     end
 
-    def content_override(activation_key)
-      override = activation_key.content_overrides.find { |pc| pc[:contentLabel] == content.label }
-      override.nil? ? 'default' : override[:value]
+    def legacy_content_override(activation_key)
+      override = activation_key.content_overrides.find { |pc| pc.content_label == content.label && pc.name == "enabled" }
+      override.nil? ? 'default' : override.value
+    end
+
+    def content_overrides(activation_key)
+      activation_key.content_overrides.select { |pc| pc.content_label == content.label }
+    end
+
+    def enabled_content_override(activation_key)
+      activation_key.content_overrides.find { |pc| pc.content_label == content.label && pc.name == "enabled" }
     end
 
     def content_type

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

@@ -11,9 +11,18 @@ module Katello
           :unknown => Katello::ErrataStatus::UNKNOWN
         }.freeze
 
+        TRACE_STATUS_MAP = {
+          :reboot_needed => Katello::TraceStatus::REQUIRE_REBOOT,
+          :process_restart_needed => Katello::TraceStatus::REQUIRE_PROCESS_RESTART,
+          :updated => Katello::TraceStatus::UP_TO_DATE
+        }.freeze
+
         has_one :errata_status_object, :class_name => 'Katello::ErrataStatus', :foreign_key => 'host_id'
-        scoped_search :on => :status, :in => :errata_status_object, :rename => :errata_status,
+        scoped_search :on => :status, :relation => :errata_status_object, :rename => :errata_status,
                      :complete_value => ERRATA_STATUS_MAP
+        has_one :trace_status_object, :class_name => 'Katello::TraceStatus', :foreign_key => 'host_id'
+        scoped_search :on => :status, :relation => :trace_status_object, :rename => :trace_status,
+                     :complete_value => TRACE_STATUS_MAP
 
         #associations for simpler scoped searches
         has_one :content_view, :through => :content_facet
@@ -22,15 +31,15 @@ module Katello
         has_many :applicable_errata, :through => :content_facet
         has_many :applicable_rpms, :through => :content_facet
 
-        scoped_search :in => :content_view, :on => :name, :complete_value => true, :rename => :content_view
-        scoped_search :in => :content_facet, :on => :content_view_id, :rename => :content_view_id, :only_explicit => true
-        scoped_search :in => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment
-        scoped_search :in => :content_facet, :on => :lifecycle_environment_id, :rename => :lifecycle_environment_id, :only_explicit => true
-        scoped_search :in => :applicable_errata, :on => :errata_id, :rename => :applicable_errata, :complete_value => true, :ext_method => :find_by_applicable_errata, :only_explicit => true
-        scoped_search :in => :applicable_errata, :on => :errata_id, :rename => :installable_errata, :complete_value => true, :ext_method => :find_by_installable_errata, :only_explicit => true
-        scoped_search :in => :applicable_rpms, :on => :nvra, :rename => :applicable_rpms, :complete_value => true, :ext_method => :find_by_applicable_rpms, :only_explicit => true
-        scoped_search :in => :applicable_rpms, :on => :nvra, :rename => :upgradable_rpms, :complete_value => true, :ext_method => :find_by_installable_rpms, :only_explicit => true
-        scoped_search :in => :content_source, :on => :name, :complete_value => true, :rename => :content_source
+        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 => :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_rpms, :on => :nvra, :rename => :applicable_rpms, :complete_value => true, :ext_method => :find_by_applicable_rpms, :only_explicit => true
+        scoped_search :relation => :applicable_rpms, :on => :nvra, :rename => :upgradable_rpms, :complete_value => true, :ext_method => :find_by_installable_rpms, :only_explicit => true
+        scoped_search :relation => :content_source, :on => :name, :complete_value => true, :rename => :content_source
 
         # preserve options set by facets framework, but add new :reject_if statement
         accepts_nested_attributes_for(

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

@@ -11,8 +11,8 @@ module Katello
         has_one :content_view, :class_name => "Katello::ContentView", :through => :content_view_puppet_environment
         has_one :lifecycle_environment, :class_name => "Katello::KTEnvironment", :through => :content_view_puppet_environment, :source => :environment
 
-        scoped_search :in => :content_view, :on => :name, :rename => :content_view, :complete_value => true
-        scoped_search :in => :lifecycle_environment, :on => :name, :rename => :lifecycle_environment, :complete_value => true
+        scoped_search :relation => :content_view, :on => :name, :rename => :content_view, :complete_value => true
+        scoped_search :relation => :lifecycle_environment, :on => :name, :rename => :lifecycle_environment, :complete_value => true
       end
 
       def content_view
@@ -38,7 +38,10 @@ module Katello
         def build_by_katello_id(org, env, content_view)
           env_name = Environment.construct_name(org, env, content_view)
           katello_id = Environment.construct_katello_id(org, env, content_view)
-          environment = Environment.new(:name => env_name, :organization_ids => [org.id], :location_ids => ::Location.default_location_ids)
+          default_location_id = ::Location.find_by_title(::Setting[:default_location_puppet_content]).id
+          environment = Environment.new(:name => env_name,
+                                        :organization_ids => [org.id],
+                                        :location_ids => [default_location_id])
           environment.katello_id = katello_id
           environment
         end

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

@@ -19,13 +19,13 @@ module Katello
 
         before_save :correct_puppet_environment
 
-        scoped_search :in => :host_collections, :on => :id, :complete_value => false, :rename => :host_collection_id, :only_explicit => true
-        scoped_search :in => :host_collections, :on => :name, :complete_value => true, :rename => :host_collection
-        scoped_search :in => :installed_packages, :on => :nvra, :complete_value => true, :rename => :installed_package, :only_explicit => true
-        scoped_search :in => :installed_packages, :on => :name, :complete_value => true, :rename => :installed_package_name, :only_explicit => true
-        scoped_search :in => :host_traces, :on => :application, :complete_value => true, :rename => :trace_app, :only_explicit => true
-        scoped_search :in => :host_traces, :on => :app_type, :complete_value => true, :rename => :trace_app_type, :only_explicit => true
-        scoped_search :in => :host_traces, :on => :helper, :complete_value => true, :rename => :trace_helper, :only_explicit => true
+        scoped_search :relation => :host_collections, :on => :id, :complete_value => false, :rename => :host_collection_id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
+        scoped_search :relation => :host_collections, :on => :name, :complete_value => true, :rename => :host_collection
+        scoped_search :relation => :installed_packages, :on => :nvra, :complete_value => true, :rename => :installed_package, :only_explicit => true
+        scoped_search :relation => :installed_packages, :on => :name, :complete_value => true, :rename => :installed_package_name, :only_explicit => true
+        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
       end
 
       def validate_media_with_capsule?
@@ -52,6 +52,7 @@ module Katello
         info['parameters']['kt_cv'] = self.content_view.try(:label) #deprecated
         info['parameters']['lifecycle_environment'] = self.lifecycle_environment.try(:label)
         info['parameters']['content_view'] = self.content_view.try(:label)
+        info['parameters']['foreman_host_collections'] = self.host_collections.map(&:name)
         if self.content_facet.present?
           info['parameters']['kickstart_repository'] = self.content_facet.kickstart_repository.try(:label)
         end
@@ -88,6 +89,7 @@ module Katello
         tracer_profile.each do |trace, attributes|
           self.host_traces.create!(:application => trace, :helper => attributes[:helper], :app_type => attributes[:type])
         end
+        self.update_trace_status
       end
 
       def subscription_status
@@ -109,6 +111,18 @@ module Katello
       def errata_status_label(options = {})
         @errata_status_label ||= get_status(::Katello::ErrataStatus).to_label(options)
       end
+
+      def valid_content_override_label?(content_label)
+        available_content = subscription_facet.candlepin_consumer.available_product_content
+        available_content.map(&:content).any? { |content| content.label == content_label }
+      end
+
+      protected
+
+      def update_trace_status
+        self.get_status(::Katello::TraceStatus).refresh!
+        self.refresh_global_status!
+      end
     end
   end
 end

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

@@ -13,9 +13,9 @@ module Katello
 
         validates_with Katello::Validators::ContentViewEnvironmentValidator
 
-        scoped_search :in => :content_source, :on => :name, :complete_value => true, :rename => :content_source
-        scoped_search :in => :content_view, :on => :name, :complete_value => true, :rename => :content_view
-        scoped_search :in => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment
+        scoped_search :relation => :content_source, :on => :name, :complete_value => true, :rename => :content_source
+        scoped_search :relation => :content_view, :on => :name, :complete_value => true, :rename => :content_view
+        scoped_search :relation => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment
       end
 
       def content_view

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

@@ -5,8 +5,6 @@ module Katello
 
       included do
         after_initialize :set_default_overrides, :if => :new_record?
-        before_create :set_katello_default
-        before_save :refute_katello_default_changed
         before_destroy :deletable?
       end
 
@@ -15,35 +13,45 @@ module Katello
         self.ignore_types << ::Hostgroup.name
       end
 
-      def set_katello_default
-        if Location.default_location.nil?
-          self.katello_default = true
-        else
-          self.katello_default = false
-        end
-        true
-      end
-
       def deletable?
-        if self.katello_default
-          errors.add(:base, _("Cannot delete the default Location"))
+        if ::Location.unscoped.count == 1
+          errors.add(
+            :base,
+            _('Cannot delete the last Location. '\
+              'Foreman needs at least one Location to put newly published '\
+              'Puppet content and Hosts registered via subscription-manager'))
+          false
+        elsif title == ::Setting[:default_location_subscribed_hosts]
+          errors.add(
+            :base,
+            _('Cannot delete the default Location for subscribed hosts. If you '\
+              'no longer want this Location, change the default Location for '\
+              'subscribed hosts under Administer > Settings, tab Content.')
+          )
+          false
+        elsif title == ::Setting[:default_location_puppet_content]
+          errors.add(
+            :base,
+            _('Cannot delete the default Location for Puppet content. If you '\
+              'no longer want this Location, change the default Location for '\
+              'Puppet content under Administer > Settings, tab Content.')
+          )
           false
+        else
+          true
         end
       end
 
-      def refute_katello_default_changed
-        fail _("katello_default cannot be changed.") if Location.default_location && self.katello_default_changed?
-      end
-
       module ClassMethods
-        def default_location
-          # In the future, we should have a better way to identify the 'default' location
-          Location.where(:katello_default => true).first
-        end
-
         def default_location_ids
-          return [] unless default_location
-          [default_location.id]
+          ids = []
+          if ::Setting[:default_location_puppet_content].present?
+            ids << ::Location.find_by_title(::Setting[:default_location_puppet_content]).id
+          end
+          if ::Setting[:default_location_subscribed_hosts].present?
+            ids << ::Location.find_by_title(::Setting[:default_location_subscribed_hosts]).id
+          end
+          ids.uniq
         end
       end
     end

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

@@ -69,7 +69,15 @@ module Katello
 
       def import_for_repository(repository, force = false)
         ids = content_unit_class.ids_for_repository(repository.pulp_id)
-        self.import_all(ids, :index_repository_association => false) if repository.content_view.default? || force
+        # Rpms cannot change in Pulp so we do not index them if they are already present
+        # in our database. Errata and Package Groups can change in Pulp, so we index
+        # all of them in the repository on each sync.
+        if self == Katello::Rpm && !force
+          ids_to_import = ids - repository.rpms.map(&:uuid)
+        else
+          ids_to_import = ids
+        end
+        self.import_all(ids_to_import, :index_repository_association => false) if repository.content_view.default? || force
         self.sync_repository_associations(repository, ids) if self.manage_repository_association
       end
 
@@ -95,7 +103,7 @@ module Katello
         end
 
         unless new_ids.empty?
-          inserts = new_ids.map { |unit_id| "(#{unit_id.to_i}, #{repository.id.to_i}, '#{Time.now.utc}', '#{Time.now.utc}')" }
+          inserts = new_ids.map { |unit_id| "(#{unit_id.to_i}, #{repository.id.to_i}, '#{Time.now.utc.to_s(:db)}', '#{Time.now.utc.to_s(:db)}')" }
           queries << "INSERT INTO #{table_name} (#{attribute_name}, repository_id, created_at, updated_at) VALUES #{inserts.join(', ')}"
         end
 

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

@@ -16,7 +16,7 @@ module Katello
         alias_method_chain :refresh, :puppet_path
 
         before_create :associate_organizations
-        before_create :associate_default_location
+        before_create :associate_default_locations
         before_create :associate_lifecycle_environments
         before_validation :set_default_download_policy
 
@@ -99,17 +99,19 @@ module Katello
         self.organizations = Organization.all if self.default_capsule?
       end
 
-      def associate_default_location
-        if self.default_capsule?
-          default_location = Location.default_location
-          if default_location && !self.locations.include?(default_location)
+      def associate_default_locations
+        return unless default_capsule?
+        ['puppet_content', 'subscribed_hosts'].each do |type|
+          default_location = ::Location.unscoped.find_by_title(
+            ::Setting[:"default_location_#{type}"])
+          if default_location.present? && !locations.include?(default_location)
             self.locations << default_location
           end
         end
       end
 
       def set_default_download_policy
-        self.download_policy ||= Setting[:default_proxy_download_policy]
+        self.download_policy ||= ::Setting[:default_proxy_download_policy]
       end
 
       def associate_lifecycle_environments

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

@@ -16,18 +16,23 @@ module Katello
 
         has_many :activation_keys, :through => :subscription_facet
         has_one :subscription_status_object, :class_name => 'Katello::SubscriptionStatus', :foreign_key => 'host_id'
-        scoped_search :on => :status, :in => :subscription_status_object, :rename => :subscription_status,
+        has_one :hypervisor_host, :through => :subscription_facet
+
+        scoped_search :on => :status, :relation => :subscription_status_object, :rename => :subscription_status,
                       :complete_value => SUBSCRIPTION_STATUS_MAP
 
-        scoped_search :on => :release_version, :in => :subscription_facet, :complete_value => true
-        scoped_search :on => :autoheal, :in => :subscription_facet, :complete_value => true
-        scoped_search :on => :service_level, :in => :subscription_facet, :complete_value => true
-        scoped_search :on => :last_checkin, :in => :subscription_facet, :complete_value => true, :only_explicit => true
-        scoped_search :on => :registered_through, :in => :subscription_facet, :complete_value => true
-        scoped_search :on => :registered_at, :in => :subscription_facet, :rename => :registered_at, :only_explicit => true
-        scoped_search :on => :uuid, :in => :subscription_facet, :rename => :subscription_uuid
-        scoped_search :in => :activation_keys, :on => :name, :rename => :activation_key, :complete_value => true, :ext_method => :find_by_activation_key
-        scoped_search :in => :activation_keys, :on => :id, :rename => :activation_key_id, :complete_value => true, :ext_method => :find_by_activation_key_id, :only_explicit => true
+        scoped_search :on => :release_version, :relation => :subscription_facet, :complete_value => true
+        scoped_search :on => :autoheal, :relation => :subscription_facet, :complete_value => true
+        scoped_search :on => :service_level, :relation => :subscription_facet, :complete_value => true
+        scoped_search :on => :last_checkin, :relation => :subscription_facet, :complete_value => true, :only_explicit => true
+        scoped_search :on => :registered_through, :relation => :subscription_facet, :complete_value => 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
+        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
+        scoped_search :on => :hypervisor, :relation => :subscription_facet, :complete_value => true
+        scoped_search :on => :name, :relation => :hypervisor_host, :complete_value => true, :rename => :hypervisor_host, :ext_method => :find_by_hypervisor_host
       end
 
       def update_action
@@ -56,6 +61,18 @@ module Katello
             { :conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.pluck(:id).join(',')})" }
           end
         end
+
+        def find_by_hypervisor_host(_key, operator, value)
+          conditions = sanitize_sql_for_conditions(["#{::Host.table_name}.name #{operator} ?", value_to_sql(operator, value)])
+          hosts = ::Host.where(conditions)
+          hosts = ::Host.joins(:subscription_facet).where("#{Katello::Host::SubscriptionFacet.table_name}.hypervisor_host_id" => hosts)
+
+          if hosts.empty?
+            {:conditions => "1=0"}
+          else
+            {:conditions => "#{::Host::Managed.table_name}.id IN (#{hosts.pluck(:id).join(',')})"}
+          end
+        end
       end
     end
   end

data/app/models/katello/content_override.rb

@@ -0,0 +1,63 @@
+module Katello
+  class ContentOverride
+    attr_accessor :content_label, :name, :value
+
+    def initialize(content_label, params = {})
+      @content_label = content_label
+      if params.key?(:enabled)
+        self.enabled = params[:enabled]
+      else
+        @name = params[:name]
+        @value = params[:value]
+      end
+    end
+
+    def enabled=(value = nil)
+      @name = "enabled"
+      @value = value
+    end
+
+    def computed_value
+      return if self.value.nil?
+
+      if self.name == "enabled"
+        ::Foreman::Cast.to_bool(self.value)
+      else
+        self.value
+      end
+    end
+
+    def to_entitlement_hash
+      ret = {"contentLabel" => @content_label}
+      ret["name"] = @name if @name
+      ret["value"] = @value if @value
+      ret.with_indifferent_access
+    end
+
+    def self.from_entitlement_hash(entitlement_hash)
+      ent_hash =  entitlement_hash.with_indifferent_access
+      override = ContentOverride.new(ent_hash["contentLabel"])
+      override.name = ent_hash["name"]
+      override.value = ent_hash["value"]
+      override
+    end
+
+    def ==(other)
+      self.content_label == other.content_label &&
+        self.name == other.name &&
+        self.value == other.value
+    end
+
+    def to_hash
+      {"content_label" => @content_label, "name" => @name, "value" => @value}
+    end
+
+    def self.fetch(params)
+      if params.is_a?(ContentOverride)
+        params
+      else
+        ContentOverride.new(params["content_label"], :name => params["name"], :value => params["value"])
+      end
+    end
+  end
+end

data/app/models/katello/content_view.rb

@@ -66,7 +66,7 @@ module Katello
     scope :non_composite, -> { where(:composite => [nil, false]) }
 
     scoped_search :on => :name, :complete_value => true
-    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true
+    scoped_search :on => :organization_id, :complete_value => true, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :composite, :complete_value => {true: true, false: false}
 
     def self.in_environment(env)
@@ -315,7 +315,7 @@ module Katello
     end
 
     def component_repositories
-      components.map(&:repositories).flatten
+      components.map(&:archived_repos).flatten
     end
 
     def repos_in_product(env, product)
@@ -476,15 +476,10 @@ module Katello
       content_view = self
       to_version   = version || content_view.version(to_env)
 
-      # Construct the pulp id using org/view/version or org/env/view
-      pulp_id = ContentViewPuppetEnvironment.generate_pulp_id(organization.label, to_env.try(:label),
-                                                              self.label, version.try(:version))
-
       ContentViewPuppetEnvironment.new(
         :environment => to_env,
         :content_view_version => to_version,
-        :name => self.name,
-        :pulp_id => pulp_id
+        :name => self.name
       )
     end