katello 3.7.1 → 3.7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d88404b2afad190e4d14c345ac95118fbf2f8f44
-  data.tar.gz: 2f5cb4dfb3a91dd1733bc84866d303131ce96546
+  metadata.gz: 679620f4009df700650bbeb4bde990b172b24bf5
+  data.tar.gz: bc3615c44ab394145f07e94b1ff48798833fd1c2
 SHA512:
-  metadata.gz: af4305e274f7c50eff1aa319b28d0e9f5a678ac4a09436e1a6ad8fe629749e486758b19ff50b624f6283767717d717003e89bbc471e91fadc6674b7b1738c791
-  data.tar.gz: 23365d77760637b47a6f4ca0a5234702f254f979a464d5f115e778551553958f73e22e79ffa49a5ca19d0d0c9fe17767147ef716ba78a17e937c61c32ac31b6a
+  metadata.gz: ddc49c94143661c4b2e189b28d80eca383306cf3d02e522d4f86b28059d72c274f3b4ff847f96f3a52531534197a21547d3da052f53df929ac23d065e632cd32
+  data.tar.gz: 8d3bb8feb55d123355b9f4267d49513c06bf232b8eca55948a1c844891a8c76836f1b4ffa5955f1eebc86f537f3527ce6e126b608e73167acd40628d5dfcac0e

data/app/lib/actions/katello/host/hypervisors_update.rb

@@ -13,86 +13,37 @@ module Actions
         end
 
         def finalize
-          @hypervisors = input[:hypervisors]
-          return unless @hypervisors
+          hypervisors = input[:hypervisors]
 
-          User.as_anonymous_admin do
-            load_resources
-
-            @hosts.each do |uuid, host|
-              update_subscription_facet(uuid, host)
+          if hypervisors
+            User.as_anonymous_admin do
+              hypervisors.each { |hypervisor| update_or_create_hypervisor(hypervisor) }
             end
           end
         end
 
-        # Loads all resources needed for refreshing subscription facet
-        def load_resources
-          @organizations = ::Organization.where(label: hypervisors_field(:organization_label)).map { |org| [org.label, org] }.to_h
-          @hosts = {}
-
-          load_hosts_by_uuid
-          load_hosts_by_duplicate_name
-          create_missing_hosts
-
-          candlepin_data = ::Katello::Resources::Candlepin::Consumer.get(uuid: @hosts.keys)
-          @candlepin_attributes = candlepin_data.map { |consumer| [consumer[:uuid], consumer] }.to_h
-        end
-
-        def load_hosts_by_uuid
-          hosts_by_uuid = ::Host.eager_load(:subscription_facet).where(katello_subscription_facets: { uuid: hypervisors_field(:uuid) })
-          @hosts.merge(hosts_by_uuid.map { |host| [host.subscription_facet.uuid, host] }.to_h)
-        end
-
-        def load_hosts_by_duplicate_name
-          duplicate_names, duplicate_name_orgs = generate_duplicates_list
-
-          hosts_by_dup_name = ::Host.preload(:subscription_facet).where(name: duplicate_names.keys)
-
-          hosts_by_dup_name.each do |host|
-            validate_host_organization(host, duplicate_name_orgs[host.name].try(:id))
-          end
-
-          @hosts.merge!(hosts_by_dup_name.map { |host| [duplicate_names[host.name], host] }.to_h)
-        end
-
-        def create_missing_hosts
-          # remaining hypervisors
-          @hypervisors.each do |hypervisor|
-            next if @hosts.key?(hypervisor[:uuid])
-            duplicate_name, org = duplicate_name(hypervisor)
-            @hosts[hypervisor[:uuid]] = create_host_for_hypervisor(duplicate_name, org)
-          end
-        end
-
-        def generate_duplicates_list
-          duplicate_names = {}
-          duplicate_name_orgs = {}
-          @hypervisors.each do |hypervisor|
-            next if @hosts.key?(hypervisor[:uuid])
-
-            duplicate_name, org = duplicate_name(hypervisor)
-            duplicate_names[duplicate_name] = hypervisor[:uuid]
-            duplicate_name_orgs[duplicate_name] = org
-          end
+        def update_or_create_hypervisor(hypervisor_json)
+          organization = ::Organization.find_by(:label => hypervisor_json[:organization_label])
 
-          [duplicate_names, duplicate_name_orgs]
-        end
-
-        def validate_host_organization(host, organization)
-          if host.organization_id.nil? || host.organization_id != organization
+          # Since host names must be unique yet hypervisors may have unique subscription
+          # facets in different orgs
+          sanitized_name = ::Katello::Host::SubscriptionFacet.sanitize_name(hypervisor_json[:name])
+          duplicate_name = "virt-who-#{sanitized_name}-#{organization.id}"
+          host = ::Katello::Host::SubscriptionFacet.find_by(:uuid => hypervisor_json[:uuid]).try(:host)
+          host ||= ::Host.find_by(:name => duplicate_name)
+          if host && host.organization.try(:id) != organization.id
             fail _("Host '%{name}' does not belong to an organization") % {:name => host.name} unless host.organization
+            host = nil
           end
-        end
 
-        # extracts a single field from a given list og hypervisors data.
-        def hypervisors_field(field, hypervisors = @hypervisors)
-          hypervisors.map { |h| h[field] }.uniq
-        end
-
-        def duplicate_name(hypervisor)
-          organization = @organizations[hypervisor[:organization_label]]
-          sanitized_name = ::Katello::Host::SubscriptionFacet.sanitize_name(hypervisor[:name])
-          ["virt-who-#{sanitized_name}-#{organization.id}", organization]
+          host ||= create_host_for_hypervisor(duplicate_name, organization)
+          host.subscription_facet ||= ::Katello::Host::SubscriptionFacet.new
+          host.subscription_facet.host_id = host.id
+          host.subscription_facet.uuid = hypervisor_json[:uuid]
+          host.subscription_facet.import_database_attributes(host.subscription_facet.candlepin_consumer.consumer_attributes)
+          host.subscription_facet.save!
+          host.subscription_facet.update_subscription_status
+          host.save!
         end
 
         def create_host_for_hypervisor(name, organization, location = nil)
@@ -103,17 +54,6 @@ module Actions
           host
         end
 
-        def update_subscription_facet(uuid, host)
-          host.subscription_facet ||= host.build_subscription_facet(uuid: uuid)
-          if @candlepin_attributes.key?(uuid)
-            host.subscription_facet.candlepin_consumer.consumer_attributes = @candlepin_attributes[uuid]
-            host.subscription_facet.import_database_attributes
-            host.subscription_facet.save!
-            host.subscription_facet.update_subscription_status(@candlepin_attributes[uuid].try(:[], :entitlementStatus))
-          end
-          host.save!
-        end
-
         def rescue_strategy
           Dynflow::Action::Rescue::Skip
         end

data/app/models/katello/subscription_status.rb

@@ -38,7 +38,7 @@ module Katello
 
     def to_status(options = {})
       return UNKNOWN unless host.subscription_facet.try(:uuid)
-      status_override = 'unsubscribed_hypervisor' if host.subscription_facet.hypervisor && !host.subscription_facet.candlepin_consumer.entitlements?
+      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
 

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

@@ -120,14 +120,6 @@ module Katello
         self.class.friendly_compliance_reasons(Resources::Candlepin::Consumer.compliance(uuid)['reasons'])
       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/config/katello.yml

@@ -0,0 +1,59 @@
+#
+# WARNING: THIS CONFIGURATION WAS GENERATED BY KATELLO-CONFIGURE TOOL,
+# CHANGES WILL LIKELY BE OVERWRITTEN. IF YOU WISH TO PRESERVE ANY CHANGES
+# TO THIS FILE PLEASE EDIT /usr/share/katello/install/default-answer-file
+# FOR THE CORRESPONDING OPTION AND RERUN katello-configure.
+#
+
+# Katello configuration
+#
+# :vim:sw=2:ts=2:et:
+
+# see /usr/share/katello/config.katello_defaults.yml for available options
+
+:katello:
+  :force_manifest_import: true
+  :content_types:
+    :yum: true
+    :file: true
+    :deb: true
+    :puppet: true
+    :docker: true
+    :ostree: true
+
+  :rest_client_timeout: 120
+
+  :post_sync_url: https://robot.example.com/katello/api/v2/repositories/sync_complete?token=test
+
+  :candlepin:
+    :ca_cert_file: /etc/pki/katello/certs/katello-default-ca.crt
+    :url: https://robot.example.com:8443/candlepin
+    :oauth_key: katello
+    :oauth_secret: katello
+
+  :pulp:
+    :url: https://robot.example.com/pulp/api/v2/
+    :ca_cert_file: /etc/pki/katello/certs/katello-default-ca.crt
+    :oauth_key: katello
+    :oauth_secret: katello
+
+  :qpid:
+    :url: amqp:ssl:robot.example.com:5671
+    :subscriptions_queue_address: katello_event_queue
+
+  :loggers:
+    :glue:
+      :enabled: false
+    :pulp_rest:
+      :enabled: false
+    :cp_rest:
+      :enabled: false
+    :cp_proxy:
+      :enabled: false
+    :action:
+      :enabled: false
+    :tire_rest:
+      :enabled: false
+    :manifest_import_logger:
+      :enabled: false
+

data/lib/katello/version.rb

@@ -1,3 +1,3 @@
 module Katello
-  VERSION = "3.7.1".freeze
+  VERSION = "3.7.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: katello
 version: !ruby/object:Gem::Version
-  version: 3.7.1
+  version: 3.7.1.1
 platform: ruby
 authors:
 - N/A
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-01 00:00:00.000000000 Z
+date: 2018-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1341,6 +1341,7 @@ files:
 - config/initializers/rabl_init.rb
 - config/initializers/runcible.rb
 - config/katello.yaml.example
+- config/katello.yml
 - config/locales/README
 - config/locales/bn.yml
 - config/locales/compare_upstream.sh