katello 3.4.5 → 3.5.0.rc1

data/app/models/katello/content_facet_applicable_rpm.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentFacetApplicableRpm < Katello::Model
-    self.include_root_in_json = false
-
     belongs_to :content_facet, :inverse_of => :content_facet_applicable_rpms, :class_name => 'Katello::Host::ContentFacet'
     belongs_to :rpm, :inverse_of => :content_facet_applicable_rpms, :class_name => 'Katello::Rpm'
   end

data/app/models/katello/content_facet_erratum.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentFacetErratum < Katello::Model
-    self.include_root_in_json = false
-
     # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
     belongs_to :content_facet, :inverse_of => :content_facet_errata, :class_name => 'Katello::Host::ContentFacet'
     belongs_to :erratum, :inverse_of => :content_facet_errata, :class_name => 'Katello::Erratum'

data/app/models/katello/content_facet_repository.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentFacetRepository < Katello::Model
-    self.include_root_in_json = false
-
     belongs_to :content_facet, :inverse_of => :content_facet_repositories, :class_name => 'Katello::Host::ContentFacet'
     belongs_to :repository, :inverse_of => :content_facet_repositories, :class_name => 'Katello::Repository'
   end

data/app/models/katello/content_view.rb

@@ -1,8 +1,6 @@
 module Katello
   # rubocop:disable Metrics/ClassLength
   class ContentView < Katello::Model
-    self.include_root_in_json = false
-
     include Ext::LabelFromName
     include Katello::Authorization::ContentView
     include ForemanTasks::Concerns::ActionSubject
@@ -613,11 +611,12 @@ module Katello
     end
 
     def generate_cp_environment_id(env)
-      # The id for a default view, will simply be the env id; otherwise, it
+      # The id for a default view, will simply be the org label; otherwise, it
       # will be a combination of env id and view id.  The reason being,
       # for a default view, the same candlepin environment will be referenced
       # by the kt_environment and content_view_environment.
-      self.default ? env.id.to_s : [env.id, self.id].join('-')
+      value = self.default ? env.organization.label.to_s : [env.organization.label, env.label, self.label].join('-')
+      Katello::Util::Data.md5hash(value)
     end
 
     def confirm_not_promoted

data/app/models/katello/content_view_component.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewComponent < Katello::Model
-    self.include_root_in_json = false
-
     belongs_to :composite_content_view, :class_name => "Katello::ContentView",
                               :inverse_of => :content_view_components
     belongs_to :content_view_version, :class_name => "Katello::ContentViewVersion",
@@ -74,7 +72,7 @@ module Katello
     end
 
     def update_content_view
-      if content_view_version.present? && !content_view.present?
+      if content_view_version.present? && content_view.blank?
         self.content_view = content_view_version.content_view
       end
     end

data/app/models/katello/content_view_docker_filter_rule.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewDockerFilterRule < Katello::Model
-    self.include_root_in_json = false
-
     belongs_to :filter,
                :class_name => "Katello::ContentViewDockerFilter",
                :inverse_of => :docker_rules,

data/app/models/katello/content_view_environment.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewEnvironment < Katello::Model
-    self.include_root_in_json = false
-
     include ForemanTasks::Concerns::ActionSubject
     include Glue::Candlepin::Environment if SETTINGS[:katello][:use_cp]
     include Glue if SETTINGS[:katello][:use_cp]
@@ -45,10 +43,10 @@ module Katello
 
       if content_view.default?
         self.label ||= environment.label
-        self.cp_id ||= environment.id.to_s
+        self.cp_id ||= Katello::Util::Data.md5hash(environment.organization.label)
       else
         self.label ||= [environment.label, content_view.label].join('/')
-        self.cp_id ||= [environment.id, content_view.id].join('-')
+        self.cp_id ||= Katello::Util::Data.md5hash([environment.id, content_view.id].join('-'))
       end
     end
   end

data/app/models/katello/content_view_erratum_filter_rule.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewErratumFilterRule < Katello::Model
-    self.include_root_in_json = false
-
     before_create :default_types
 
     ISSUED = "issued".freeze

data/app/models/katello/content_view_filter.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewFilter < Katello::Model
-    self.include_root_in_json = false
-
     DOCKER = 'docker'.freeze
     RPM = Rpm::CONTENT_TYPE
     PACKAGE_GROUP   = PackageGroup::CONTENT_TYPE

data/app/models/katello/content_view_package_filter_rule.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewPackageFilterRule < Katello::Model
-    self.include_root_in_json = false
-
     belongs_to :filter,
                :class_name => "Katello::ContentViewPackageFilter",
                :inverse_of => :package_rules,

