katello 2.2.2 → 2.4.0.rc1

data/app/models/katello/repository_docker_image.rb

@@ -1,16 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-
 module Katello
   class RepositoryDockerImage < Katello::Model
     self.include_root_in_json = false

data/app/models/katello/repository_erratum.rb

@@ -1,16 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-
 module Katello
   class RepositoryErratum < Katello::Model
     self.include_root_in_json = false

data/app/models/katello/repository_package_group.rb

@@ -0,0 +1,8 @@
+module Katello
+  class RepositoryPackageGroup < 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_package_groups, :class_name => 'Katello::Repository'
+    belongs_to :package_group, :inverse_of => :repository_package_groups, :class_name => 'Katello::PackageGroup'
+  end
+end

data/app/models/katello/repository_puppet_module.rb

@@ -0,0 +1,9 @@
+module Katello
+  class RepositoryPuppetModule < 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_puppet_modules, :class_name => 'Katello::Repository'
+    belongs_to :puppet_module, :inverse_of => :repository_puppet_modules, :class_name => 'Katello::PuppetModule'
+  end
+end

data/app/models/katello/repository_rpm.rb

@@ -0,0 +1,9 @@
+module Katello
+  class RepositoryRpm < 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_rpms, :class_name => 'Katello::Repository'
+    belongs_to :rpm, :inverse_of => :repository_rpms, :class_name => 'Katello::Rpm'
+  end
+end

data/app/models/katello/rpm.rb

@@ -0,0 +1,62 @@
+module Katello
+  class Rpm < Katello::Model
+    include Concerns::PulpDatabaseUnit
+
+    CONTENT_TYPE = Pulp::Rpm::CONTENT_TYPE
+
+    has_many :repositories, :through => :repository_rpms, :class_name => "Katello::Repository"
+    has_many :repository_rpms, :class_name => "Katello::RepositoryRpm", :dependent => :destroy, :inverse_of => :rpm
+
+    scoped_search :on => :name, :complete_value => true
+    scoped_search :on => :version, :complete_value => true
+    scoped_search :on => :release, :complete_value => true
+    scoped_search :on => :arch, :complete_value => true
+    scoped_search :on => :epoch, :complete_value => true
+    scoped_search :on => :filename, :complete_value => true
+    scoped_search :on => :sourcerpm, :complete_value => true
+    scoped_search :on => :checksum
+
+    before_save lambda { |rpm| rpm.summary = rpm.summary.truncate(255) unless rpm.summary.blank? }
+
+    def self.default_sort
+      order(:name).order(:epoch).order(:version_sortable).order(:release_sortable)
+    end
+
+    def self.repository_association_class
+      RepositoryRpm
+    end
+
+    def self.search_version_range(min = nil, max = nil)
+      query = scoped
+      query = Katello::Util::PackageFilter.new(query, min, Katello::Util::PackageFilter::GREATER_THAN).results if min
+      query = Katello::Util::PackageFilter.new(query, max, Katello::Util::PackageFilter::LESS_THAN).results if max
+      query
+    end
+
+    def self.search_version_equal(version)
+      Katello::Util::PackageFilter.new(self, version, Katello::Util::PackageFilter::EQUAL).results
+    end
+
+    def update_from_json(json)
+      keys = Pulp::Rpm::PULP_INDEXED_FIELDS - ['_id']
+      custom_json = json.clone.delete_if { |key, _value| !keys.include?(key) }
+      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])
+        self.update_attributes!(custom_json)
+      end
+    end
+
+    def self.total_for_repositories(repos)
+      self.in_repositories(repos).uniq.count
+    end
+
+    def nvrea
+      Util::Package.build_nvrea(self.as_json.with_indifferent_access, false)
+    end
+
+    def nvra
+      Util::Package.build_nvra(self.as_json.with_indifferent_access)
+    end
+  end
+end

data/app/models/katello/subscription.rb

@@ -0,0 +1,17 @@
+module Katello
+  class Subscription < Katello::Model
+    include Glue::Candlepin::CandlepinObject
+    include Glue::Candlepin::Subscription
+    include Katello::Authorization::Subscription
+    has_many :products, :through => :subscription_products, :class_name => "Katello::Product"
+    has_many :subscription_products, :class_name => "Katello::SubscriptionProduct", :dependent => :destroy, :inverse_of => :subscription
+
+    has_many :pools, :class_name => "Katello::Pool", :inverse_of => :subscription, :dependent => :destroy
+
+    belongs_to :organization, :class_name => "Organization", :inverse_of => :subscriptions
+
+    def redhat?
+      self.products.any? { |product| product.redhat? }
+    end
+  end
+end

data/app/models/katello/subscription_product.rb

@@ -0,0 +1,7 @@
+module Katello
+  class SubscriptionProduct < Katello::Model
+    self.include_root_in_json = false
+    belongs_to :product, :inverse_of => :subscription_products, :class_name => 'Katello::Product'
+    belongs_to :subscription, :inverse_of => :subscription_products, :class_name => 'Katello::Subscription'
+  end
+end

data/app/models/katello/sync_plan.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 require 'time'
 
 module Katello

data/app/models/katello/system.rb

@@ -1,16 +1,3 @@
-
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   class System < Katello::Model
     DEFAULT_CP_TYPE = Glue::Candlepin::Consumer::SYSTEM
@@ -23,10 +10,10 @@ module Katello
                  :as_json_hook
 
     include ForemanTasks::Concerns::ActionSubject
-    include Glue::Candlepin::Consumer if Katello.config.use_cp
-    include Glue::Pulp::Consumer if Katello.config.use_pulp
-    include Glue if Katello.config.use_cp || Katello.config.use_pulp
-    include Glue::ElasticSearch::System if Katello.config.use_elasticsearch
+    include Glue::Candlepin::Consumer if SETTINGS[:katello][:use_cp]
+    include Glue::Pulp::Consumer if SETTINGS[:katello][:use_pulp]
+    include Glue if SETTINGS[:katello][:use_cp] || SETTINGS[:katello][:use_pulp]
+    include Glue::ElasticSearch::System if SETTINGS[:katello][:use_elasticsearch]
     include Authorization::System
 
     audited :on => [:create], :allow_mass_assignment => true
@@ -58,7 +45,6 @@ module Katello
                                 :after_add    => :add_host_collection,
                                 :after_remove => :remove_host_collection
 
-    has_many :custom_info, :class_name => "Katello::CustomInfo", :as => :informable, :dependent => :destroy
     has_many :audits, :class_name => "::Audit", :as => :auditable, :dependent => :destroy
 
     belongs_to :content_view, :inverse_of => :systems
@@ -79,13 +65,12 @@ module Katello
     validates_with Validators::KatelloNameFormatValidator, :attributes => :name
 
     before_create :fill_defaults
-    after_create :init_default_custom_info
 
     before_update :update_foreman_host, :if => proc { |r| r.environment_id_changed? || r.content_view_id_changed? }
 
-    scope :in_environment, lambda { |env| where('environment_id = ?', env) unless env.nil? }
-    scope :completer_scope, lambda { |options| readable(options[:organization_id]) }
-    scope :by_uuids, lambda { |uuids| where(:uuid => uuids) }
+    scope :in_environment, ->(env) { where('environment_id = ?', env) unless env.nil? }
+    scope :completer_scope, ->(options) { readable(options[:organization_id]) }
+    scope :by_uuids, ->(uuids) { where(:uuid => uuids) }
 
     scoped_search :on => :name, :complete_value => true
     scoped_search :in => :environment, :on => :organization_id, :complete_value => true, :rename => :organization_id
@@ -94,6 +79,10 @@ module Katello
       where(:environment_id => organization.kt_environments.pluck(:id))
     end
 
+    def self.in_organizations(organizations)
+      where(:environment_id => organizations.collect { |org| org.kt_environments.pluck(:id) })
+    end
+
     def self.in_content_view_version_environments(version_environments)
       #takes a structure of [{:content_view_version => ContentViewVersion, :environments => [KTEnvironment]}]
       queries = version_environments.map do |version_environment|
@@ -121,8 +110,12 @@ module Katello
     end
 
     def self.with_installable_errata(errata)
