foreman_rh_cloud 7.0.46 → 8.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1383b077fcadc72b19517f0ed1173aec5ac958a207e8b04a6119e91b75b062c0
-  data.tar.gz: 98783f069cfd8cbc89e2a295b0433437ec3d88b168ccef7c2b7c42b851d07929
+  metadata.gz: 8db662f6cd6809ba5dd5b183ec76330b4a1d4eb6db931136c8e34dcdf53c796c
+  data.tar.gz: e410219ca7fcbd0555d157f05123cc7c7618b29531157de42a3e3413d9d96eb4
 SHA512:
-  metadata.gz: 711977116c1b74dfd5b528bf7298df5f9c5da3dda6f63a788ed4ea8f82e76b62139d5d4417b4af19ca3e564e0764d99cc38ca30a496b1f78fd170829fef11017
-  data.tar.gz: 78f1a3584c4eea9f64d49cf4be866cd41074e04264c860d22332205124c312c62372cde26435e1e4bfe7303a7574754cbab3f49e3f1c3a31a6abe65c4363890c
+  metadata.gz: 601501b2ec41be00150bbc9797ad9fe7c93a92aea619ca1781ef3df88224e3f6fb04b2c16e2c2e974832ef67926794108d3c8f2c7654d52056e25a218887cd55
+  data.tar.gz: 6a7ca4b57eb655c5d4c3a880f0deac4af3f86c6a4b71ddd4ff02b7adc4aa9bf5c0cb2a70731f5472ce763b841a75f755835e0674d489c6b5d51759ee9d1c85f3

data/lib/foreman_inventory_upload/generators/tags.rb

@@ -45,11 +45,9 @@ module ForemanInventoryUpload
       end
 
       def content_data
-        [
-          ['lifecycle_environment', @host.lifecycle_environment&.name],
-          ['content_view', @host.content_view&.name],
-        ] +
-        (@host.activation_keys || []).map { |item| ['activation_key', item.name] }
+        (@host.lifecycle_environments.uniq || []).map { |item| ['lifecycle_environment', item.name] } +
+        (@host.activation_keys || []).map { |item| ['activation_key', item.name] } +
+        (@host.content_views || []).map { |item| ['content_view', item.name] }
       end
 
       def satellite_server_data

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '7.0.46'.freeze
+  VERSION = '8.0.46'.freeze
 end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "7.0.46",
+  "version": "8.0.46",
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {

data/test/controllers/insights_cloud/api/machine_telemetries_controller_test.rb

@@ -110,7 +110,7 @@ module InsightsCloud::Api
         User.current = User.find_by(login: 'secret_admin')
 
         @env = FactoryBot.create(:katello_k_t_environment)
-        cv = @env.content_views << FactoryBot.create(:katello_content_view, organization: @env.organization)
+        @env2 = FactoryBot.create(:katello_k_t_environment, organization: @env.organization)
 
         @host = FactoryBot.create(
           :host,
@@ -118,8 +118,16 @@ module InsightsCloud::Api
           :with_content,
           :with_hostgroup,
           :with_parameter,
-          content_view: cv.first,
-          lifecycle_environment: @env,
+          content_view_environments: [
+            FactoryBot.create(
+              :katello_content_view_environment,
+              content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
+              lifecycle_environment: @env),
+            FactoryBot.create(
+              :katello_content_view_environment,
+              content_view: FactoryBot.create(:katello_content_view, organization: @env.organization),
+              lifecycle_environment: @env2),
+          ],
           organization: @env.organization
         )
 

data/test/factories/inventory_upload_factories.rb

@@ -33,6 +33,13 @@ FactoryBot.define do
   end
 end
 
+FactoryBot.define do
+  factory :katello_content_view_environment, :class => Katello::ContentViewEnvironment do
+    sequence(:name) { |n| "name#{n}" }
+    sequence(:label) { |n| "label#{n}" }
+  end
+end
+
 FactoryBot.define do
   factory :katello_k_t_environment, :aliases => [:katello_environment], :class => Katello::KTEnvironment do
     sequence(:name) { |n| "Environment#{n}" }
@@ -93,6 +100,7 @@ FactoryBot.modify do
       content_view { nil }
       lifecycle_environment { nil }
       content_source { nil }
+      content_view_environments { [] }
     end
 
     trait :with_content do
@@ -100,9 +108,14 @@ FactoryBot.modify do
 
       after(:build) do |host, evaluator|
         if host.content_facet
-          host.content_facet.content_view = evaluator.content_view if evaluator.content_view
-          host.content_facet.lifecycle_environment = evaluator.lifecycle_environment if evaluator.lifecycle_environment
+          if evaluator.content_view && evaluator.lifecycle_environment
+            host.content_facet.assign_single_environment(
+              content_view_id: evaluator.content_view.id,
+              lifecycle_environment_id: evaluator.lifecycle_environment.id
+            )
+          end
           host.content_facet.content_source = evaluator.content_source if evaluator.content_source
+          host.content_facet.content_view_environments = evaluator.content_view_environments unless evaluator.content_view_environments.empty?
         end
       end
     end

data/test/test_plugin_helper.rb

@@ -8,6 +8,12 @@ FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories
 # FactoryBot.definition_file_paths << "#{Katello::Engine.root}/test/factories"
 FactoryBot.reload
 
+begin
+  require 'pry-rescue/minitest'
+rescue LoadError
+  # if the extension is not loaded - please continue, no harm done.
+end
+
 module FolderIsolation
   extend ActiveSupport::Concern
 

data/test/unit/slice_generator_test.rb

@@ -30,7 +30,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       subscription: FactoryBot.create(:katello_subscription, organization_id: env.organization.id)
     )
     @host.interfaces.first.identifier = 'test_nic1'
