katello 3.1.0.1 → 3.2.0.rc1

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

@@ -19,8 +19,6 @@ module Katello
       validates :host, :presence => true, :allow_blank => false
       validates_with Validators::ContentViewEnvironmentValidator
 
-      attr_accessible :content_view_id, :lifecycle_environment_id, :host, :kickstart_repository_id
-
       def update_repositories_by_paths(paths)
         paths = paths.map { |path| path.gsub('/pulp/repos/', '') }
         repos = Repository.where(:relative_path => paths)
@@ -30,10 +28,12 @@ module Katello
           Rails.logger.warn("System #{self.host.name} (#{self.host.id}) requested binding to unknown repo #{repo_path}")
         end
 
-        self.bound_repositories = repos
-        self.save!
-        self.propagate_yum_repos
-        ForemanTasks.async_task(Actions::Katello::Host::GenerateApplicability, [self.host])
+        unless self.bound_repositories.sort == repos.sort
+          self.bound_repositories = repos
+          self.save!
+          self.propagate_yum_repos
+          ForemanTasks.async_task(Actions::Katello::Host::GenerateApplicability, [self.host])
+        end
         self.bound_repositories.pluck(:relative_path)
       end
 

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

@@ -9,10 +9,8 @@ module Katello
 
       validates :host, :presence => true, :allow_blank => false
 
-      DEFAULT_TYPE = Glue::Candlepin::Consumer::SYSTEM
+      DEFAULT_TYPE = 'system'.freeze
 
-      attr_accessible :release_version, :autoheal, :service_level, :host,
-                      :installed_products, :facts, :hypervisor_guest_uuids
       attr_accessor :installed_products, :facts, :hypervisor_guest_uuids
 
       def update_from_consumer_attributes(consumer_params)
@@ -91,11 +89,7 @@ module Katello
       end
 
       def remove_subscriptions(pools_with_quantities)
-        entitlements = pools_with_quantities.map do |pool_with_quantities|
-          candlepin_consumer.filter_entitlements(pool_with_quantities.pool.cp_id, pool_with_quantities.quantities)
-        end
-
-        ForemanTasks.sync_task(Actions::Katello::Host::RemoveSubscriptions, self.host, entitlements.flatten)
+        ForemanTasks.sync_task(Actions::Katello::Host::RemoveSubscriptions, self.host, pools_with_quantities)
       end
 
       def self.find_host(name, organization)
@@ -108,6 +102,10 @@ module Katello
         hosts.first
       end
 
+      def self.sanitize_name(name)
+        name.gsub('_', '-').chomp('.').downcase
+      end
+
       def candlepin_consumer
         @candlepin_consumer ||= Katello::Candlepin::Consumer.new(self.uuid)
       end

data/app/models/katello/kt_environment.rb

@@ -21,8 +21,6 @@ module Katello
                                           :association_foreign_key => :environment_id, :readonly => true
 
     has_many :repositories, :class_name => "Katello::Repository", dependent: :destroy, foreign_key: :environment_id
-    has_many :systems, :class_name => "Katello::System", :inverse_of => :environment,
-                       :dependent => :restrict_with_exception, :foreign_key => :environment_id
     has_many :content_view_environments, :class_name => "Katello::ContentViewEnvironment",
                                          :foreign_key => :environment_id, :inverse_of => :environment, :dependent => :restrict_with_exception
     has_many :content_view_puppet_environments, :class_name => "Katello::ContentViewPuppetEnvironment",
@@ -153,10 +151,10 @@ module Katello
         errors.add :base, _("Lifecycle Environment %s has a successor.  Only the last lifecycle environment on a path can be deleted") % self.name
       end
 
-      if systems.any?
+      if content_facets.any?
         errors.add(:base,
-           _("Lifecycle Environment %s has associated Content Hosts." \
-              " Please unregister or move the associated Content Hosts before trying to delete this lifecycle environment.") % self.name)
+           _("Lifecycle Environment %s has associated Hosts." \
+              " Please unregister or move the associated Hosts before trying to delete this lifecycle environment.") % self.name)
       end
 
       if activation_keys.any?

data/app/models/katello/package_group.rb

@@ -20,9 +20,7 @@ module Katello
     end
 
     def update_from_json(json)