+      non_installable = System.with_non_installable_errata(errata)
       subquery = Katello::Erratum.select("#{Katello::Erratum.table_name}.id").installable_for_systems.where("#{Katello::SystemRepository.table_name}.system_id = #{System.table_name}.id")
-      self.joins(:applicable_errata).where("#{Katello::Erratum.table_name}.id" => errata).where("#{Katello::Erratum.table_name}.id" => subquery).uniq
+
+      query = self.joins(:applicable_errata).where("#{Katello::Erratum.table_name}.id" => errata).where("#{Katello::Erratum.table_name}.id" => subquery)
+      query = query.where("katello_systems.id not in (?)", non_installable) unless non_installable.empty?
+      query.uniq
     end
 
     def add_host_collection(host_collection)
@@ -211,7 +204,7 @@ module Katello
       if no_overlap
         pools = pools.select do |pool|
           pool['providedProducts'].all? do |provided_product|
-            self.consumed_entitlements.all? do |consumed_entitlement|
+            self.entitlements.all? do |consumed_entitlement|
               consumed_entitlement.providedProducts.all? do |consumed_product|
                 consumed_product.cp_id != provided_product['productId']
               end
@@ -317,12 +310,6 @@ module Katello
       end
     end
 
-    def init_default_custom_info
-      self.organization.default_info_hash["system"].each do |k|
-        self.custom_info.create!(:keyname => k)
-      end
-    end
-
     def refresh_tasks
       refresh_running_tasks
       import_candlepin_tasks
@@ -361,8 +348,46 @@ module Katello
       super.merge(uuid => uuid)
     end
 
+    def import_applicability(partial = true)
+      consumer = self
+      ::Katello::Util::Support.active_record_retry do
+        ActiveRecord::Base.transaction do
+          errata_uuids = pulp_errata_uuids
+          if partial
+            consumer_uuids = consumer.applicable_errata.pluck("#{Erratum.table_name}.uuid")
+            to_remove = consumer_uuids - errata_uuids
+            to_add = errata_uuids - consumer_uuids
+          else
+            to_add = errata_uuids
+            to_remove = nil
+            Katello::SystemErratum.where(:system_id => self.id).delete_all
+          end
+          insert_errata_applicability(to_add) unless to_add.blank?
+          remove_errata_applicability(to_remove) unless to_remove.blank?
+        end
+      end
+    end
+
+    def available_content
+      self.products.flat_map(&:available_content)
+    end
+
     private
 
+    def insert_errata_applicability(uuids)
+      applicable_errata_ids = ::Katello::Erratum.where(:uuid => uuids).pluck(:id)
+      unless applicable_errata_ids.empty?
+        inserts = applicable_errata_ids.map { |erratum_id| "(#{erratum_id.to_i}, #{id.to_i})" }
+        sql = "INSERT INTO katello_system_errata (erratum_id, system_id) VALUES #{inserts.join(', ')}"
+        ActiveRecord::Base.connection.execute(sql)
+      end
+    end
+
+    def remove_errata_applicability(uuids)
+      applicable_errata_ids = ::Katello::Erratum.where(:uuid => uuids).pluck(:id)
+      Katello::SystemErratum.where(:system_id => self.id, :erratum_id => applicable_errata_ids).delete_all
+    end
+
     def update_foreman_host
       if foreman_host && foreman_host.lifecycle_environment && foreman_host.content_view
         new_puppet_env = self.content_view.puppet_env(self.environment).try(:puppet_environment)
@@ -405,12 +430,6 @@ module Katello
       self.installedProducts ? self.installedProducts.map { |p| p[:productName] } : []
     end
 
-    def collect_custom_info
-      hash = {}
-      self.custom_info.each { |c| hash[c.keyname] = c.value } if self.custom_info
-      hash
-    end
-
     def self.humanize_class_name(_name = nil)
       _('Content Host')
     end

data/app/models/katello/system_activation_key.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   class SystemActivationKey < Katello::Model
     self.include_root_in_json = false

data/app/models/katello/system_erratum.rb

@@ -1,16 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-
 module Katello
   class SystemErratum < Katello::Model
     self.include_root_in_json = false