-    @host.save!
+    @host.interfaces.first.save!
 
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
@@ -300,6 +300,11 @@ class SliceGeneratorTest < ActiveSupport::TestCase
 
   test 'generates a report with satellite facts' do
     hostgroup = FactoryBot.create(:hostgroup, name: 'Special"name')
+    # Don't try to update CP in tests
+    Katello::Resources::Candlepin::Consumer.stubs(:update)
+    # Don't try update facts for the host
+    Katello::Host::SubscriptionFacet.stubs(:update_facts)
+
     @host.hostgroup = hostgroup
     @host.save!
 
@@ -326,7 +331,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     actual_host = actual['hosts'].first
     assert_tag('satellite-id', actual_host, 'satellite_instance_id')
     assert_tag(@host.organization_id.to_s, actual_host, 'organization_id')
-    assert_tag(@host.content_view.name, actual_host, 'content_view')
+    assert_tag(@host.content_views.first.name, actual_host, 'content_view')
     assert_tag(@host.location.name, actual_host, 'location')
     assert_tag(@host.organization.name, actual_host, 'organization')
     assert_tag(@host.hostgroup.name, actual_host, 'hostgroup')
@@ -348,13 +353,13 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: @host.content_view,
-      lifecycle_environment: @host.lifecycle_environment,
+      content_view: @host.content_views.first,
+      lifecycle_environment: @host.lifecycle_environments.first,
       organization: @host.organization
     )
 
     @host.subscription_facet.hypervisor_host = hypervisor_host
-    @host.save!
+    @host.subscription_facet.save!
 
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -497,8 +502,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: @host.content_view,
-      lifecycle_environment: @host.lifecycle_environment,
+      content_view: @host.content_views.first,
+      lifecycle_environment: @host.lifecycle_environments.first,
       organization: new_org
     )
 
@@ -644,8 +649,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       :host,
       :with_subscription,
       :with_content,
-      content_view: @host.content_view,
-      lifecycle_environment: @host.lifecycle_environment,
+      content_view: @host.content_views.first,
+      lifecycle_environment: @host.lifecycle_environments.first,
       organization: @host.organization,
       installed_packages: [installed_package]
     )

data/test/unit/tags_generator_test.rb

@@ -7,7 +7,7 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     User.current = User.find_by(login: 'secret_admin')
 
     env = FactoryBot.create(:katello_k_t_environment)
-    cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
+    env2 = FactoryBot.create(:katello_k_t_environment, organization: env.organization)
 
     @location1 = FactoryBot.create(:location)
     @location2 = FactoryBot.create(:location, parent: @location1)
@@ -20,15 +20,27 @@ class TagsGeneratorTest < ActiveSupport::TestCase
       :redhat,
       :with_subscription,
       :with_content,
-      content_view: cv.first,
-      lifecycle_environment: env,
       organization: env.organization,
       location: @location2,
-      hostgroup: @hostgroup2
+      hostgroup: @hostgroup2,
+      content_view_environments: [
+        FactoryBot.create(
+          :katello_content_view_environment,
+          content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
+          lifecycle_environment: env),
+        FactoryBot.create(
+          :katello_content_view_environment,
+          content_view: FactoryBot.create(:katello_content_view, organization: env.organization),
+          lifecycle_environment: env2),
+      ]
     )
 
     @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
     @host.interfaces.first.identifier = 'test_nic1'
+    # Don't try to update CP in tests
+    Katello::Resources::Candlepin::Consumer.stubs(:update)
+    # Don't try update facts for the host
+    Katello::Host::SubscriptionFacet.stubs(:update_facts)
     @host.save!
   end
 
@@ -46,8 +58,10 @@ class TagsGeneratorTest < ActiveSupport::TestCase
     assert_nil actual['host collection']
 
     assert_equal @host.organization.name, actual['organization'].first.last
-    assert_equal @host.lifecycle_environment.name, actual['lifecycle_environment'].first.last
-    assert_equal @host.content_view.name, actual['content_view'].first.last
+    assert_equal @host.lifecycle_environments.pluck(:name).min, actual['lifecycle_environment'].map(&:second).min
+    assert_equal @host.lifecycle_environments.pluck(:name).max, actual['lifecycle_environment'].map(&:second).max
+    assert_equal @host.content_views.pluck(:name).min, actual['content_view'].map(&:second).min
+    assert_equal @host.content_views.pluck(:name).max, actual['content_view'].map(&:second).max
     assert_equal Foreman.instance_id, actual['satellite_instance_id'].first.last
     assert_equal @host.organization_id.to_s, actual['organization_id'].first.last
   end
@@ -55,7 +69,7 @@ class TagsGeneratorTest < ActiveSupport::TestCase
   test 'filters tags with empty values' do
     generator = create_generator
 
-    @host.stubs(:content_view)
+    @host.stubs(:content_views).returns([])
 
     actual = generator.generate.group_by { |key, value| key }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 7.0.46
+  version: 8.0.46
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-12 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello