katello 3.8.1 → 3.9.0.rc1

data/app/presenters/katello/content_view_version_compare_presenter.rb

@@ -7,8 +7,13 @@ module Katello
     end
 
     def comparison
-      item_repos = @item.repositories
-      item_repos.where(:library_instance_id => @repository.id) if @repository
+      if @item.is_a?(::Katello::PuppetModule)
+        item_repos = @item.content_view_puppet_environments
+      else
+        item_repos = @item.repositories
+        item_repos.where(:library_instance_id => @repository.id) if @repository
+      end
+
       item_repos.map(&:content_view_version_id) & @versions.map(&:id)
     end
 

data/app/services/katello/candlepin/consumer.rb

@@ -23,6 +23,7 @@ module Katello
                                                              ::Katello::ContentOverride.from_entitlement_hash(override)
                                                            end
                                                          end)
+      lazy_accessor :purpose_compliance, :initializer => lambda { |_s| Resources::Candlepin::Consumer.purpose_compliance(uuid) }
 
       attr_accessor :uuid, :owner_label
 
@@ -120,6 +121,30 @@ module Katello
         self.class.friendly_compliance_reasons(Resources::Candlepin::Consumer.compliance(uuid)['reasons'])
       end
 
+      def compliant_role?
+        purpose_compliance['nonCompliantRole'].nil?
+      end
+
+      def compliant_usage?
+        purpose_compliance['nonCompliantUsage'].nil?
+      end
+
+      def compliant_addons?
+        purpose_compliance['nonCompliantAddOns'].empty?
+      end
+
+      def compliant_sla?
+        purpose_compliance['nonCompliantSLA'].empty?
+      end
+
+      def entitlements?
+        # use cahced consumer_attributes if possible
+        count = @consumer_attributes.try(:[], 'entitlementCount')
+        return count > 0 if count
+
+        !entitlements.empty?
+      end
+
       def self.friendly_compliance_reasons(candlepin_reasons)
         candlepin_reasons.map do |reason|
           product_name = reason['productName'] || reason['attributes']['name']

data/app/services/katello/candlepin/message_handler.rb

@@ -21,14 +21,30 @@ module Katello
         data ? JSON.parse(data) : {}
       end
 
-      def sub_status
+      def status
         event_data['status']
       end
 
-      def consumer_reasons
+      def reasons
         event_data['reasons']
       end
 
+      def compliant_role?
+        reasons.none? { |reason| reason.match(/role/) }
+      end
+
+      def compliant_usage?
+        reasons.none? { |reason| reason.match(/usage/) }
+      end
+
+      def compliant_addons?
+        reasons.none? { |reason| reason.match(/add on/) }
+      end
+
+      def compliant_sla?
+        reasons.none? { |reason| reason.match(/sla/) }
+      end
+
       def consumer_uuid
         content['consumerUuid']
       end

data/app/services/katello/managed_content_medium_provider.rb

@@ -0,0 +1,27 @@
+module Katello
+  class ManagedContentMediumProvider < ::MediumProviders::Provider
+    def validate
+      errors = []
+
+      errors << N_("Kickstart repository was not set for host '%{host}'") % { :host => entity } if kickstart_repo.nil?
+      errors << N_("Content source was not set for host '%{host}'") % { :host => entity } if entity.content_source.nil?
+      errors
+    end
+
+    def medium_uri(path = "")
+      url = kickstart_repo.full_path(entity.content_source)
+      url += '/' + path unless path.empty?
+      URI.parse(url)
+    end
+
+    def unique_id
+      @unique_id ||= begin
+        "#{kickstart_repo.name.parameterize}-#{kickstart_repo.id}"
+      end
+    end
+
+    def kickstart_repo
+      @kickstart_repo ||= entity.try(:content_facet).try(:kickstart_repository) || entity.try(:kickstart_repository)
+    end
+  end
+end

data/app/services/katello/product_content_finder.rb

@@ -24,10 +24,10 @@ module Katello
 
       considered_products = match_subscription ? consumable.products : consumable.organization.products.enabled.uniq
 
-      repositories = Katello::Repository.where(:product_id => considered_products).subscribable
-      repositories = repositories.where(:content_view_version_id => version.id) if version
+      roots = Katello::RootRepository.where(:product_id => considered_products).subscribable
+      roots = roots.in_content_view_version(version) if version
 
-      consumable.organization.enabled_product_content_for(repositories)
+      consumable.organization.enabled_product_content_for(roots)
     end
 
     def presenter_with_overrides(overrides)

data/app/services/katello/pulp/module_stream.rb

@@ -0,0 +1,9 @@
+module Katello
+  module Pulp
+    class ModuleStream < PulpContentUnit
+      include LazyAccessor
+
+      CONTENT_TYPE = "modulemd".freeze
+    end
+  end
+end

data/app/services/katello/pulp/repository.rb

@@ -0,0 +1,22 @@
+module Katello
+  module Pulp
+    class Repository < ::Actions::Pulp::Abstract
+      attr_accessor :repo
+
+      def initialize(repo, smart_proxy = nil)
+        @repo = repo
+        @smart_proxy = smart_proxy
+      end
+
+      def sync(overrides = {})
+        sync_options = {}
+        sync_options[:max_speed] = SETTINGS.dig(:katello, :pulp, :sync_KBlimit)
+        sync_options[:num_threads] = SETTINGS.dig(:katello, :pulp, :sync_threads)
+        sync_options[:feed] = overrides[:source_url] if overrides[:source_url]
+        sync_options[:validate] = !SETTINGS.dig(:katello, :pulp, :skip_checksum_validation)
+        sync_options.merge!(overrides[:options]) if overrides[:options]
+        [::Katello::CapsuleContent.new(@smart_proxy).pulp_server.resources.repository.sync(@repo.pulp_id, override_config: sync_options.compact!)]
+      end
+    end
+  end
+end

data/app/services/katello/pulp/srpm.rb

@@ -4,7 +4,7 @@ module Katello
       include LazyAccessor
 
       PULP_SELECT_FIELDS = %w(name epoch version release arch checksumtype checksum).freeze
-      PULP_INDEXED_FIELDS = %w(name version release arch epoch summary sourcerpm checksum filename _id).freeze
+      PULP_INDEXED_FIELDS = %w(name version release arch epoch summary checksum filename _id).freeze
       CONTENT_TYPE = "srpm".freeze
 
       lazy_accessor :pulp_facts, :initializer => :backend_data

data/app/services/katello/pxe_files_downloader.rb

@@ -0,0 +1,41 @@
+module Katello
+  class PxeFilesDownloader
+    attr_accessor :capsule, :repository
+
+    def initialize(repository, capsule)
+      @capsule = capsule
+      @repository = repository
+    end
+
+    def download_files
+      os = Redhat.find_or_create_operating_system(repository)
+      medium_provider = Katello::ManagedContentMediumProvider.new(
+        OpenStruct.new(
+          content_source: capsule,
+          kickstart_repository: repository))
+
+      ueber_cert = ::Cert::Certs.ueber_cert(repository.organization)
+      cert = OpenSSL::X509::Certificate.new(ueber_cert[:cert])
+      key = OpenSSL::PKey::RSA.new(ueber_cert[:key])
+
+      os.boot_file_sources(medium_provider).values.map do |source_pxe_file|
+        fetch(source_pxe_file, cert, key)
+      end
+    end
+
+    private
+
+    def fetch(url, cert, key)
+      response = RestClient::Request.execute(:method => :get,
+                                  :url => url,
+                                  :timeout => SETTINGS[:katello][:rest_client_timeout],
+                                  :ssl_client_cert => cert,
+                                  :ssl_client_key => key,
+                                  :raw_response => true)
+      Rails.logger.info("retrieved #{url}")
+      response
+    rescue StandardError => e
+      Rails.logger.warn("Exception -> #{e.inspect} when retrieving #{url}")
+    end
+  end
+end

data/app/services/katello/registration_manager.rb

@@ -192,6 +192,11 @@ module Katello
         end
 
         host.get_status(::Katello::ErrataStatus).destroy
+        host.get_status(::Katello::PurposeSlaStatus).destroy
+        host.get_status(::Katello::PurposeRoleStatus).destroy
+        host.get_status(::Katello::PurposeUsageStatus).destroy
+        host.get_status(::Katello::PurposeAddonsStatus).destroy
+        host.get_status(::Katello::PurposeStatus).destroy
         host.get_status(::Katello::SubscriptionStatus).destroy
         host.get_status(::Katello::TraceStatus).destroy
         host.installed_packages.delete_all

data/app/views/katello/api/v2/content_facet/show.json.rabl

@@ -22,8 +22,4 @@ child :content_facet => :content_facet_attributes do
   end
 end
 
-child :host_collections => :host_collections do
-  attributes :id, :name
-end
-
 attributes :description, :facts

data/app/views/katello/api/v2/content_view_versions/base.json.rabl

@@ -5,10 +5,12 @@ extends 'katello/api/v2/common/identifier'
 
 attributes :version, :major, :minor
 attributes :composite_content_view_ids
+attributes :published_in_composite_content_view_ids
 attributes :content_view_id
 attributes :default
 attributes :description
 attributes :package_count
+attributes :module_stream_count
 attributes :srpm_count
 attributes :file_count
 attributes :package_group_count
@@ -27,7 +29,15 @@ child :content_view => :content_view do
   attributes :id, :name, :label
 end
 
-child :composite_content_views do
+child :composite_content_views => :composite_content_views do
+  attributes :id, :name, :label
+end
+
+child :composites => :composite_content_view_versions do
+  attributes :id, :content_view_id, :version
+end
+
+child :published_in_composite_content_views => :published_in_composite_content_views do
   attributes :id, :name, :label
 end
 
@@ -66,7 +76,7 @@ child :environments => :environments do
 end
 
 child :archived_repos => :repositories do
-  attributes :id, :name, :label, :content_type
+  attributes :id, :name, :label, :content_type, :library_instance_id
 end
 
 child :last_event => :last_event do

data/app/views/katello/api/v2/debs/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/debs/base'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/docker_manifest_lists/compare.json.rabl

@@ -0,0 +1,10 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/docker_manifest_lists/show'
+  node :comparison do |result|
+    result.comparison
+  end
+end

data/app/views/katello/api/v2/environments/show.json.rabl

@@ -27,6 +27,7 @@ node :counts do |env|
     repos = env.repositories.in_default_view
     counts[:packages] = Katello::Rpm.total_for_repositories(repos)
     counts[:puppet_modules] = Katello::PuppetModule.in_repositories(repos).count
+    counts[:module_streams] = Katello::ModuleStream.in_repositories(repos).count
     counts[:errata] = partial('katello/api/v2/errata/counts', :object => Katello::RelationPresenter.new(Katello::Erratum.in_repositories(repos)))
     counts[:yum_repositories] = repos.yum_type.count
     counts[:docker_repositories] = repos.docker_type.count

data/app/views/katello/api/v2/hosts/host_collections.json.rabl

@@ -0,0 +1,3 @@
+child :host_collections => :host_collections do
+  attributes :id, :name
+end

data/app/views/katello/api/v2/module_streams/base.json.rabl

@@ -0,0 +1,4 @@
+object @resource
+
+attributes :id, :name, :uuid, :version, :context, :stream,
+           :arch, :description, :summary, :module_spec

data/app/views/katello/api/v2/module_streams/index.json.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do
+  extends 'katello/api/v2/module_streams/base'
+end

data/app/views/katello/api/v2/module_streams/name_stream.json.rabl

@@ -0,0 +1,3 @@
+object @object
+
+attributes :name, :stream, :module_spec

data/app/views/katello/api/v2/module_streams/name_streams.json.rabl

@@ -0,0 +1,7 @@
+object false
+
+extends "katello/api/v2/common/metadata"
+
+child @collection[:results] => :results do |_results|
+  extends 'katello/api/v2/module_streams/name_stream'
+end

data/app/views/katello/api/v2/module_streams/show.json.rabl

@@ -0,0 +1,21 @@
+object @resource
+
+extends 'katello/api/v2/module_streams/base'
+
+child :artifacts => :artifacts do
+  attributes :id, :name
+end
+
+child :profiles => :profiles do
+  attributes :id, :name
+  child :rpms => :rpms do
+    attributes :id, :name
+  end
+end
+
+child :library_repositories => :repositories do
+  attributes :id, :name
+  glue :product do
+    attributes :id => :product_id, :name => :product_name
+  end
+end

data/app/views/katello/api/v2/organizations/show.json.rabl

@@ -4,7 +4,10 @@ extends "api/v2/taxonomies/show"
 
 attributes :task_id, :label, :owner_details, :redhat_repository_url
 
-attributes :service_levels, :service_level if ::SETTINGS[:katello][:use_cp]
+if ::SETTINGS[:katello][:use_cp]
+  attributes :system_purposes, :system_purposes
+  attributes :service_levels, :service_level
+end
 
 node :default_content_view_id do |org|
   org.default_content_view.id

data/app/views/katello/api/v2/products/base.json.rabl

@@ -22,5 +22,5 @@ child :sync_plan do
 end
 
 node :repository_count do |product|
-  product.library_repositories.count
+  product.root_repositories.count
 end

data/app/views/katello/api/v2/repositories/base.json.rabl

@@ -2,19 +2,27 @@ object @resource
 
 extends 'katello/api/v2/common/identifier'
 
-attributes :content_type, :url, :relative_path, :arch, :content_id
 attributes :pulp_id => :backend_identifier
-attributes :cp_label => :content_label
-attributes :major, :minor
-attributes :container_repository_name
-
-child :product do |_product|
-  attributes :id, :cp_id, :name
-  node :sync_plan do |_sync_plan|
-    attributes :name, :description, :sync_date, :interval, :next_sync
+attributes :relative_path
+
+glue(@object.root) do
+  attributes :content_type, :url, :arch, :content_id
+  attributes :major, :minor
+  attributes :container_repository_name
+
+  child :product do |_product|
+    attributes :id, :cp_id, :name
+    attributes :orphaned? => :orphaned
+    node :sync_plan do |_sync_plan|
+      attributes :name, :description, :sync_date, :interval, :next_sync
+    end
   end
 end
 
+node :content_label do |repo|
+  repo.content.try(:label)
+end
+
 node :content_counts do |repo|
   {
     :ostree_branch => repo.ostree_branches.count,
@@ -28,7 +36,8 @@ node :content_counts do |repo|
     :erratum => repo.errata.count,
     :puppet_module => repo.puppet_modules.count,
     :file => repo.files.count,
-    :deb => repo.debs.count
+    :deb => repo.debs.count,
+    :module_stream => repo.module_streams.count
   }
 end
 
@@ -41,3 +50,7 @@ node :last_sync_words do |object|
     time_ago_in_words(Time.parse(object.latest_dynflow_sync.ended_at.to_s))
   end
 end
+
+child :content_view => :content_view do |_repo|
+  attribute :id, :name
+end