katello 3.5.0.rc1 → 3.5.0.rc2

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

@@ -2,7 +2,7 @@ module Katello
   class Candlepin::ProductContent
     include ForemanTasks::Triggers
 
-    attr_accessor :content, :enabled, :product
+    attr_accessor :content, :enabled, :product, :product_id
 
     def initialize(params = {}, product_id = nil)
       params = params.with_indifferent_access
@@ -30,19 +30,6 @@ module Katello
       @repos ||= self.product.repos(self.product.organization.library).where(:content_id => self.content.id)
     end
 
-    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
       self.content.type
     end

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

@@ -45,8 +45,12 @@ module Katello
         accepts_nested_attributes_for(
           :content_facet,
           self.nested_attributes_options[:content_facet].merge(
-            :reject_if => proc { |attributes| attributes['content_view_id'].blank? && attributes['lifecycle_environment_id'].blank? })
+            :reject_if => :content_facet_ignore_update?)
         )
+
+        def content_facet_ignore_update?(attributes)
+          self.content_facet.blank? && attributes.blank?
+        end
       end
 
       module ClassMethods

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

@@ -0,0 +1,13 @@
+module Katello
+  module Concerns
+    module ContentViewFilterRuleCommon
+      extend ActiveSupport::Concern
+
+      included do
+        scoped_search on: :name
+
+        validates_lengths_from_database
+      end
+    end
+  end
+end

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

@@ -12,6 +12,7 @@ module Katello
         belongs_to :lifecycle_environment, :inverse_of => :hostgroups, :class_name => "::Katello::KTEnvironment"
 
         validates_with Katello::Validators::ContentViewEnvironmentValidator
+        validates_with Katello::Validators::HostgroupKickstartRepositoryValidator
 
         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

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

@@ -9,7 +9,8 @@ module Katello
           :valid => Katello::SubscriptionStatus::VALID,
           :partial => Katello::SubscriptionStatus::PARTIAL,
           :invalid => Katello::SubscriptionStatus::INVALID,
-          :unknown => Katello::SubscriptionStatus::UNKNOWN
+          :unknown => Katello::SubscriptionStatus::UNKNOWN,
+          :unsubscribed_hypervisor => Katello::SubscriptionStatus::UNSUBSCRIBED_HYPERVISOR
         }.freeze
 
         accepts_nested_attributes_for :subscription_facet, :update_only => true, :reject_if => lambda { |attrs| attrs.values.compact.empty? }

data/app/models/katello/content_view_docker_filter_rule.rb

@@ -1,11 +1,12 @@
 module Katello
   class ContentViewDockerFilterRule < Katello::Model
+    include ::Katello::Concerns::ContentViewFilterRuleCommon
+
     belongs_to :filter,
                :class_name => "Katello::ContentViewDockerFilter",
                :inverse_of => :docker_rules,
                :foreign_key => :content_view_filter_id
 
-    validates_lengths_from_database
     validates :name, :presence => true
     validate :ensure_unique_attributes
 

data/app/models/katello/content_view_erratum_filter_rule.rb

@@ -1,5 +1,7 @@
 module Katello
   class ContentViewErratumFilterRule < Katello::Model
+    include ::Katello::Concerns::ContentViewFilterRuleCommon
+
     before_create :default_types
 
     ISSUED = "issued".freeze
@@ -13,7 +15,6 @@ module Katello
 
     serialize :types, Array
 
-    validates_lengths_from_database
     validates :errata_id, :uniqueness => { :scope => :content_view_filter_id }, :allow_blank => true
     validates_with Validators::ContentViewErratumFilterRuleValidator
 

data/app/models/katello/content_view_package_filter_rule.rb

@@ -1,11 +1,12 @@
 module Katello
   class ContentViewPackageFilterRule < Katello::Model
+    include ::Katello::Concerns::ContentViewFilterRuleCommon
+
     belongs_to :filter,
                :class_name => "Katello::ContentViewPackageFilter",
                :inverse_of => :package_rules,
                :foreign_key => :content_view_filter_id
 
-    validates_lengths_from_database
     validates :name, :presence => true
     validate :ensure_unique_attributes
     validates_with Validators::ContentViewFilterVersionValidator

data/app/models/katello/content_view_package_group_filter_rule.rb

@@ -1,11 +1,12 @@
 module Katello
   class ContentViewPackageGroupFilterRule < Katello::Model
+    include ::Katello::Concerns::ContentViewFilterRuleCommon
+
     belongs_to :filter,
                :class_name => "Katello::ContentViewPackageGroupFilter",
                :inverse_of => :package_group_rules,
                :foreign_key => :content_view_filter_id
 
-    validates_lengths_from_database
     validates :uuid, :presence => true, :uniqueness => { :scope => :content_view_filter_id }
   end
 end

data/app/models/katello/erratum.rb

@@ -52,13 +52,11 @@ module Katello
       # which is calculated elsewhere.
 
       self.joins(:content_facets).
-        where("#{Katello::Host::ContentFacet.table_name}.host_id" => hosts)
+        where("#{Katello::Host::ContentFacet.table_name}.host_id" => hosts.pluck(:id))
     end
 
     def self.applicable_to_hosts_dashboard(hosts)
-      ids = hosts.to_sql.sub(/SELECT.*FROM/, "SELECT #{::Host.connection.quote_table_name('hosts')}.#{::Host.connection.quote_column_name('id')} FROM")
-      self.joins(:content_facets).
-        where("#{Katello::Host::ContentFacet.table_name}.host_id IN (#{ids})").
+      applicable_to_hosts(hosts).
         select("DISTINCT ON (#{self.table_name}.updated, #{self.table_name}.id) #{self.table_name}.*").
         order("#{self.table_name}.updated desc").limit(6)
     end
@@ -108,7 +106,8 @@ module Katello
           #{Katello::ContentFacetRepository.table_name}.repository_id = host_repo_errata.repository_id")
 
       if hosts
-        query = query.where("#{Katello::ContentFacetRepository.table_name}.content_facet_id" => hosts.joins(:content_facet))
+        query = query.where("#{Katello::ContentFacetRepository.table_name}.content_facet_id" => hosts.joins(:content_facet)
+                                .select("#{Katello::Host::ContentFacet.table_name}.id"))
       else
         query = query.joins(:content_facet_errata)
       end

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

@@ -38,6 +38,38 @@ module Katello
         self.owner_details['contentAccessMode']
       end
 
+      def enabled_product_content_for(repositories)
+        return [] if repositories.blank?
+        content_ids = repositories.pluck(:content_id)
+
+        filtered_product_content do |pc|
+          content_ids.include?(pc.content.id) && pc.product.enabled?
+        end
+      end
+
+      def enabled_product_content
+        filtered_product_content do |pc|
+          pc.product.enabled? && pc.product.redhat?
+        end
+      end
+
+      def filtered_product_content
+        cp_products = Katello::Resources::Candlepin::Product.all(self.label, ['id', 'productContent.enabled', 'productContent.content.name', 'productContent.content.id',
+                                                                              'productContent.content.type', 'productContent.content.contentUrl', 'productContent.content.label'])
+        to_return = []
+
+        cp_products.each do |product_hash|
+          product = ::Katello::Product.find_by(:organization_id => self.id, :cp_id => product_hash['id'])
+          if product
+            product_hash['productContent'].each do |pc_hash|
+              pc = Katello::Candlepin::ProductContent.new(pc_hash, product.id)
+              to_return << pc if !block_given? || yield(pc)
+            end
+          end
+        end
+        to_return.sort_by { |pc| pc.content.name.downcase }
+      end
+
       def pools(consumer_uuid = nil)
         if consumer_uuid
           Resources::Candlepin::Owner.pools self.label, :consumer => consumer_uuid

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

@@ -161,7 +161,7 @@ module Katello
         all_repos = repos(self.library, nil, false)
         ForemanTasks::Task::DynflowTask
           .select("#{ForemanTasks::Task::DynflowTask.table_name}.*")
-          .for_action(::Actions::Katello::Repository::Sync)
+          .where(:label => [::Actions::Katello::Repository::Sync.name, ::Actions::Katello::Repository::ScheduledSync.name])
           .joins(:locks).where("foreman_tasks_locks.resource_id in (?) and foreman_tasks_locks.resource_type = ?", all_repos.pluck(:id), ::Katello::Repository.name)
           .order("started_at desc")
       end

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

@@ -108,6 +108,18 @@ module Katello
         end
       end
 
+      def content_view
+        self.host.content_facet.try(:content_view) || self.organization.default_content_view
+      end
+
+      def lifecycle_environment
+        self.host.content_facet.try(:lifecycle_environment) || self.organization.library
+      end
+
+      def organization
+        self.host.organization
+      end
+
       def update_subscription_status(status_override = nil)
         status = host.get_status(::Katello::SubscriptionStatus)
         if status_override
@@ -172,6 +184,10 @@ module Katello
         name.downcase
       end
 
+      def products
+        Katello::Product.joins(:subscriptions => {:pools => :subscription_facets}).where("#{Katello::Host::SubscriptionFacet.table_name}.id" => self.id).enabled.uniq
+      end
+
       def remove_subscriptions(pools_with_quantities)
         ForemanTasks.sync_task(Actions::Katello::Host::RemoveSubscriptions, self.host, pools_with_quantities)
       end

data/app/models/katello/repository.rb

@@ -142,7 +142,7 @@ module Katello
     scoped_search :on => :content_type, :complete_value => -> do
       Katello::RepositoryTypeManager.repository_types.keys.each_with_object({}) { |value, hash| hash[value.to_sym] = value }
     end
-    scoped_search :on => :content_view_id, :relation => :content_view_repositories, :validator => ScopedSearch::Validators::INTEGER
+    scoped_search :on => :content_view_id, :relation => :content_view_repositories, :validator => ScopedSearch::Validators::INTEGER, :only_explicit => true
     scoped_search :on => :distribution_version, :complete_value => true
     scoped_search :on => :distribution_arch, :complete_value => true
     scoped_search :on => :distribution_family, :complete_value => true
@@ -472,7 +472,7 @@ module Katello
     end
 
     def latest_dynflow_sync
-      @latest_dynflow_sync ||= ForemanTasks::Task::DynflowTask.for_action(::Actions::Katello::Repository::Sync).
+      @latest_dynflow_sync ||= ForemanTasks::Task::DynflowTask.where(:label => [::Actions::Katello::Repository::Sync.name, ::Actions::Katello::Repository::ScheduledSync.name]).
                                 for_resource(self).order(:started_at).last
     end
 

data/app/models/katello/subscription.rb

@@ -22,7 +22,10 @@ module Katello
     end
 
     def redhat?
-      self.products.any? { |product| product.redhat? }
+      # for custom subscriptions, there is no separate marketing and engineering product
+      #   so query our Products table and check there
+      product = Katello::Product.where(:cp_id => self.product_id, :organization => self.organization).first
+      product.nil? || product.redhat?
     end
 
     def active?

data/app/models/katello/subscription_status.rb

@@ -1,5 +1,6 @@
 module Katello
   class SubscriptionStatus < HostStatus::Status
+    UNSUBSCRIBED_HYPERVISOR = 4
     UNKNOWN = 3
     INVALID = 2
     PARTIAL = 1
@@ -17,6 +18,8 @@ module Katello
         N_("Partially entitled")
       when INVALID
         N_("Unentitled")
+      when UNSUBSCRIBED_HYPERVISOR
+        N_("Unsubscribed hypervisor")
       else
         N_("Unknown subscription status")
       end
@@ -26,18 +29,17 @@ module Katello
       case status
       when INVALID
         ::HostStatus::Global::ERROR
-      when PARTIAL
-        ::HostStatus::Global::WARN
       when VALID
         ::HostStatus::Global::OK
-      when UNKNOWN
+      else
         ::HostStatus::Global::WARN
       end
     end
 
     def to_status(options = {})
       return UNKNOWN unless host.subscription_facet.try(:uuid)
-      status_override = options.fetch(:status_override, nil)
+      status_override = 'unsubscribed_hypervisor' if host.subscription_facet.hypervisor && host.subscription_facet.candlepin_consumer.entitlements.empty?
+      status_override ||= options.fetch(:status_override, nil)
       status = status_override || Katello::Candlepin::Consumer.new(host.subscription_facet.uuid, host.organization.label).entitlement_status
 
       case status
@@ -47,6 +49,8 @@ module Katello
         PARTIAL
       when Katello::Candlepin::Consumer::ENTITLEMENTS_INVALID
         INVALID
+      when 'unsubscribed_hypervisor'
+        UNSUBSCRIBED_HYPERVISOR
       else
         UNKNOWN
       end

data/app/presenters/katello/product_content_presenter.rb

@@ -1,11 +1,11 @@
 module Katello
-  class ProductContentPresenter
+  class ProductContentPresenter < SimpleDelegator
     attr_accessor :product_content, :overrides
-    delegate :content, :enabled, :product, :to => :product_content
 
     def initialize(product_content, overrides)
       @product_content = product_content
       @overrides = overrides
+      super(@product_content)
     end
 
     def override
@@ -20,5 +20,10 @@ module Katello
     def content_overrides
       overrides.select { |pc| pc.content_label == content.label }
     end
+
+    def legacy_content_override
+      override = @overrides.find { |pc| pc.content_label == content.label && pc.name == "enabled" }
+      override.nil? ? 'default' : override.value
+    end
   end
 end

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

@@ -116,34 +116,6 @@ module Katello
         end
       end
 
-      def products
-        pool_ids = self.entitlements.map { |entitlement| entitlement['pool']['id'] }
-        Katello::Product.joins(:subscriptions => :pools).where("#{Katello::Pool.table_name}.cp_id" => pool_ids).enabled.uniq
-      end
-
-      def all_products
-        ::Katello::Host::SubscriptionFacet.find_by_uuid(self.uuid).host.organization.products.enabled.uniq
-      end
-
-      def available_product_content(content_access_mode_all = false, content_access_mode_env = false)
-        if content_access_mode_env
-          host = ::Katello::Host::ContentFacet.find_by_uuid(self.uuid)
-          return [] unless host.lifecycle_environment_id && host.content_view_id
-          version = ContentViewVersion.in_environment(host.lifecycle_environment_id).where(:content_view_id => host.content_view_id).first
-          content_view_version_id = version.id
-        end
-        if content_access_mode_all
-          content = all_products.flat_map do |product|
-            product.available_content(content_view_version_id)
-          end
-        else
-          content = products.flat_map do |product|
-            product.available_content(content_view_version_id)
-          end
-        end
-        content.uniq
-      end
-
       def compliance_reasons
         Resources::Candlepin::Consumer.compliance(uuid)['reasons'].map do |reason|
           "#{reason['attributes']['name']}: #{reason['message']}"

data/app/services/katello/product_content_finder.rb

@@ -0,0 +1,37 @@
+module Katello
+  class ProductContentFinder
+    attr_accessor :match_environment, :match_subscription, :consumable
+
+    #consumable must implement:
+    #  content_view
+    #  lifecycle_environment
+    #  organization
+    #  products
+    def initialize(params = {})
+      self.match_subscription = false
+      self.match_environment = false
+
+      params.each_pair { |k, v| instance_variable_set("@#{k}", v) unless v.nil? }
+    end
+
+    def product_content
+      if match_environment
+        environment = consumable.lifecycle_environment
+        view = consumable.content_view
+        return [] unless environment && view
+        version = ContentViewVersion.in_environment(environment).where(:content_view_id => view).first
+      end
+
+      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
+
+      consumable.organization.enabled_product_content_for(repositories)
+    end
+
+    def presenter_with_overrides(overrides)
+      product_content.map { |pc| ProductContentPresenter.new(pc, overrides) }
+    end
+  end
+end

data/app/views/foreman/smart_proxies/_content_sync.html.erb

@@ -1,8 +1,6 @@
 <div>
   <h3><%= _('Content Sync') %></h3>
 
-  <div bst-alerts error-messages="syncErrorMessages"></div>
-
   {{ syncStatusText(syncState, syncStatus) }}
   <div ng-show="syncState.is(syncState.SYNCING, syncState.SYNC_TRIGGERED, syncState.CANCEL_TRIGGERED, syncState.FAILURE)">
     {{ syncTask.progressbar.value || 0 | number: 0 }}%

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

@@ -0,0 +1,34 @@
+extends 'katello/api/v2/common/org_reference'
+extends 'katello/api/v2/common/timestamps'
+
+attributes :id, :name, :description, :unlimited_hosts, :auto_attach
+
+attributes :content_view_id
+
+child :content_view => :content_view do
+  attributes :id, :name
+end
+
+child :environment => :environment do
+  attributes :name, :id
+end
+attributes :environment_id
+
+attributes :usage_count, :user_id, :max_hosts, :system_template_id, :release_version
+
+node :permissions do |activation_key|
+  {
+    :view_activation_keys => activation_key.readable?,
+    :edit_activation_keys => activation_key.editable?,
+    :destroy_activation_keys => activation_key.deletable?
+  }
+end
+
+child :products => :products do |_product|
+  attributes :id, :name
+end
+
+child :host_collections => :host_collections do
+  attributes :id
+  attributes :name
+end