katello 3.1.0.1 → 3.2.0.rc1

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

@@ -12,8 +12,6 @@ module Katello
 
         validates_with Katello::Validators::ContentViewEnvironmentValidator
 
-        attr_accessible :content_view_id, :lifecycle_environment_id, :content_source_id, :kickstart_repository_id
-
         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

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

@@ -15,7 +15,7 @@ module Katello
 
           medium_path = ::Medium.installation_media_path(repo.uri)
 
-          if distribution = repo.distribution_bootable?
+          if (distribution = repo.distribution_bootable?)
             return if ::Medium.find_by(:path => medium_path)
 
             os = ::Redhat.find_or_create_operating_system(repo)
@@ -30,7 +30,7 @@ module Katello
             os.save!
 
           else
-            if medium = ::Medium.find_by(:path => medium_path)
+            if (medium = ::Medium.find_by(:path => medium_path))
               medium.destroy
             end
           end

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

@@ -32,7 +32,6 @@ module Katello
         has_many :org_tasks, :dependent => :destroy, :class_name => "Katello::TaskStatus", :inverse_of => :organization
 
         attr_accessor :statistics
-        attr_accessible :label, :service_level
 
         scope :having_name_or_label, ->(name_or_label) { where("name = :id or label = :id", :id => name_or_label) }
         scoped_search :on => :label, :complete_value => :true
@@ -45,10 +44,6 @@ module Katello
           ContentView.default.where(:organization_id => self.id).first
         end
 
-        def systems
-          System.where(:environment_id => kt_environments)
-        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|

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

@@ -46,10 +46,14 @@ module Katello
         all_items.count
       end
 
+      def unit_id_field
+        "#{self.name.demodulize.underscore}_id"
+      end
+
       def sync_repository_associations(repository, unit_uuids, additive = false)
         associated_ids = with_uuid(unit_uuids).pluck(:id)
         table_name = self.repository_association_class.table_name
-        attribute_name = "#{self.name.demodulize.underscore}_id"
+        attribute_name = unit_id_field
 
         existing_ids = self.repository_association_class.uncached do
           self.repository_association_class.where(:repository_id => repository).pluck(attribute_name)

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

@@ -10,10 +10,11 @@ module Katello
         include ForemanTasks::Concerns::ActionSubject
         include LazyAccessor
 
+        alias_method_chain :refresh, :puppet_path
+
         before_create :associate_organizations
         before_create :associate_default_location
         before_create :associate_lifecycle_environments
-        attr_accessible :lifecycle_environment_ids
 
         lazy_accessor :pulp_repositories, :initializer => lambda { |_s| pulp_node.extensions.repository.retrieve_all }
 
@@ -46,6 +47,25 @@ module Katello
         end
       end
 
+      def puppet_path
+        self[:puppet_path] || update_puppet_path
+      end
+
+      def update_puppet_path
+        if has_feature?(PULP_FEATURE)
+          path = ProxyAPI::Pulp.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
+        elsif has_feature?(PULP_NODE_FEATURE)
+          path = ProxyAPI::PulpNode.new(:url => self.url).capsule_puppet_path['puppet_content_dir']
+        end
+        self.update_attribute(:puppet_path, path) if path
+      end
+
+      def refresh_with_puppet_path
+        errors = refresh_without_puppet_path
+        update_puppet_path
+        errors
+      end
+
       def pulp_node
         @pulp_node ||= Katello::Pulp::Server.config(pulp_url, User.remote_user)
       end

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

@@ -19,12 +19,11 @@ module Katello
         scoped_search :on => :status, :in => :subscription_status_object, :rename => :subscription_status,
                       :complete_value => SUBSCRIPTION_STATUS_MAP
 
-        attr_accessible :subscription_facet_attributes
-
         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
+        scoped_search :on => :registered_through, :in => :subscription_facet, :complete_value => true
         scoped_search :on => :registered_at, :in => :subscription_facet, :rename => :registered_at
         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

data/app/models/katello/content_view.rb

@@ -36,7 +36,6 @@ module Katello
     has_many :filters, :dependent => :destroy, :class_name => "Katello::ContentViewFilter"
 
     has_many :activation_keys, :class_name => "Katello::ActivationKey", :dependent => :restrict_with_exception
-    has_many :systems, :class_name => "Katello::System", :dependent => :restrict_with_exception
 
     has_many :content_facets, :class_name => "Katello::Host::ContentFacet", :foreign_key => :content_view_id,
                           :inverse_of => :content_view, :dependent => :restrict_with_exception