-      keys = %w(name description)
-      custom_json = json.clone.delete_if { |key, _value| !keys.include?(key) }
-      self.update_attributes!(custom_json)
+      self.update_attributes!(json.slice('name', 'description'))
     end
 
     def self.list_by_filter_clauses(clauses)

data/app/models/katello/pool.rb

@@ -2,14 +2,15 @@ module Katello
   class Pool < Katello::Model
     include Katello::Authorization::Pool
 
-    attr_accessor :quantity_attached
-
     belongs_to :subscription, :inverse_of => :pools, :class_name => "Katello::Subscription"
 
     has_many :activation_keys, :through => :pool_activation_keys, :class_name => "Katello::ActivationKey"
     has_many :pool_activation_keys, :class_name => "Katello::PoolActivationKey", :dependent => :destroy, :inverse_of => :pool
 
     scope :in_org, -> (org_id) { joins(:subscription).where("#{Katello::Subscription.table_name}.organization_id = ?", org_id) }
+    scope :for_activation_key, ->(ak) {
+      where(cp_id: ak.get_key_pools.map { |pool| pool['id'] })
+    }
 
     self.include_root_in_json = false
 
@@ -63,6 +64,10 @@ module Katello
       self.subscription.products if self.subscription
     end
 
+    def host
+      Katello::Host::SubscriptionFacet.find_by_uuid(host_id).try(:host) if host_id
+    end
+
     private
 
     def default_sort

data/app/models/katello/pool_with_quantities.rb

@@ -7,5 +7,17 @@ module Katello
       @quantities = quantities
       @quantities = [@quantities] if !@quantities.nil? && !@quantities.is_a?(Array)
     end
+
+    def to_hash
+      {"pool_id" => pool.id, "quantities" => quantities.as_json}
+    end
+
+    def self.fetch(params)
+      if params.is_a?(PoolWithQuantities)
+        params
+      else
+        PoolWithQuantities.new(Pool.find(params["pool_id"]), params["quantities"])
+      end
+    end
   end
 end

data/app/models/katello/product.rb

@@ -148,6 +148,12 @@ module Katello
           where("#{Katello::Repository.table_name}.product_id" => self.id)
     end
 
+    def published_content_view_versions
+      Katello::ContentViewVersion.joins(:content_view).joins(:repositories).
+          where("#{Katello::ContentView.table_name}.default" => false).
+          where("#{Katello::Repository.table_name}.product_id" => self.id).order(:content_view_id)
+    end
+
     def anonymous?
       provider.anonymous_provider?
     end

data/app/models/katello/provider.rb

@@ -116,7 +116,7 @@ module Katello
                                                              :ssl_client_cert => OpenSSL::X509::Certificate.new(product.certificate),
                                                              :ssl_client_key => OpenSSL::PKey::RSA.new(product.key)).substitutor
             product.productContent.each do |pc|
-              if url_to_releases = pc.content.contentUrl[/^.*\$releasever/]
+              if (url_to_releases = pc.content.contentUrl[/^.*\$releasever/])
                 begin
                   cdn_var_substitutor.substitute_vars(url_to_releases).each do |(substitutions, _path)|
                     releases << Resources::CDN::Utils.parse_version(substitutions['releasever'])[:minor]

data/app/models/katello/puppet_module.rb

@@ -73,8 +73,7 @@ module Katello
     end
 
     def update_from_json(json)
-      keys = %w(name author title version summary)
-      custom_json = json.clone.delete_if { |key, _value| !keys.include?(key) }
+      custom_json = json.slice('name', 'author', 'title', 'version', 'summary')
       self.update_attributes!(custom_json)
     end
 

data/app/models/katello/repository.rb

@@ -43,6 +43,9 @@ module Katello
     has_many :repository_rpms, :class_name => "Katello::RepositoryRpm", :dependent => :delete_all
     has_many :rpms, :through => :repository_rpms
 
+    has_many :repository_files, :class_name => "Katello::RepositoryFile", :dependent => :destroy
+    has_many :files, :through => :repository_files
+
     has_many :repository_puppet_modules, :class_name => "Katello::RepositoryPuppetModule", :dependent => :delete_all
     has_many :puppet_modules, :through => :repository_puppet_modules
 