data/app/models/katello/content_view_package_group_filter_rule.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewPackageGroupFilterRule < Katello::Model
-    self.include_root_in_json = false
-
     belongs_to :filter,
                :class_name => "Katello::ContentViewPackageGroupFilter",
                :inverse_of => :package_group_rules,

data/app/models/katello/content_view_puppet_environment.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewPuppetEnvironment < Katello::Model
-    self.include_root_in_json = false
-
     include ForemanTasks::Concerns::ActionSubject
     include Glue::Pulp::Repo if SETTINGS[:katello][:use_pulp]
     include Glue if SETTINGS[:katello][:use_pulp]

data/app/models/katello/content_view_puppet_environment_puppet_module.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewPuppetEnvironmentPuppetModule < Katello::Model
-    self.include_root_in_json = false
-
     # Do not use active record callbacks in this join model.  Direct INSERTs and DELETEs are done
     belongs_to :content_view_puppet_environment,
                :inverse_of => :content_view_puppet_environment_puppet_modules,

data/app/models/katello/content_view_puppet_module.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewPuppetModule < Katello::Model
-    self.include_root_in_json = false
-
     belongs_to :content_view, :class_name => "Katello::ContentView", :inverse_of => :content_view_versions
 
     validates_lengths_from_database

data/app/models/katello/content_view_repository.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewRepository < Katello::Model
-    self.include_root_in_json = false
-
     ALLOWED_REPOSITORY_TYPES = [Repository::YUM_TYPE,
                                 Repository::DOCKER_TYPE,
                                 Repository::OSTREE_TYPE,

data/app/models/katello/content_view_version.rb

@@ -1,7 +1,5 @@
 module Katello
   class ContentViewVersion < Katello::Model
-    self.include_root_in_json = false
-
     include Authorization::ContentViewVersion
     include ForemanTasks::Concerns::ActionSubject
 

data/app/models/katello/erratum_bugzilla.rb

@@ -1,7 +1,5 @@
 module Katello
   class ErratumBugzilla < Katello::Model
-    self.include_root_in_json = false
-
     belongs_to :erratum, :inverse_of => :bugzillas, :class_name => 'Katello::Erratum'
   end
 end

data/app/models/katello/erratum_cve.rb

@@ -1,7 +1,5 @@
 module Katello
   class ErratumCve < Katello::Model
-    self.include_root_in_json = false
-
     belongs_to :erratum, :inverse_of => :cves, :class_name => 'Katello::Erratum'
   end
 end

data/app/models/katello/erratum_package.rb

@@ -1,7 +1,5 @@
 module Katello
   class ErratumPackage < Katello::Model
-    self.include_root_in_json = false
-
     belongs_to :erratum, :inverse_of => :packages, :class_name => 'Katello::Erratum'
   end
 end

data/app/models/katello/ext/label_from_name.rb

@@ -9,7 +9,7 @@ module Katello
       end
 
       def setup_label_from_name
-        unless label.present?
+        if label.blank?
           self.label = Util::Model.labelize(name)
           if self.class.where(:label => self.label).any?
             self.label = Util::Model.uuid

data/app/models/katello/glue/candlepin/pool.rb

@@ -31,12 +31,12 @@ module Katello
         Katello::Resources::Candlepin::Pool.get_for_owner(organization, true)
       end
 
-      def import_pool(cp_pool_id)
+      def import_pool(cp_pool_id, index_hosts = true)
         pool = nil
         ::Katello::Util::Support.active_record_retry do
           pool = Katello::Pool.where(:cp_id => cp_pool_id).first_or_create
         end
-        pool.import_data
+        pool.import_data(index_hosts)
       end
     end
 
@@ -93,8 +93,7 @@ module Katello
         subscription
       end
 
-      # rubocop:disable MethodLength
-      def import_data
+      def import_data(index_hosts = true)
         pool_attributes = {}.with_indifferent_access
         pool_json = self.backend_data
         product_attributes = pool_json["productAttributes"] + pool_json["attributes"]
@@ -127,22 +126,30 @@ module Katello
           pool_attributes[:unmapped_guest] = true
         end
 
-        if subscription.try(:redhat?)
-          pool_attributes[:virt_who] = pool_attributes['virt_limit'] != "0" && pool_attributes['virt_limit'].present?
-        else
-          pool_attributes[:virt_who] = false
-        end
+        pool_attributes[:virt_who] = pool_attributes['virt_limit'] != "0" && !pool_attributes['virt_limit'].nil? && subscription.try(:redhat?)
 
         exceptions = pool_attributes.keys.map(&:to_sym) - self.attribute_names.map(&:to_sym)
         self.update_attributes(pool_attributes.except!(*exceptions))
         self.save!
         self.create_activation_key_associations
+        self.import_hosts if index_hosts
       end
 
-      def hosts
+      def import_hosts
         entitlements = Resources::Candlepin::Pool.entitlements(self.cp_id, ["consumer.uuid"])
         uuids = entitlements.map { |ent| ent["consumer"]["uuid"] }
-        ::Host.where(:id => Katello::Host::SubscriptionFacet.where(:uuid => uuids).pluck(:host_id))
+        sub_facets = Katello::Host::SubscriptionFacet.where(:uuid => uuids)
+        sub_facet_ids = sub_facets.pluck(:id)
+        sub_facet_ids.each do |sub_facet_id|
+          Katello::SubscriptionFacetPool.where(:pool_id => self.id, :subscription_facet_id => sub_facet_id).first_or_create
+        end
+        existing_associations = Katello::SubscriptionFacetPool.where(:pool_id => self.id)
+        correct_associations = Katello::SubscriptionFacetPool.where(:pool_id => self.id, :subscription_facet_id => sub_facet_ids)
+        (existing_associations - correct_associations).map(&:destroy)
+      end
+
+      def hosts
+        ::Host.where(:id => self.subscription_facets.pluck(:host_id))
       end
 
       def create_activation_key_associations

data/app/models/katello/glue/candlepin/product.rb

@@ -49,7 +49,6 @@ module Katello
       product.productContent_will_change!
       product.productContent = product.build_product_content(product_content_attrs)
       product.save!
-
     rescue => e
       [Rails.logger, import_logger].each do |logger|
         logger.error "Failed to create product #{attrs['name']}: #{e}" if logger
@@ -58,7 +57,7 @@ module Katello
     end
 
     module InstanceMethods
-      def initialize(attribs = nil, options = {})
+      def initialize(attribs = nil)
         unless attribs.nil?
           attributes_key = attribs.key?(:attributes) ? :attributes : 'attributes'
           if attribs.key?(attributes_key)

data/app/models/katello/glue/pulp/repo.rb

@@ -85,7 +85,7 @@ module Katello
         last.nil? ? nil : last.to_s
       end
 
-      def initialize(attrs = nil, options = {})
+      def initialize(attrs = nil)
         if attrs.nil?
           super
         else
@@ -97,7 +97,7 @@ module Katello
           attrs_used_by_model = attrs.reject do |k, _v|
             !self.class.column_defaults.keys.member?(k.to_s) && (!respond_to?(:"#{k.to_s}=") rescue true)
           end
-          super(attrs_used_by_model, options)
+          super(attrs_used_by_model)
         end
       end
 
@@ -157,8 +157,7 @@ module Katello
         when Repository::FILE_TYPE
           Runcible::Models::IsoImporter.new(importer_ssl_options(capsule).merge(:feed => importer_feed_url(capsule)))
         when Repository::PUPPET_TYPE
-          options = {:feed => importer_feed_url(capsule)}
-          Runcible::Models::PuppetImporter.new(importer_ssl_options(capsule).merge(options))
+          Runcible::Models::PuppetImporter.new(puppet_importer_values(capsule))
         when Repository::DOCKER_TYPE
           options = {}
           options[:upstream_name] = capsule.default_capsule? ? self.docker_upstream_name : self.container_repository_name
@@ -207,6 +206,14 @@ module Katello
         config.merge(importer_ssl_options(capsule))
       end
 
+      def puppet_importer_values(capsule)
+        config = {
+          :feed => self.importer_feed_url(capsule),
+          :remove_missing => capsule.default_capsule? ? self.mirror_on_sync? : true
+        }
+        config.merge(importer_ssl_options(capsule))
+      end
+
       def importer_ssl_options(capsule = SmartProxy.default_capsule!)
         if !capsule.default_capsule?
           ueber_cert = ::Cert::Certs.ueber_cert(organization)
@@ -709,14 +716,14 @@ module Katello
         begin
           history = Katello.pulp_server.extensions.repository.sync_status(pulp_id)
 
-          if history.nil? || history.empty?
+          if history.blank?
             history = PulpSyncStatus.convert_history(Katello.pulp_server.extensions.repository.sync_history(pulp_id))
           end
         rescue
           history = PulpSyncStatus.convert_history(Katello.pulp_server.extensions.repository.sync_history(pulp_id))
         end
 
-        if history.nil? || history.empty?
+        if history.blank?
           return PulpSyncStatus.new(:state => PulpSyncStatus::Status::NOT_SYNCED)
         else
           history = sort_sync_status(history)

data/app/models/katello/glue/pulp/repos.rb

@@ -213,30 +213,30 @@ module Katello
         end
       end
 
-      def add_repo(label, name, url, repo_type, unprotected = false, gpg = nil, checksum_type = nil, download_policy = nil)
-        unprotected = unprotected.nil? ? false : unprotected
+      def add_repo(repo_param)
+        repo_param[:unprotected] = repo_param[:unprotected].nil? ? false : repo_param[:unprotected]
 
-        if download_policy.blank? && repo_type == Repository::YUM_TYPE
-          download_policy = Setting[:default_download_policy]
+        if repo_param[:download_policy].blank? && repo_param[:content_type] == Repository::YUM_TYPE
+          repo_param[:download_policy] = Setting[:default_download_policy]
         end
 
-        rel_path = if repo_type == 'docker'
-                     Glue::Pulp::Repos.custom_docker_repo_path(self.library, self, label)
+        rel_path = if repo_param[:content_type] == 'docker'
+                     Glue::Pulp::Repos.custom_docker_repo_path(self.library, self, repo_param[:label])
                    else
-                     Glue::Pulp::Repos.custom_repo_path(self.library, self, label)
+                     Glue::Pulp::Repos.custom_repo_path(self.library, self, repo_param[:label])
                    end
         Repository.new(:environment => self.organization.library,
                        :product => self,
                        :relative_path => rel_path,
-                       :arch => arch,
-                       :name => name,
-                       :label => label,
-                       :url => url,
-                       :gpg_key => gpg,
-                       :unprotected => unprotected,
-                       :content_type => repo_type,
-                       :checksum_type => checksum_type,
-                       :download_policy => download_policy,
+                       :arch => repo_param[:arch],
+                       :name => repo_param[:name],
+                       :label => repo_param[:label],
+                       :url => repo_param[:url],
+                       :gpg_key => repo_param[:gpg_key],
+                       :unprotected => repo_param[:unprotected],
+                       :content_type => repo_param[:content_type],
+                       :checksum_type => repo_param[:checksum_type],
+                       :download_policy => repo_param[:download_policy],
                        :content_view_version => self.organization.library.default_content_view_version)
       end
 

data/app/models/katello/gpg_key.rb

@@ -1,7 +1,5 @@
 module Katello
   class GpgKey < Katello::Model
-    self.include_root_in_json = false
-
     include Katello::Authorization::GpgKey
     MAX_CONTENT_LENGTH = 100_000
     MAX_CONTENT_LINE_LENGTH = 65

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

@@ -64,9 +64,30 @@ module Katello
         self.applicable_rpms.in_repositories(repos).uniq
       end
 
+      def errata_counts
+        hash = {
+          :security => installable_security_errata_count,
+          :bugfix => installable_bugfix_errata_count,
+          :enhancement => installable_enhancement_errata_count
+        }
+        hash[:total] = hash.values.inject(:+)
+        hash
+      end
+
       def import_applicability(partial = false)
         import_errata_applicability(partial)
         import_rpm_applicability(partial)
+        update_applicability_counts
+      end
+
+      def update_applicability_counts
+        self.update_attributes!(
+            :installable_security_errata_count => self.installable_errata.security.count,
+            :installable_bugfix_errata_count => self.installable_errata.bugfix.count,
+            :installable_enhancement_errata_count => self.installable_errata.enhancement.count,
+            :applicable_rpm_count => self.applicable_rpms.count,
+            :upgradable_rpm_count => self.installable_rpms.count
+        )
       end
 
       def import_rpm_applicability(partial)

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

@@ -0,0 +1,56 @@
+require 'host_info'
+
+module Katello
+  module Host
+    class InfoProvider < ::HostInfo::Provider
+      def host_info
+        info = {}
+        info['parameters'] = {
+          'kt_env' => host.lifecycle_environment.try(:label), #deprecated
+          'kt_cv' => host.content_view.try(:label), #deprecated
+          'foreman_host_collections' => host.host_collections.map(&:name),
+          'lifecycle_environment' => host.lifecycle_environment.try(:label),
+
+          'content_view' => host.content_view.try(:label),
+          'content_view_info' => content_view_info
+        }
+
+        if host.content_facet.present?
+          info['parameters']['kickstart_repository'] = host.content_facet.kickstart_repository.try(:label)
+        end
+        info
+      end
+
+      def content_view_info
+        return {} if host.content_view.blank?
+
+        content_view_info = {
+          'label' => host.content_view.try(:label),
+          'latest-version' => host.content_view.try(:latest_version),
+          'version' => content_version.try(:version),
+          'published' => content_version.try(:created_at),
+          'components' => content_view_components
+        }
+
+        content_view_info
+      end
+
+      def content_view_components
+        return {} unless host.content_view.try(:composite)
+
+        components = {}
+        content_version.try(:content_view_version_components).map do |cv|
+          cv_label = cv.component_version.content_view.label
+          components[cv_label] = {}
+          components[cv_label]['version'] = cv.component_version.try(:version)
+          components[cv_label]['published'] = cv.component_version.try(:created_at)
+        end
+        components
+      end
+
+      def content_version
+        host.content_view.try(:version, host.lifecycle_environment)
+      end
+    end
+  end
+end