katello 3.8.1 → 3.9.0.rc1

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

@@ -0,0 +1,13 @@
+module Katello
+  module Concerns
+    module AuditSearch
+      extend ActiveSupport::Concern
+
+      # since this class makes User class STI, we need to provide alias for auditable_type to re-enable searching
+      # audits by type = user
+      def auditable_type_complete_values
+        super.merge(:user => 'User')
+      end
+    end
+  end
+end

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

@@ -114,5 +114,5 @@ module Katello
 end
 
 class ::Host::Managed::Jail < Safemode::Jail
-  allow :content_view, :lifecycle_environment, :content_source
+  allow :content_view, :lifecycle_environment, :content_source, :applicable_errata
 end

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

@@ -4,6 +4,7 @@ module Katello
       extend ActiveSupport::Concern
 
       included do
+        scoped_search on: :id
         scoped_search on: :name
 
         validates_lengths_from_database

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

@@ -15,6 +15,19 @@ module Katello
           ids << content_source_id
           ids.uniq.compact
         end
+
+        def update_os_from_facts
+          super
+
+          # If facts causes the OS to change, our kickstart repo might not be
+          # valid anymore. Let's reset it, either to nil or a valid one
+          ks_repo = content_facet&.kickstart_repository
+          valid_repos = operatingsystem.respond_to?(:kickstart_repos) ? (operatingsystem.kickstart_repos(self)&.pluck(:id) || []) : []
+
+          if ks_repo && valid_repos.exclude?(ks_repo.id)
+            content_facet.kickstart_repository_id = valid_repos.first
+          end
+        end
       end
 
       included do
@@ -30,6 +43,7 @@ module Katello
         has_many :hypervisor_pools, :class_name => '::Katello::Pool', :foreign_key => :hypervisor_id, :dependent => :nullify
 
         before_save :correct_puppet_environment
+        before_validation :correct_kickstart_repository
 
         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
@@ -40,6 +54,18 @@ module Katello
         scoped_search :relation => :host_traces, :on => :helper, :complete_value => true, :rename => :trace_helper, :only_explicit => true
       end
 
+      def correct_kickstart_repository
+        return unless content_facet
+
+        # If switched from ks repo to install media:
+        if medium_id_changed? && medium && content_facet.kickstart_repository
+          content_facet.kickstart_repository_id = nil
+        # If switched from install media to ks repo:
+        elsif content_facet.kickstart_repository && medium
+          self.medium = nil
+        end
+      end
+
       def rhsm_organization_label
         self.organization.label
       end
@@ -57,12 +83,12 @@ module Katello
 
       def content_and_puppet_matched?
         content_facet && content_facet.content_view_id_was == environment.try(:content_view).try(:id) &&
-            content_facet.lifecycle_environment_id_was == self.environment.try(:lifecycle_environment).try(:id)
+          content_facet.lifecycle_environment_id_was == self.environment.try(:lifecycle_environment).try(:id)
       end
 
       def content_and_puppet_match?
         content_facet && content_facet.content_view_id == environment.try(:content_view).try(:id) &&
-            content_facet.lifecycle_environment_id == self.environment.try(:lifecycle_environment).try(:id)
+          content_facet.lifecycle_environment_id == self.environment.try(:lifecycle_environment).try(:id)
       end
 
       def import_package_profile(simple_packages)
@@ -137,6 +163,46 @@ module Katello
         @errata_status_label ||= get_status(::Katello::ErrataStatus).to_label(options)
       end
 
+      def purpose_status
+        @purpose_status ||= get_status(::Katello::PurposeStatus).status
+      end
+
+      def purpose_status_label(options = {})
+        @purpose_status_label ||= get_status(::Katello::PurposeStatus).to_label(options)
+      end
+
+      def purpose_sla_status
+        @purpose_sla_status ||= get_status(::Katello::PurposeSlaStatus).status
+      end
+
+      def purpose_sla_status_label(options = {})
+        @purpose_sla_status_label ||= get_status(::Katello::PurposeSlaStatus).to_label(options)
+      end
+
+      def purpose_role_status
+        @purpose_role_status ||= get_status(::Katello::PurposeRoleStatus).status
+      end
+
+      def purpose_role_status_label(options = {})
+        @purpose_role_status_label ||= get_status(::Katello::PurposeRoleStatus).to_label(options)
+      end
+
+      def purpose_usage_status
+        @purpose_usage_status ||= get_status(::Katello::PurposeUsageStatus).status
+      end
+
+      def purpose_usage_status_label(options = {})
+        @purpose_usage_status_label ||= get_status(::Katello::PurposeUsageStatus).to_label(options)
+      end
+
+      def purpose_addons_status
+        @purpose_addons_status ||= get_status(::Katello::PurposeAddonsStatus).status
+      end
+
+      def purpose_addons_status_label(options = {})
+        @purpose_addons_status_label ||= get_status(::Katello::PurposeAddonsStatus).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 }

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

@@ -13,10 +13,23 @@ module Katello
 
         validates_with Katello::Validators::ContentViewEnvironmentValidator
         validates_with Katello::Validators::HostgroupKickstartRepositoryValidator
+        validates_with ::AssociationExistsValidator, attributes: [:content_source]
 
         scoped_search :relation => :content_source, :on => :name, :complete_value => true, :rename => :content_source, :only_explicit => true
         scoped_search :relation => :content_view, :on => :name, :complete_value => true, :rename => :content_view, :only_explicit => true
         scoped_search :relation => :lifecycle_environment, :on => :name, :complete_value => true, :rename => :lifecycle_environment, :only_explicit => true
+
+        before_validation :correct_kickstart_repository
+      end
+
+      def correct_kickstart_repository
+        # If switched from ks repo to install media:
+        if medium_id_changed? && medium && kickstart_repository_id
+          self.kickstart_repository_id = nil
+        # If switched from install media to ks repo:
+        elsif kickstart_repository && medium
+          self.medium = nil
+        end
       end
 
       def content_view

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

@@ -15,11 +15,11 @@ module Katello
       end
 
       def reset_settings
-        if self.title_changed?
-          if ::Setting[:default_location_subscribed_hosts] == self.title_was
+        if saved_change_to_attribute?(:title)
+          if ::Setting[:default_location_subscribed_hosts] == self.title_before_last_save
             ::Setting[:default_location_subscribed_hosts] = self.title
           end
-          if ::Setting[:default_location_puppet_content] == self.title_was
+          if ::Setting[:default_location_puppet_content] == self.title_before_last_save
             ::Setting[:default_location_puppet_content] = self.title
           end
         end

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

@@ -52,6 +52,10 @@ module Katello
           ContentView.default.where(:organization_id => self.id).first
         end
 
+        def default_content_view_version
+          default_content_view.versions.first
+        end
+
         def promotion_paths
           #I'm sure there's a better way to do this
           self.kt_environments.joins(:priors).where("prior_id = #{self.library.id}").order(:name).collect do |env|
@@ -137,9 +141,9 @@ module Katello
           products.any?(&:syncable_content?)
         end
 
-        def enabled_product_content_for(repositories)
-          return [] if repositories.blank?
-          content_ids = repositories.pluck(:content_id)
+        def enabled_product_content_for(roots)
+          return [] if roots.blank?
+          content_ids = roots.pluck(:content_id)
 
           filtered_product_content do |pc|
             content_ids.include?(pc.content.cp_content_id) && pc.product.enabled?

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

@@ -3,6 +3,7 @@ require 'set'
 module Katello
   module Concerns::PulpDatabaseUnit
     extend ActiveSupport::Concern
+    include Katello::Concerns::SearchByRepositoryName
 
     #  Class.repository_association_class
     #  Class#update_from_json

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

@@ -0,0 +1,11 @@
+module Katello
+  module Concerns
+    module RecurringLogicExtensions
+      extend ActiveSupport::Concern
+
+      included do
+        has_one :sync_plan, :inverse_of => :foreman_tasks_recurring_logic, :class_name => "Katello::SyncPlan", :dependent => :destroy
+      end
+    end
+  end
+end

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

@@ -3,31 +3,6 @@ module Katello
     module RedhatExtensions
       extend ActiveSupport::Concern
 
-      module Overrides
-        def medium_uri(host, url = nil)
-          kickstart_repo = host.try(:content_facet).try(:kickstart_repository) || host.try(:kickstart_repository)
-
-          if host.try(:content_source) && kickstart_repo.present?
-            return URI.parse(kickstart_repo.full_path(host.content_source))
-          else
-            super(host, url)
-          end
-        end
-
-        # overwrite foreman method in operatingsystem.rb
-        def boot_files_uri(medium, architecture, host = nil)
-          return super(medium, architecture, host) unless host.try(:content_source)
-          family_class = self.family.constantize
-          family_class::PXEFILES.values.collect do |img|
-            "#{medium_uri(host)}/#{pxedir}/#{img}"
-          end
-        end
-      end
-
-      included do
-        prepend Overrides
-      end
-
       module ClassMethods
         def find_or_create_operating_system(repo)
           os_name = construct_name(repo.distribution_family)

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

@@ -0,0 +1,21 @@
+
+module Katello
+  module Concerns
+    module SearchByRepositoryName
+      extend ActiveSupport::Concern
+      include ScopedSearchExtensions
+
+      included do
+        scoped_search :relation => :repositories, :on => :name, :rename => :repository, :complete_value => true, :ext_method => :search_by_repo_name, :only_explicit => true
+      end
+
+      module ClassMethods
+        def search_by_repo_name(_key, operator, value)
+          conditions = sanitize_sql_for_conditions(["#{Katello::RootRepository.table_name}.name #{operator} ?", value_to_sql(operator, value)])
+          query = self.joins(:repositories => :root).where(conditions).select('id')
+          {:conditions => "#{self.table_name}.id IN (#{query.to_sql})"}
+        end
+      end
+    end
+  end
+end

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

@@ -11,7 +11,7 @@ module Katello
       end
 
       def recalculate_errata_status
-        ForemanTasks.async_task(Actions::Katello::Host::RecalculateErrataStatus) if value_changed? && name == 'errata_status_installable'
+        ForemanTasks.async_task(Actions::Katello::Host::RecalculateErrataStatus) if saved_change_to_attribute?(:value) && name == 'errata_status_installable'
       end
     end
   end

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

@@ -3,6 +3,10 @@ module Katello
     module SubscriptionFacetHostExtensions
       extend ActiveSupport::Concern
 
+      # This module depends on #value_to_sql which is defined in ScopedSearchExtensions
+      # make sure this dependency is met.
+      include ::ScopedSearchExtensions
+
       included do
         audited :associations => [:pools]
 
@@ -14,6 +18,31 @@ module Katello
           :unsubscribed_hypervisor => Katello::SubscriptionStatus::UNSUBSCRIBED_HYPERVISOR
         }.freeze
 
+        SLA_STATUS_MAP = {
+          :valid => Katello::PurposeSlaStatus::VALID,
+          :invalid => Katello::PurposeSlaStatus::INVALID
+        }.freeze
+
+        USAGE_STATUS_MAP = {
+          :valid => Katello::PurposeUsageStatus::VALID,
+          :invalid => Katello::PurposeUsageStatus::INVALID
+        }.freeze
+
+        ROLE_STATUS_MAP = {
+          :valid => Katello::PurposeRoleStatus::VALID,
+          :invalid => Katello::PurposeRoleStatus::INVALID
+        }.freeze
+
+        ADDONS_STATUS_MAP = {
+          :valid => Katello::PurposeAddonsStatus::VALID,
+          :invalid => Katello::PurposeAddonsStatus::INVALID
+        }.freeze
+
+        PURPOSE_STATUS_MAP = {
+          :valid => Katello::PurposeStatus::VALID,
+          :invalid => Katello::PurposeStatus::INVALID
+        }.freeze
+
         prepend ForemanTasks::Concerns::ActionTriggering
 
         module Prepended
@@ -32,11 +61,22 @@ module Katello
         has_many :pools, :through => :subscription_facet
         has_many :subscriptions, :through => :pools
         has_one :subscription_status_object, :class_name => 'Katello::SubscriptionStatus', :foreign_key => 'host_id', :dependent => :destroy
+        has_one :purpose_sla_status_object, :class_name => 'Katello::PurposeSlaStatus', :foreign_key => 'host_id', :dependent => :destroy
+        has_one :purpose_role_status_object, :class_name => 'Katello::PurposeRoleStatus', :foreign_key => 'host_id', :dependent => :destroy
+        has_one :purpose_usage_status_object, :class_name => 'Katello::PurposeUsageStatus', :foreign_key => 'host_id', :dependent => :destroy
+        has_one :purpose_addons_status_object, :class_name => 'Katello::PurposeAddonsStatus', :foreign_key => 'host_id', :dependent => :destroy
+        has_one :purpose_status_object, :class_name => 'Katello::PurposeStatus', :foreign_key => 'host_id', :dependent => :destroy
         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: :status, relation: :purpose_sla_status_object, rename: :sla_status, complete_value: SLA_STATUS_MAP
+        scoped_search on: :status, relation: :purpose_role_status_object, rename: :role_status, complete_value: ROLE_STATUS_MAP
+        scoped_search on: :status, relation: :purpose_usage_status_object, rename: :usage_status, complete_value: USAGE_STATUS_MAP
+        scoped_search on: :status, relation: :purpose_addons_status_object, rename: :addons_status, complete_value: ADDONS_STATUS_MAP
+        scoped_search on: :status, relation: :purpose_status_object, rename: :purpose_status, complete_value: PURPOSE_STATUS_MAP
+
         scoped_search :on => :release_version, :relation => :subscription_facet, :complete_value => true, :only_explicit => true
         scoped_search :on => :autoheal, :relation => :subscription_facet, :complete_value => true, :only_explicit => true
         scoped_search :on => :service_level, :relation => :subscription_facet, :complete_value => true, :only_explicit => true
@@ -51,6 +91,9 @@ module Katello
         scoped_search :on => :name, :relation => :hypervisor_host, :complete_value => true, :rename => :hypervisor_host, :ext_method => :find_by_hypervisor_host
         scoped_search :on => :name, :relation => :subscriptions, :rename => :subscription_name, :complete_value => true, :ext_method => :find_by_subscription_name
         scoped_search :on => :id, :relation => :pools, :rename => :subscription_id, :complete_value => true, :ext_method => :find_by_subscription_id, :only_explicit => true
+        scoped_search :on => :purpose_role, :rename => :role, :relation => :subscription_facet, :complete_value => true
+        scoped_search :on => :purpose_usage, :rename => :usage, :relation => :subscription_facet, :complete_value => true
+        scoped_search :on => :purpose_addons, :rename => :addon, :relation => :subscription_facet, :complete_value => true
       end
 
       module ClassMethods

data/app/models/katello/content.rb

@@ -16,13 +16,17 @@ module Katello
     after_save :update_repository_names, :if => :propagate_name_change?
 
     def update_repository_names
-      self.repositories.each do |repo|
-        repo.update_attributes!(:name => repo.calculate_updated_name)
+      root_repositories.each do |root|
+        root.update_attributes!(:name => root.calculate_updated_name)
       end
     end
 
+    def root_repositories
+      Katello::RootRepository.where(:content_id => self.cp_content_id)
+    end
+
     def repositories
-      Katello::Repository.where(:content_id => self.cp_content_id)
+      Katello::Repository.where(:root_id => root_repositories)
     end
 
     def redhat?

data/app/models/katello/content_view.rb

@@ -24,7 +24,7 @@ module Katello
     # component_composites -> Bottom Up, given I am a component CV get the associated composites that I belong to
     #
     has_many :content_view_components, :class_name => "Katello::ContentViewComponent", :dependent => :destroy,
-             :inverse_of => :composite_content_view, :foreign_key => :composite_content_view_id
+             :inverse_of => :composite_content_view, :foreign_key => :composite_content_view_id, autosave: true
 
     has_many :component_composites, :class_name => "Katello::ContentViewComponent",
              :dependent => :destroy, :inverse_of => :content_view, :foreign_key => :content_view_id
@@ -411,7 +411,7 @@ module Katello
     end
 
     def duplicate_docker_repos
-      duplicate_repositories.where(:content_type => Katello::Repository::DOCKER_TYPE)
+      duplicate_repositories.docker_type
     end
 
     def check_non_composite_components
@@ -494,7 +494,7 @@ module Katello
                                            :components => components
                                           )
 
-      increment!(:next_version) if minor == 0
+      update_attributes(:next_version => major.to_i + 1) unless major.to_i < next_version
       version
     end
 
@@ -647,7 +647,7 @@ module Katello
     end
 
     def on_demand_repositories
-      repositories.where(download_policy: ::Runcible::Models::YumImporter::DOWNLOAD_ON_DEMAND)
+      repositories.on_demand
     end
 
     protected

data/app/models/katello/content_view_component.rb

@@ -43,7 +43,7 @@ module Katello
       end
 
       if attached_content_view_ids.include?(view.id)
-        errors.add(:base, _("Duplicate Content View. Another component already includes this view"))
+        errors.add(:base, _("Another component already includes content view with ID %s" % view.id))
       end
     end
 

data/app/models/katello/content_view_history.rb

@@ -25,6 +25,7 @@ module Katello
     alias_method :version, :content_view_version
     alias_attribute :description, :notes
 
+    scoped_search :on => :id, :relation => :content_view_version, :rename => :content_view_version_id
     scoped_search :on => :name, :relation => :environment, :rename => :environment, :complete_value => true
 
     enum action: {

data/app/models/katello/content_view_version.rb

@@ -2,6 +2,7 @@ module Katello
   class ContentViewVersion < Katello::Model
     include Authorization::ContentViewVersion
     include ForemanTasks::Concerns::ActionSubject
+    include Katello::Concerns::SearchByRepositoryName
 
     define_model_callbacks :promote, :only => [:before, :after]
     audited :associations => [:repositories, :environments]
@@ -39,11 +40,15 @@ module Katello
              :class_name => "Katello::ContentViewVersionComponent"
     has_many :composites, :through => :content_view_version_composites, :source => :composite_version,
              :class_name => "Katello::ContentViewVersion", :inverse_of => :components
+    has_many :published_in_composite_content_views, through: :composites, source: :content_view
 
     delegate :default, :default?, to: :content_view
 
     validates_lengths_from_database
 
+    validates :minor, :uniqueness => {:scope => [:content_view_id, :major], :message => N_(", must be unique to major and version id version.")}
+    validates :minor, numericality: true
+
     scope :default_view, -> { joins(:content_view).where("#{Katello::ContentView.table_name}.default" => true) }
     scope :non_default_view, -> { joins(:content_view).where("#{Katello::ContentView.table_name}.default" => false) }
     scope :with_organization_id, ->(organization_id) do
@@ -57,7 +62,6 @@ module Katello
 
     scoped_search :on => :content_view_id, :only_explicit => true, :validator => ScopedSearch::Validators::INTEGER
     scoped_search :on => :major, :rename => :version, :complete_value => true, :ext_method => :find_by_version
-    scoped_search :relation => :repositories, :on => :name, :rename => :repository, :complete_value => true
 
     def self.find_by_version(_key, operator, value)
       conditions = ""
@@ -136,7 +140,7 @@ module Katello
     end
 
     def available_releases
-      self.repositories.pluck(:minor).compact.uniq.sort
+      Katello::RootRepository.where(:id => self.repositories.select(:root_id)).pluck(:minor).compact.uniq.sort
     end
 
     def next_incremental_version
@@ -261,6 +265,14 @@ module Katello
       Katello::Rpm.in_repositories(self.repositories.archived).count
     end
 
+    def module_streams
+      ModuleStream.in_repositories(archived_repos)
+    end
+
+    def module_stream_count
+      Katello::ModuleStream.in_repositories(self.repositories.archived).count
+    end
+
     def file_count
       Katello::FileUnit.in_repositories(self.repositories.archived).count
     end