@@ -54,9 +57,6 @@ module Katello
     has_many :repository_ostree_branches, :class_name => "Katello::RepositoryOstreeBranch", :dependent => :delete_all
     has_many :ostree_branches, :through => :repository_ostree_branches
 
-    has_many :system_repositories, :class_name => "Katello::SystemRepository", :dependent => :destroy
-    has_many :systems, :through => :system_repositories
-
     has_many :content_facet_repositories, :class_name => "Katello::ContentFacetRepository", :dependent => :destroy
     has_many :content_facets, :through => :content_facet_repositories
 
@@ -549,6 +549,8 @@ module Katello
         self.puppet_modules -= units
       elsif ostree?
         self.ostree_branches -= units
+      elsif file?
+        self.files -= units
       elsif docker?
         remove_docker_content(units)
       end
@@ -586,6 +588,8 @@ module Katello
         self.puppet_modules
       elsif ostree?
         self.ostree_branches
+      elsif file?
+        self.files
       else
         fail "Content type not supported for removal"
       end

data/app/models/katello/repository_file.rb

@@ -0,0 +1,9 @@
+module Katello
+  class RepositoryFile < 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 :repository, :inverse_of => :repository_files, :class_name => 'Katello::Repository'
+    belongs_to :file, :inverse_of => :repository_files, :class_name => 'Katello::FileUnit', :foreign_key => :file_id
+  end
+end

data/app/models/katello/rpm.rb

@@ -39,7 +39,7 @@ module Katello
 
     def update_from_json(json)
       keys = Pulp::Rpm::PULP_INDEXED_FIELDS - ['_id']
-      custom_json = json.clone.delete_if { |key, _value| !keys.include?(key) }
+      custom_json = json.slice(*keys)
       if custom_json.any? { |name, value| self.send(name) != value }
         custom_json[:release_sortable] = Util::Package.sortable_version(custom_json[:release])
         custom_json[:version_sortable] = Util::Package.sortable_version(custom_json[:version])

data/app/models/katello/subscription_status.rb

@@ -49,7 +49,7 @@ module Katello
       end
     end
 
-    def relevant?
+    def relevant?(_options = {})
       host.subscription_facet.try(:uuid)
     end
   end

data/app/models/katello/sync_plan.rb

@@ -93,7 +93,8 @@ module Katello
           end
           next_sync = now.advance(:hours => hours, :minutes => minutes, :seconds => seconds)
         when WEEKLY
-          days = 7 + self.sync_date.wday - now.wday
+          days = self.sync_date.wday - now.wday
+          days += 7 if days <= 0
           next_sync = now.change(:hour => self.sync_date.hour, :min => self.sync_date.min,
                                  :sec => self.sync_date.sec).advance(:days => days)
         end

data/app/models/katello/task_status.rb

@@ -20,8 +20,6 @@ module Katello
     belongs_to :user, :inverse_of => :task_statuses, :class_name => "::User"
 
     belongs_to :task_owner, :polymorphic => true
-    # adding belongs_to :system allows us to perform joins with the owning system, if there is one
-    belongs_to :system, :foreign_key => :task_owner_id, :class_name => "Katello::System", :inverse_of => :task_statuses
 
     # needed to delete providers w/ task status
     has_one :provider, :class_name => "Katello::Provider", :dependent => :nullify
@@ -109,18 +107,6 @@ module Katello
       PulpTaskStatus.refresh(self)
     end
 
-    def as_json(_options = {})
-      json = super :methods => :pending?
-
-      if ('Katello::System' == task_owner_type)
-        methods = [:description, :result_description, :overall_status]
-        json.merge!(super(:only => methods, :methods => methods))
-        json[:system_name] = task_owner.name
-      end
-
-      json
-    end
-
     def human_readable_message
       task_template = TaskStatus::TYPES[self.task_type]
       return '' if task_template.nil?
@@ -131,12 +117,6 @@ module Katello
       end
     end
 
-    # used by search  to filter tasks by systems :)
-    def system_filter_clause
-      system_id = task_owner_id if (task_owner_type == 'Katello::System')
-      {:system_id => system_id}
-    end
-
     def pending_message
       # Retrieve a text message that may be rendered for a 'pending' task's status.  This is used in various places,
       # such as System Event history.
@@ -220,13 +200,13 @@ module Katello
 
     def humanize_parameters
       humanized_parameters = []