data/app/models/katello/system_host_collection.rb

@@ -1,16 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-
 module Katello
   class SystemHostCollection < Katello::Model
     self.include_root_in_json = false

data/app/models/katello/system_repository.rb

@@ -1,16 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-#
-
 module Katello
   class SystemRepository < Katello::Model
     self.include_root_in_json = false

data/app/models/katello/task_status.rb

@@ -1,15 +1,3 @@
-#
-# Copyright 2014 Red Hat, Inc.
-#
-# This software is licensed to you under the GNU General Public
-# License as published by the Free Software Foundation; either version
-# 2 of the License (GPLv2) or (at your option) any later version.
-# There is NO WARRANTY for this software, express or implied,
-# including the implied warranties of MERCHANTABILITY,
-# NON-INFRINGEMENT, or FITNESS FOR A PARTICULAR PURPOSE. You should
-# have received a copy of GPLv2 along with this software; if not, see
-# http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
-
 module Katello
   class TaskStatus < Katello::Model
     self.include_root_in_json = false
@@ -28,7 +16,7 @@ module Katello
       TIMED_OUT = :timed_out
     end
 
-    include Glue::ElasticSearch::TaskStatus if Katello.config.use_elasticsearch
+    include Glue::ElasticSearch::TaskStatus if SETTINGS[:katello][:use_elasticsearch]
 
     belongs_to :organization, :inverse_of => :task_statuses, :class_name => "Organization"
     belongs_to :user, :inverse_of => :task_statuses, :class_name => "::User"

data/app/models/setting/katello.rb

@@ -13,7 +13,8 @@ class Setting::Katello < Setting
         self.set('content_action_accept_timeout', N_("Time in seconds to wait for a Host to pickup a remote action"), 20),
         self.set('content_action_finish_timeout', N_("Time in seconds to wait for a Host to finish a remote action"), 3600),
         self.set('pulp_sync_node_action_accept_timeout', N_("Time in seconds to wait for a pulp node to remote action"), 20),
-        self.set('pulp_sync_node_action_finish_timeout', N_("Time in seconds to wait for a pulp node to finish sync"), 12.hours.to_i)
+        self.set('pulp_sync_node_action_finish_timeout', N_("Time in seconds to wait for a pulp node to finish sync"), 12.hours.to_i),
+        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)
       ].each { |s| self.create! s.update(:category => "Setting::Katello") }
     end
     true

data/app/overrides/add_activation_keys_input.rb

@@ -1,19 +1,19 @@
 Deface::Override.new(:virtual_path => "hostgroups/_form",
                      :name => "add_activation_keys_tab",
-                     :insert_after => 'ul.nav > code[erb-silent]:contains("show_organization_tab?") ~ code[erb-silent]:contains("end")',
+                     :insert_after => 'ul.nav > erb[silent]:contains("show_organization_tab?") ~ erb[silent]:contains("end")',
                      :partial => '../overrides/foreman/activation_keys/host_tab')
 
 Deface::Override.new(:virtual_path => "hostgroups/_form",
                      :name => "add_activation_keys_tab_pane",
-                     :insert_after => 'code[erb-loud]:contains("render"):contains("taxonomies/loc_org_tabs")',
+                     :insert_after => 'erb[loud]:contains("render"):contains("taxonomies/loc_org_tabs")',
                      :partial => '../overrides/foreman/activation_keys/host_tab_pane')
 
 Deface::Override.new(:virtual_path => "hostgroups/_form",
                      :name => "hostgroups_update_environments_select",
-                     :replace => 'code[erb-loud]:contains("select_f"):contains(":environment_id")',
+                     :replace => 'erb[loud]:contains("select_f"):contains(":environment_id")',
                      :partial => '../overrides/foreman/activation_keys/host_environment_select')
 
 Deface::Override.new(:virtual_path => "hosts/_form",
                      :name => "hosts_update_environments_select",
-                     :replace => 'code[erb-loud]:contains("select_f"):contains(":environment_id")',
+                     :replace => 'erb[loud]:contains("select_f"):contains(":environment_id")',
                      :partial => '../overrides/foreman/activation_keys/host_environment_select')