katello 3.12.0.rc1 → 3.12.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de90074d2a8e2705d398aa2eb12738fe464db7c9c2faf3290756ff5f65dca379
-  data.tar.gz: 366d93dcaea3017282c693fced4b10199af8722e5b12ec849bb45fdbfe272bd3
+  metadata.gz: d0a559345d7e312acbfda66d5aabecce6e5660d1b483939c8bcc7d5aa997c080
+  data.tar.gz: 877fa0b949c590d3264b4d9504a03572d6831d0debdd83f968320d39c3c13bde
 SHA512:
-  metadata.gz: 7ec11a64c64efdcfa27c3eb0cf5326e3fb6e7dd60bf82d394dea14b3c82da3ba2cbf3f642cd529cb1e041955b379a4aa9bb3ca469ea7986065a00a6f349529ce
-  data.tar.gz: 0cd6d05e64ba6ffc5f10dc3c34a7877dc9ca4128d5055605eef98bdecb2d7ecff818d75275d000d8e8d882b249d17b8ed0ab97beebc1cb26ed671f8d8ce2d820
+  metadata.gz: f4b0220844a897184e3c24a8e95216500842aa73388a5207cd396f02a91a0e08fb1fc2b4084eae2f1c3acbc4ccccafb626fc319c430d80d3243a1077cee29c99
+  data.tar.gz: 6f1187da5a113f91e04acb2c25334923bd2db31f97bc106bd8e5668fe8511def1ddf5acb827cc362603c1045f6393a2bd217917642d150af5fe7b78f305965f8

data/app/controllers/katello/concerns/hosts_controller_extensions.rb