-      if packages = self.parameters[:packages]
+      if (packages = self.parameters[:packages])
         humanized_parameters.concat(packages)
       end
-      if groups = self.parameters[:groups]
+      if (groups = self.parameters[:groups])
         humanized_parameters.concat(groups.map { |g| g =~ /^@/ ? g : "@#{g}" })
       end
-      if errata = self.parameters[:errata_ids]
+      if (errata = self.parameters[:errata_ids])
         humanized_parameters.concat(errata)
       end
       humanized_parameters.join(", ")
@@ -308,19 +288,6 @@ module Katello
       end
     end
 
-    def self.make(system, pulp_task, task_type, parameters)
-      task_status = PulpTaskStatus.new(
-         :organization => system.organization,
-         :task_owner => system,
-         :task_type => task_type,
-         :parameters => parameters,
-         :systems => [system]
-      )
-      task_status.merge_pulp_task!(pulp_task)
-      task_status.save!
-      task_status
-    end
-
     protected
 
     def setup_task_type

data/app/models/setting/content.rb

@@ -1,4 +1,5 @@
 class Setting::Content < Setting
+  #rubocop:disable Metrics/MethodLength
   def self.load_defaults
     return unless super
 
@@ -22,11 +23,13 @@ class Setting::Content < Setting
         self.set('check_services_before_actions', N_("Whether or not to check the status of backend services such as pulp and candlepin prior to performing some actions."), true),
         self.set('force_post_sync_actions', N_("Force post sync actions such as indexing and email even if no content was available."), false),
         self.set('default_download_policy', N_("Default download policy for repositories (either 'immediate', 'on_demand', or 'background')"), "immediate"),
+        self.set('pulp_docker_registry_port', N_("The port used by Pulp Crane to provide Docker Registries"), 5000),
         self.set('pulp_export_destination', N_("On-disk location for exported repositories"), N_("/var/lib/pulp/katello-export")),
         self.set('pulp_client_key', N_("Path for ssl key used for pulp server auth"), "/etc/pki/katello/private/pulp-client.key"),
         self.set('pulp_client_cert', N_("Path for ssl cert used for pulp server auth"), "/etc/pki/katello/certs/pulp-client.crt"),
         self.set('remote_execution_by_default', N_("If set to true, use the remote execution over katello-agent for remote actions"), false),
-        self.set('use_pulp_oauth', N_("use oauth authentication for pulp instead of the default cert based authentication"), false)
+        self.set('use_pulp_oauth', N_("use oauth authentication for pulp instead of the default cert based authentication"), false),
+        self.set('unregister_delete_host', N_("When unregistering host via subscription-manager, also delete server-side host record"), false)
       ].each { |s| self.create! s.update(:category => "Setting::Content") }
     end
     true

data/app/overrides/add_activation_keys_input.rb