@@ -50,6 +49,7 @@ module Katello
                       :presence => true
     validates :name, :presence => true, :uniqueness => {:scope => :organization_id}
     validates :organization_id, :presence => true
+    validate :check_non_composite_components
     validate :check_repo_conflicts
     validate :check_puppet_conflicts
     validates :composite, :inclusion => [true, false]
@@ -76,7 +76,7 @@ module Katello
     end
 
     def content_host_count
-      systems.count
+      hosts.count
     end
 
     def copy(new_name)
@@ -288,7 +288,7 @@ module Katello
       end
       version = ContentViewVersion.find(version.id)
 
-      if foreman_env = Environment.find_by_katello_id(self.organization, from_env, self)
+      if (foreman_env = Environment.find_by_katello_id(self.organization, from_env, self))
         foreman_env.destroy
       end
 
@@ -316,6 +316,12 @@ module Katello
       counts.select { |_k, v| v > 1 }.keys
     end
 
+    def check_non_composite_components
+      if !composite? && components.present?
+        errors.add(:base, _("Cannot add component versions to a non-composite content view"))
+      end
+    end
+
     def check_repo_conflicts
       duplicate_repositories.each do |repo|
         versions = components.with_library_repo(repo).uniq.map(&:name).join(", ")
@@ -442,7 +448,7 @@ module Katello
             name_and_author[:author],
             self.organization.library.repositories.puppet_type
           )
-          puppet_modules << puppet_module
+          puppet_modules << puppet_module if puppet_module
         end
       end
 
@@ -476,7 +482,7 @@ module Katello
     def check_remove_from_environment!(env)
       errors = []
 
-      dependencies = {systems:                _("systems"),
+      dependencies = {hosts:                _("hosts"),
                       activation_keys:        _("activation keys")
       }
 
@@ -495,7 +501,7 @@ module Katello
       errors = []
 
       dependencies = {environments:           _("environments"),
-                      systems:                _("systems"),
+                      hosts:                  _("hosts"),
                       activation_keys:        _("activation keys")
       }
 

data/app/models/katello/content_view_component.rb

@@ -14,9 +14,6 @@ module Katello
     private
 
     def content_view_types
-      unless content_view.composite?
-        errors.add(:base, _("Cannot add component versions to a non-composite content view"))
-      end
       if content_view_version.content_view.composite?
         errors.add(:base, _("Cannot add composite versions to a composite content view"))
       end

data/app/models/katello/content_view_environment.rb

@@ -30,8 +30,8 @@ module Katello
       self.environment
     end
 
-    def systems
-      content_view.systems.in_environment(environment)
+    def hosts
+      ::Host.in_content_view_environment(:content_view => self.content_view, :lifecycle_environment => self.environment)
     end
 
     def activation_keys

data/app/models/katello/content_view_package_filter_rule.rb

@@ -9,6 +9,19 @@ module Katello
 
     validates_lengths_from_database
     validates :name, :presence => true
+    validate :ensure_unique_attributes
     validates_with Validators::ContentViewFilterVersionValidator
+
+    def ensure_unique_attributes
+      other = self.class.where(:name => self.name,
+                               :version => self.version,
+                               :content_view_filter_id => self.content_view_filter_id,
+                               :min_version => self.min_version,
+                               :max_version => self.max_version)
+      other = other.where.not(:id => self.id) if self.id
+      if other.exists?
+        errors.add(:base, "This package filter rule already exists.")
+      end
+    end
   end
 end

data/app/models/katello/content_view_puppet_environment.rb

@@ -67,10 +67,10 @@ module Katello
       self.environment.nil?
     end
 
-    def generate_puppet_path
+    def generate_puppet_path(capsule)
       # rubocop:disable Style/EmptyElse
       if self.environment
-        File.join(SETTINGS[:katello][:puppet_repo_root], generate_puppet_env_name, 'modules')
+        File.join(capsule.puppet_path, generate_puppet_env_name, 'modules')
       else
         nil #don't generate archived content view puppet environments
       end

data/app/models/katello/content_view_repository.rb

@@ -4,7 +4,8 @@ module Katello
 
     ALLOWED_REPOSITORY_TYPES = [Repository::YUM_TYPE,
                                 Repository::DOCKER_TYPE,
-                                Repository::OSTREE_TYPE
+                                Repository::OSTREE_TYPE,
+                                Repository::FILE_TYPE
                                ].freeze
 
     belongs_to :content_view, :inverse_of => :content_view_repositories,

data/app/models/katello/content_view_version.rb

@@ -41,6 +41,9 @@ module Katello
 
     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
+      joins(:content_view).where("#{Katello::ContentView.table_name}.organization_id" => organization_id)
+    end
 
     scoped_search :on => :content_view_id, :only_explicit => true
     scoped_search :on => :major, :rename => :version, :complete_value => true, :ext_method => :find_by_version
@@ -81,7 +84,7 @@ module Katello
 
     def self.with_puppet_module(puppet_module)
       joins(:content_view_puppet_environments)
-        .where("#{Katello::ContentViewPuppetEnvironment.table_name}.id = ?", puppet_module.content_view_puppet_environments)
+        .where("#{Katello::ContentViewPuppetEnvironment.table_name}.id" => puppet_module.content_view_puppet_environments)
     end
 
     def to_s
@@ -177,7 +180,7 @@ module Katello
     end
 
     def deletable?(from_env)
-      !System.exists?(:environment_id => from_env, :content_view_id => self.content_view) ||
+      ::Host.in_content_view_environment(self.content_view, from_env).empty? ||
           self.content_view.versions.in_environment(from_env).count > 1
     end
 
@@ -216,6 +219,10 @@ module Katello
       Katello::Rpm.in_repositories(self.repositories.archived).count
     end
 
+    def file_count
+      Katello::FileUnit.in_repositories(self.repositories.archived).count
+    end
+
     def ostree_branch_count
       ostree_branches.count
     end

data/app/models/katello/erratum.rb

@@ -76,10 +76,6 @@ module Katello
         where("#{Katello::ContentFacetRepository.table_name}.repository_id = #{Katello::RepositoryErratum.table_name}.repository_id").uniq
     end
 
-    def hosts_unavailable
-      self.hosts_applicable.where("#{Katello::System.table_name}.id not in (#{self.hosts_available.select("#{Katello::System.table_name}.id").to_sql})")
-    end
-
     def self.installable_for_hosts(hosts = nil)
       query = Katello::Erratum.joins(:content_facet_errata).joins(:repository_errata).
         joins("INNER JOIN #{Katello::ContentFacetRepository.table_name} on \
@@ -94,7 +90,7 @@ module Katello
 
     def update_from_json(json)
       keys = %w(title id severity issued type description reboot_suggested solution updated summary)
-      custom_json = json.clone.delete_if { |key, _value| !keys.include?(key) }
+      custom_json = json.slice(*keys)
 
       if self.updated.blank? || (custom_json['updated'].to_datetime != self.updated.to_datetime)
         custom_json['errata_id'] = custom_json.delete('id')

data/app/models/katello/file_unit.rb

@@ -0,0 +1,41 @@
+module Katello
+  class FileUnit < Katello::Model
+    include Concerns::PulpDatabaseUnit
+
+    self.table_name = 'katello_files'
+
+    CONTENT_TYPE = Pulp::FileUnit::CONTENT_TYPE
+
+    has_many :repositories, :through => :repository_files, :class_name => "Katello::Repository"
+    has_many :repository_files, :class_name => "Katello::RepositoryFile", :dependent => :destroy, :inverse_of => :file, :foreign_key => :file_id
+
+    scoped_search :on => :name, :complete_value => true
+    scoped_search :on => :path, :complete_value => true
+    scoped_search :on => :checksum
+    scoped_search :in => :repositories, :on => :name, :rename => :repository, :complete_value => true
+
+    def self.default_sort
+      order(:name)
+    end
+
+    def self.repository_association_class
+      RepositoryFile
+    end
+
+    def self.unit_id_field
+      'file_id'
+    end
+
+    def update_from_json(json)
+      custom_json = {}
+      custom_json['checksum'] = json['checksum']
+      custom_json['path'] = json['name']
+      custom_json['name'] = File.basename(json['name'])
+      self.update_attributes!(custom_json)
+    end
+
+    def self.total_for_repositories(repos)
+      self.in_repositories(repos).uniq.count
+    end
+  end
+end

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

@@ -47,7 +47,7 @@ module Katello
       end
 
       def subscribe(pool_id, quantity = 1)
-        pool = Katello::Pool.find(pool_id)
+        pool = Katello::Pool.with_identifier(pool_id)
         subscription = pool.subscription
         add_custom_product(subscription.product_id) unless subscription.redhat?
         Resources::Candlepin::ActivationKey.add_pools self.cp_id, pool.cp_id, quantity
@@ -56,7 +56,7 @@ module Katello
 
       def unsubscribe(pool_id)
         fail _("Subscription id is nil.") unless pool_id
-        pool = Katello::Pool.find(pool_id)
+        pool = Katello::Pool.with_identifier(pool_id)
         subscription = pool.subscription
         remove_custom_product(subscription.product_id) unless subscription.redhat?
         Resources::Candlepin::ActivationKey.remove_pools self.cp_id, pool.cp_id

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

@@ -81,6 +81,15 @@ module Katello
         self.class.candlepin_data(self.cp_id)
       end
 
+      def stacking_subscription(org_label, stacking_id)
+        subscription = ::Katello::Subscription.find_by(:product_id => stacking_id)
+        if subscription.nil?
+          found_product = ::Katello::Resources::Candlepin::Product.find_for_stacking_id(org_label, stacking_id)
+          subscription = ::Katello::Subscription.find_by(:product_id => found_product['id']) if found_product
+        end
+        subscription
+      end
+
       def import_data
         pool_attributes = {}
         pool_json = self.backend_data
@@ -88,13 +97,13 @@ module Katello
 
         product_attributes.map { |attr| pool_attributes[attr["name"].underscore.to_sym] = attr["value"] }
 
-        if !pool_json["sourceStackId"].nil?
-          subscription = ::Katello::Subscription.where(:product_id => pool_json["sourceStackId"])
+        if pool_json["sourceStackId"]
+          subscription = stacking_subscription(pool_json['owner']['key'], pool_json["sourceStackId"])
         else
-          subscription = ::Katello::Subscription.where(:cp_id => pool_json["subscriptionId"])
+          subscription = ::Katello::Subscription.find_by(:cp_id => pool_json["subscriptionId"])
         end
 
-        pool_attributes[:subscription_id] = subscription.first.id if subscription.any?
+        pool_attributes[:subscription_id] = subscription.id if subscription
 
         %w(accountNumber contractNumber quantity startDate endDate accountNumber consumed).each do |json_attribute|
           pool_attributes[json_attribute.underscore] = pool_json[json_attribute]
@@ -120,8 +129,10 @@ module Katello
         self.create_activation_key_associations
       end
 
-      def systems
-        System.all_by_pool(cp_id)
+      def hosts
+        entitlements = Resources::Candlepin::Pool.entitlements(self.cp_id)
+        uuids = entitlements.map { |ent| ent["consumer"]["uuid"] }
+        ::Host.where(:id => Katello::Host::SubscriptionFacet.where(:uuid => uuids).pluck(:host_id))
       end
 
       def create_activation_key_associations
@@ -135,14 +146,8 @@ module Katello
         end
       end
 
-      def host
-        System.find_by(:uuid => host_id) if host_id
-      end
-
-      def hosts
-        entitlements = Resources::Candlepin::Entitlement.get
-        uuids = entitlements.delete_if { |ent| ent["pool"]["id"] != cp_id }.map { |ent| ent["consumer"]["uuid"] }
-        ::Host.where(:id => Katello::Host::ContentFacet.where(:uuid => uuids).pluck(:host_id))
+      def hypervisor
+        ::Katello::Host::SubscriptionFacet.find_by(:uuid => host_id).try(:host) if host_id
       end
     end
   end

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

@@ -149,7 +149,7 @@ module Katello
       def docker_feed_url(capsule = false)
         pulp_uri = URI.parse(SETTINGS[:katello][:pulp][:url])
         if capsule
-          "https://#{pulp_uri.host.downcase}:5000"
+          "https://#{pulp_uri.host.downcase}:#{Setting['pulp_docker_registry_port']}"
         else
           self.url if self.respond_to?(:url)
         end
@@ -199,10 +199,11 @@ module Katello
             :ssl_ca_cert => nil
           }
         end
+        importer_options.merge!(:ssl_validation => verify_ssl_on_sync?) unless self.is_a?(::Katello::ContentViewPuppetEnvironment)
         importer_options
       end
 
-      def generate_distributors(capsule = false)
+      def generate_distributors(capsule = nil)
         case self.content_type
         when Repository::YUM_TYPE
           yum_dist_id = self.pulp_id
@@ -222,7 +223,7 @@ module Katello
           distributors = [dist]
         when Repository::PUPPET_TYPE
           dist_options = { :id => self.pulp_id, :auto_publish => true }
-          repo_path =  File.join(SETTINGS[:katello][:puppet_repo_root],
+          repo_path =  File.join(capsule.puppet_path,
                                  Environment.construct_name(self.organization,
                                                             self.environment,
                                                             self.content_view),
@@ -301,6 +302,10 @@ module Katello
         Katello.pulp_server.extensions.repository.rpm_ids(self.pulp_id)
       end
 
+      def pulp_file_ids
+        Katello.pulp_server.extensions.repository.file_ids(self.pulp_id)
+      end
+
       def pulp_errata_ids
         Katello.pulp_server.extensions.repository.errata_ids(self.pulp_id)
       end
@@ -373,6 +378,20 @@ module Katello
         Katello::Rpm.sync_repository_associations(self, pulp_rpm_ids)
       end
 
+      def index_db_files(force = false)
+        if self.content_view.default? || force
+          files_json.each do |file_json|
+            begin
+              file = ::Katello::FileUnit.where(:uuid => file_json['_id']).first_or_create
+            rescue ActiveRecord::RecordNotUnique
+              retry
+            end
+            file.update_from_json(file_json)
+          end
+        end
+        Katello::FileUnit.sync_repository_associations(self, pulp_file_ids)
+      end
+
       def index_db_puppet_modules(force = false)
         if self.content_view.default? || force
           puppet_modules_json.each do |puppet_module_json|
@@ -434,6 +453,19 @@ module Katello
         tmp_packages
       end
 
+      def files_json
+        tmp_packages = []
+        self.pulp_file_ids.each_slice(SETTINGS[:katello][:pulp][:bulk_load_size]) do |sub_list|
+          tmp_packages.concat(
+            Katello.pulp_server.extensions.file.find_all_by_unit_ids(
+              sub_list,
+              ::Katello::Pulp::FileUnit::PULP_INDEXED_FIELDS
+            )
+          )
+        end
+        tmp_packages
+      end
+
       def index_db_docker_manifests
         docker_manifests_json.each do |manifest_json|
           manifest = DockerManifest.where(:uuid => manifest_json[:_id]).first_or_create
@@ -455,9 +487,10 @@ module Katello
         tag = unit_search(:type_ids => [Runcible::Extensions::DockerTag.content_type],
                           :filters => { :unit => { :manifest_digest => manifest.digest,
                                                    :name => tag_name } }).first
-
-        DockerTag.where(:repository_id => id, :docker_manifest_id => manifest.id,
-                        :name => tag[:metadata][:name], :uuid => tag[:metadata][:_id]).first_or_create
+        if tag
+          DockerTag.where(:repository_id => id, :docker_manifest_id => manifest.id,
+                          :name => tag[:metadata][:name], :uuid => tag[:metadata][:_id]).first_or_create
+        end
       end
 
       def package_group_categories(search_args = {})
@@ -515,7 +548,7 @@ module Katello
       end
 
       def pulp_update_needed?
-        changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy mirror_on_sync)
+        changeable_attributes = %w(url unprotected checksum_type docker_upstream_name download_policy mirror_on_sync verify_ssl_on_sync)
         changeable_attributes << "name" if docker?
         changeable_attributes.any? { |key| previous_changes.key?(key) }
       end
@@ -768,8 +801,8 @@ module Katello
         end
       end
 
-      def distributors_match?(capsule_distributors)
-        generated_distributor_configs = self.generate_distributors(true)
+      def distributors_match?(capsule_distributors, capsule)
+        generated_distributor_configs = self.generate_distributors(capsule)
         generated_distributor_configs.all? do |gen_dist|
           type = gen_dist.class.type_id
           found_on_capsule = capsule_distributors.find { |dist| dist['distributor_type_id'] == type }
@@ -827,7 +860,7 @@ module Katello
       pulp_uri = URI.parse(smart_proxy ? smart_proxy.url : SETTINGS[:katello][:pulp][:url])
       scheme   = (self.unprotected && !force_https) ? 'http' : 'https'
       if docker?
-        "#{pulp_uri.host.downcase}:5000/#{pulp_id}"
+        "#{pulp_uri.host.downcase}:#{Setting['pulp_docker_registry_port']}/#{pulp_id}"
       elsif file?
         "#{scheme}://#{pulp_uri.host.downcase}/pulp/isos/#{pulp_id}/"
       elsif puppet?
@@ -847,6 +880,7 @@ module Katello
       self.index_db_package_groups
       self.index_db_ostree_branches if Katello::RepositoryTypeManager.find(Repository::OSTREE_TYPE).present?
       self.import_distribution_data
+      self.index_db_files
       true
     end
   end