@@ -48,9 +48,9 @@ module Katello
                          .preload(:subscription_facet, :host_statuses, :operatingsystem,
                                   :applicable_rpms, :lifecycle_environment, :content_view)
               csv_response(@hosts,
-                [:name, :subscription_status_label, 'applicable_errata.security.size',
-                 'applicable_errata.bugfix.size', 'applicable_errata.enhancement.size',
-                 'applicable_rpms.size', :operatingsystem, :lifecycle_environment, :content_view,
+                [:name, :subscription_status_label, 'content_facet.installable_security_errata_count',
+                 'content_facet.installable_bugfix_errata_count', 'content_facet.installable_enhancement_errata_count',
+                 'content_facet.upgradable_rpm_count', :operatingsystem, :lifecycle_environment, :content_view,
                  'subscription_facet.registered_at', 'subscription_facet.last_checkin'],
                 ['Name', 'Subscription Status', 'Installable Updates - Security',
                  'Installable Updates - Bug Fixes', 'Installable Updates - Enhancements',

data/app/lib/actions/katello/content_view/promote_to_environment.rb

@@ -43,6 +43,12 @@ module Actions
         end
 
         def finalize
+          # update errata applicability counts for all hosts in the CV & LE
+          ::Katello::Host::ContentFacet.where(:content_view_id => input[:content_view_id],
+                                              :lifecycle_environment_id => input[:environment_id]).each do |facet|
+            facet.update_applicability_counts
+          end
+
           history = ::Katello::ContentViewHistory.find(input[:history_id])
           history.status = ::Katello::ContentViewHistory::SUCCESSFUL
           history.save!

data/app/lib/actions/katello/content_view/publish.rb

@@ -107,6 +107,12 @@ module Actions
         end
 
         def finalize
+          # update errata applicability counts for all hosts in the CV & Library
+          ::Katello::Host::ContentFacet.where(:content_view_id => input[:content_view_id],
+                                              :lifecycle_environment_id => input[:environment_id]).each do |facet|
+            facet.update_applicability_counts
+          end
+
           history = ::Katello::ContentViewHistory.find(input[:history_id])
           history.status = ::Katello::ContentViewHistory::SUCCESSFUL
           history.save!

data/app/lib/katello/api/v2/error_handling.rb

@@ -21,6 +21,7 @@ module Katello
           rescue_from Errors::UnsupportedActionException, :with => :rescue_from_unsupported_action_exception
           rescue_from Errors::MaxHostsReachedException, :with => :rescue_from_max_hosts_reached_exception
           rescue_from Errors::CdnSubstitutionError, :with => :rescue_from_bad_data
+          rescue_from Errors::RegistrationError, :with => :rescue_from_bad_data
           rescue_from ActionController::ParameterMissing, :with => :rescue_from_missing_param
         end
 

data/app/lib/katello/concerns/base_template_scope_extensions.rb

@@ -41,14 +41,20 @@ module Katello
       # rubocop:disable Metrics/MethodLength
       def load_errata_applications(filter_errata_type: 'all', include_last_reboot: 'yes', since: nil, up_to: nil, status: nil)
         result = []
+
         search_up_to = up_to.present? ? "ended_at < \"#{up_to}\"" : nil
         search_since = since.present? ? "ended_at > \"#{since}\"" : nil
         search_result = status.present? ? "result = #{status}" : nil
-
         search = [search_up_to, search_since, search_result].compact.join(' and ')
 
+        if Katello.with_remote_execution?
+          condition = ["state != 'stoppped' AND (label = 'Actions::RemoteExecution::RunHostJob' AND templates.id = ?) OR label = 'Actions::Katello::Host::Erratum::Install'", RemoteExecutionFeature.feature('katello_errata_install').job_template_id]
+        else
+          condition = "state != 'stoppped' AND label = 'Actions::Katello::Host::Erratum::Install'"
+        end
+
         tasks = load_resource(klass: ForemanTasks::Task,
-                              where: ["state != 'stoppped' AND (label = 'Actions::RemoteExecution::RunHostJob' AND templates.id = ?) OR label = 'Actions::Katello::Host::Erratum::Install'", RemoteExecutionFeature.feature('katello_errata_install').job_template_id],
+                              where: condition,
                               permission: 'view_tasks',
                               joins: 'LEFT OUTER JOIN template_invocations ON foreman_tasks_tasks.id = template_invocations.run_host_job_task_id LEFT OUTER JOIN templates ON template_invocations.template_id = templates.id',
                               select: 'foreman_tasks_tasks.*,template_invocations.id AS template_invocation_id',

data/app/lib/katello/errors.rb

@@ -8,6 +8,8 @@ module Katello
 
     class NotFound < StandardError; end
 
+    class RegistrationError < StandardError; end
+
     # unauthorized access
     class SecurityViolation < StandardError; end
 

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

@@ -244,31 +244,30 @@ module Katello
 
       def self.find_host(facts, organization)
         host_name = propose_existing_hostname(facts)
+        host_uuid = facts['dmi.system.uuid']
         uuid_fact_id = RhsmFactName.find_by(name: 'dmi::system::uuid')&.id || -1
+
         hosts = ::Host.unscoped.distinct.left_outer_joins(:fact_values)
                 .where("#{::Host.table_name}.name = ? OR (#{FactValue.table_name}.fact_name_id = ?
-		AND #{FactValue.table_name}.value = ?)", host_name, uuid_fact_id, facts['dmi.system.uuid'])
+               AND #{FactValue.table_name}.value = ?)", host_name, uuid_fact_id, host_uuid)
+
+        return if hosts.empty?
 
-        return nil if hosts.empty?
+        hosts = hosts.where(organization_id: [organization.id, nil])
+        hosts_size = hosts.size
 
-        if hosts.where("organization_id = #{organization.id} OR organization_id is NULL").empty? #not in the correct org
+        if hosts_size == 0 # not in the correct org
           #TODO: http://projects.theforeman.org/issues/11532
-          fail _("Host with name %{host_name} is currently registered to a different org, please migrate host to %{org_name}.") %
+          fail Katello::Errors::RegistrationError, _("Host with name %{host_name} is currently registered to a different org, please migrate host to %{org_name}.") %
                    {:org_name => organization.name, :host_name => host_name }
         end
 
-        if hosts.size > 1
-          hostnames = hosts.pluck(:name).sort
-          fail _("Multiple profiles found. Consider removing %s which match this host.") % hostnames.join(', ')
-        end
-
-        # check for hosts that were matched by dmi.system.uuid but whose name didn't match
-        if hosts.where(name: host_name).empty?
-          fail _("The host %{existing} matches this registration. Remove or rename it to %{new_host} before registering.") %
-            {existing: hosts.pluck(:name).first, new_host: host_name}
+        if hosts_size == 1 && hosts.joins(:subscription_facet).empty?
+          return hosts.first
         end
 
-        hosts.first
+        hostnames = hosts.pluck(:name).sort.join(', ')
+        fail Katello::Errors::RegistrationError, _("Please unregister or remove hosts which match this host before registering: %{existing}") % {existing: hostnames}
       end
 
       def self.sanitize_name(name)

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.12.0.rc1".freeze
+  VERSION = "3.12.0.rc2".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.12.0.rc1
+  version: 3.12.0.rc2
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -4353,7 +4353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Content and Subscription Management plugin for Foreman