@@ -10,12 +10,12 @@ Deface::Override.new(:virtual_path => "hostgroups/_form",
 
 Deface::Override.new(:virtual_path => "hostgroups/_form",
                      :name => "hostgroups_update_environments_select",
-                     :replace => 'erb[loud]:contains("select_f"):contains(":environment_id")',
+                     :insert_before => 'erb[loud]:contains("hostgroup_puppet_environment_field")',
                      :partial => 'overrides/activation_keys/host_environment_select')
 
 Deface::Override.new(:virtual_path => "hosts/_form",
                      :name => "hosts_update_environments_select",
-                     :replace => 'erb[loud]:contains("select_f"):contains(":environment_id")',
+                     :insert_before => 'erb[loud]:contains("host_puppet_environment_field")',
                      :partial => 'overrides/activation_keys/host_environment_select')
 
 Deface::Override.new(:virtual_path => "common/os_selection/_operatingsystem",

data/app/presenters/katello/activation_key_subscriptions_presenter.rb

@@ -0,0 +1,10 @@
+module Katello
+  class ActivationKeySubscriptionsPresenter < SimpleDelegator
+    attr_reader :quantity_attached
+
+    def initialize(pool, key_pools)
+      @quantity_attached ||= key_pools.find { |sub| sub['id'] == pool.cp_id }.try(:[], :amount)
+      super(pool)
+    end
+  end
+end

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

@@ -90,13 +90,17 @@ module Katello
         filtered
       end
 
+      def pool_ids
+        entitlements.map { |ent| ent['pool']['id'].to_s }
+      end
+
       def virtual_guests
         guest_uuids = Resources::Candlepin::Consumer.virtual_guests(self.uuid).map { |guest| guest['uuid'] }
         ::Host.joins(:subscription_facet).where("#{Katello::Host::SubscriptionFacet.table_name}.uuid" => guest_uuids)
       end
 
       def virtual_host
-        if virtual_host_info = Resources::Candlepin::Consumer.virtual_host(self.uuid)
+        if (virtual_host_info = Resources::Candlepin::Consumer.virtual_host(self.uuid))
           ::Host.joins(:subscription_facet).where("#{Katello::Host::SubscriptionFacet.table_name}.uuid" => virtual_host_info[:uuid]).first
         end
       end

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

@@ -0,0 +1,13 @@
+module Katello
+  module Pulp
+    class FileUnit < PulpContentUnit
+      include LazyAccessor
+
+      PULP_SELECT_FIELDS = %w(name checksum).freeze
+      PULP_INDEXED_FIELDS = %w(name checksum _id).freeze
+      CONTENT_TYPE = "file".freeze
+
+      lazy_accessor :pulp_facts, :initializer => :backend_data
+    end
+  end
+end

data/app/views/dashboard/_errata_widget.html.erb

@@ -24,7 +24,7 @@
           <th class="" title="<%= erratum.errata_type %>"><%= erratum.errata_type %></th>
           <th>
             <a href="/errata/<%= erratum.uuid %>/info">
-              <%= erratum.errata_id %> (<%= hosts.length %> _('Hosts'))
+              <%= erratum.errata_id %> (<%= hosts.length %> <%= _('Hosts') %>)
             </a>
           </th>
         </tr>

data/app/views/dashboard/_subscription_widget.html.erb

@@ -18,20 +18,42 @@
   </thead>
   <tbody>
     <tr>
-      <td><i class="label label-danger" style="margin-right: 6px">&nbsp;</i><%= _("Invalid") %></td>
-      <td style="text-align:right"><%= invalid_consumer_count %></td>
+      <td>
+        <%= link_to('/content_hosts?search=subscription_status=invalid') do %>
+          <i class="label label-danger" style="margin-right: 6px">&nbsp;</i><%= _("Invalid") %>
+        <% end %>
+      </td>
+      <td style="text-align:right">
+        <%= link_to( "#{invalid_consumer_count}", '/content_hosts?search=subscription_status=invalid')%>
+      </td>
     </tr>
     <tr>
-      <td><i class="label label-warning" style="margin-right: 6px">&nbsp;</i><%= _("Partial") %></td>
-      <td style="text-align:right;"><%= partial_consumer_count %></td>
+      <td>
+        <%= link_to('/content_hosts?search=subscription_status=partial') do %>
+          <i class="label label-warning" style="margin-right: 6px">&nbsp;</i><%= _("Partial") %>
+        <% end %>
+      </td>
+      <td style="text-align:right">
+        <%= link_to( "#{partial_consumer_count}", '/content_hosts?search=subscription_status=partial')%>
+      </td>
     </tr>
     <tr>
-      <td><i class="label label-success" style="margin-right: 6px">&nbsp;</i><%= _("Valid") %></td>
-      <td style="text-align:right;"><%= valid_consumer_count %></td>
+      <td>
+        <%= link_to('/content_hosts?search=subscription_status=valid') do %>
+          <i class="label label-success" style="margin-right: 6px">&nbsp;</i><%= _("Valid") %>
+        <% end %>
+      </td>
+      <td style="text-align:right">
+        <%= link_to( "#{valid_consumer_count}", '/content_hosts?search=subscription_status=valid')%>
+      </td>
     </tr>
     <tr>
-      <td><h4><%= _("Total Content Hosts") %></h4></td>
-      <td style="text-align:right;"><%= total_count %></td>
+      <td><h4>
+          <%= link_to("Total Content Hosts", '/content_hosts')%>
+      </h4></td>
+      <td style="text-align:right;">
+        <%= link_to( "#{total_count}", '/content_hosts')%>
+      </td>
     </tr>
   </tbody>
 </table>