foreman_rh_cloud 7.0.48 → 8.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6230453f17922c1abfb42067a23893ddce8d7951daec3a9ed575222896af39f
-  data.tar.gz: 4bd74461b9141c4b8b0440b1476567dce3321c86265107baefc2443b816d4100
+  metadata.gz: 8db662f6cd6809ba5dd5b183ec76330b4a1d4eb6db931136c8e34dcdf53c796c
+  data.tar.gz: e410219ca7fcbd0555d157f05123cc7c7618b29531157de42a3e3413d9d96eb4
 SHA512:
-  metadata.gz: c788d3f66902d5f016cd453b529c4fcb2c62a937946289c4a0b11acccc51737526cfa3c8525bdcb163bfb89c90d1a05b3c47f81dfd4a3ee49cd7fc42d6e5a74d
-  data.tar.gz: f0ed65721bce3577344404649db99c21a56b153bd3e5bc2dc484c0e0029875b39a16ed4ab46dab508e34faca28678a3fd0f0634913d824be1bb04934b4fe098c
+  metadata.gz: 601501b2ec41be00150bbc9797ad9fe7c93a92aea619ca1781ef3df88224e3f6fb04b2c16e2c2e974832ef67926794108d3c8f2c7654d52056e25a218887cd55
+  data.tar.gz: 6a7ca4b57eb655c5d4c3a880f0deac4af3f86c6a4b71ddd4ff02b7adc4aa9bf5c0cb2a70731f5472ce763b841a75f755835e0674d489c6b5d51759ee9d1c85f3

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -113,7 +113,7 @@ module ForemanInventoryUpload
         bash_hostname = `uname -n`.chomp
         foreman_hostname = ForemanRhCloud.foreman_host&.name
         if bash_hostname == foreman_hostname
-          fqdn(ForemanRhCloud.foreman_host)
+          fqdn(foreman_hostname)
         elsif Setting[:obfuscate_inventory_hostnames]
           obfuscate_fqdn(bash_hostname)
         else

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.48'.freeze
+  VERSION = '8.0.46'.freeze
 end

data/lib/insights_cloud/async/connector_playbook_execution_reporter_task.rb

@@ -43,17 +43,7 @@ module InsightsCloud
       end
 
       def done?(current_status = invocation_status)
-        ActiveModel::Type::Boolean.new.cast(current_status[:task_state][:task_done_reported])
-      end
-
-      def job_finished?
-        job_invocation.finished?
-      end
-
-      def all_hosts_finished?(current_status)
-        current_status[:hosts_state].values.all? do |status|
-          ActiveModel::Type::Boolean.new.cast(status['report_done'] == true)
-        end
+        job_invocation.finished? || current_status.map { |_host_id, task_status| task_status['report_done'] }.all?
       end
 
       # noop, we don't want to do anything when the polling task starts
@@ -105,11 +95,7 @@ module InsightsCloud
       end
 
       def host_status(host)
-        external_task&.dig('invocation_status', :hosts_state, host)
-      end
-
-      def task_done_state
-        ActiveModel::Type::Boolean.new.cast(external_task&.dig('invocation_status', :task_state, :task_done_reported))
+        external_task&.dig('invocation_status', host)
       end
 
       def sequence(host)
@@ -125,15 +111,13 @@ module InsightsCloud
       end
 
       def invocation_status
-        hosts_state = Hash[job_invocation.targeting.hosts.map do |host|
+        Hash[job_invocation.targeting.hosts.map do |host|
           next unless host.insights&.uuid
           [
             host.insights.uuid,
             task_status(job_invocation.sub_task_for_host(host), host.insights.uuid),
           ]
         end.compact]
-
-        {task_state: {task_done_reported: task_done_state}, hosts_state: hosts_state}
       end
 
       def task_status(host_task, host_name)
@@ -144,7 +128,7 @@ module InsightsCloud
         {
           'state' => host_task.state,
           'output' => host_task.main_action.live_output.map { |line| line['output'] }.join("\n"),
-          'exit_status' => ActiveModel::Type::Integer.new.cast(host_task.main_action.exit_status),
+          'exit_status' => host_task.main_action.exit_status,
           'sequence' => sequence(host_name),
           'report_done' => host_done?(host_name),
         }
@@ -154,9 +138,9 @@ module InsightsCloud
         generator = InsightsCloud::Generators::PlaybookProgressGenerator.new(correlation_id)
         all_hosts_success = true
 
-        invocation_status[:hosts_state].each do |host_name, status|
+        invocation_status.each do |host_name, status|
           # skip host if the host already reported that it's finished
-          next if ActiveModel::Type::Boolean.new.cast(status['report_done'])
+          next if status['report_done']
 
           unless status['state'] == 'unknown'
             sequence = status['sequence']
@@ -170,11 +154,7 @@ module InsightsCloud
             all_hosts_success &&= status['exit_status'] == 0
           end
         end
-
-        if (job_finished? || all_hosts_finished?(invocation_status))
-          generator.job_finished_message(all_hosts_success)
-          invocation_status[:task_state][:task_done_reported] = true
-        end
+        generator.job_finished_message(all_hosts_success) if done?(invocation_status)
 
         send_report(generator.generate)
       end

data/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "7.0.48",
+  "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/jobs/connector_playbook_execution_reporter_task_test.rb

@@ -29,11 +29,7 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
   end
 
   test 'It reports finish playbook messages' do
-    host1_task = @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)
-    host1_task.state = 'stopped'
-    host1_task.save!
-
-    TestConnectorPlaybookExecutionReporterTask.any_instance.stubs(:job_finished?).returns(true)
+    TestConnectorPlaybookExecutionReporterTask.any_instance.stubs(:done?).returns(true)
 
     actual = ForemanTasks.sync_task(TestConnectorPlaybookExecutionReporterTask, @job_invocation)
 
@@ -43,13 +39,6 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
     assert_not_nil actual_report
     actual_jsonl = read_jsonl(actual_report)
 
-    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
-    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
-    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID2']['exit_status']
-
-    assert_equal true, @job_invocation.finished?
-    assert_equal 'stopped', @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)['state']
-
     assert_not_nil actual_report_finished = actual_jsonl.find { |l| l['type'] == 'playbook_run_completed' }
     assert_equal 'TEST_CORRELATION', actual_report_finished['correlation_id']
     assert_equal 'success', actual_report_finished['status']
@@ -60,127 +49,57 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
   end
 
   test 'It reports single progress message for done host' do
-    class ArrangeTestHost < InsightsCloud::Async::ConnectorPlaybookExecutionReporterTask
-      def send_report(report)
-        host1_task = @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)
-        host1_task.state = 'stopped'
-        host1_task.save!
-
-        output[:saved_reports] = (output[:saved_reports] || []) << report
-      end
-    end
-
-    ArrangeTestHost.instance_variable_set(:@connector_feature_id, nil)
-    host1_task = @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)
-    host1_task.state = 'running'
-    host1_task.save!
-
-    ArrangeTestHost.any_instance.stubs(:job_finished?).returns(false, true)
+    TestConnectorPlaybookExecutionReporterTask.any_instance.stubs(:done?).returns(false, true)
 
-    actual = ForemanTasks.sync_task(ArrangeTestHost, @job_invocation)
-
-    actual_report1 = actual.output[:saved_reports].first.to_s
-    actual_report2 = actual.output[:saved_reports].second.to_s
-
-    assert_equal 2, actual.output[:saved_reports].size
-    assert_not_nil actual_report1
-    assert_not_nil actual_report2
-
-    actual_json1 = read_jsonl(actual_report1)
-    actual_json2 = read_jsonl(actual_report2)
-
-    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
-    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
-
-    assert_equal 'stopped', @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)['state']
-
-    assert_not_nil actual_report_updated = actual_json1.find { |l| l['type'] == 'playbook_run_update' && l['host'] == 'TEST_UUID1' }
-    assert_equal 'TEST_CORRELATION', actual_report_updated['correlation_id']
-    assert_equal 'TEST_UUID1', actual_report_updated['host']
-    assert_equal 0, actual_report_updated['sequence']
-    assert_equal 6, actual_report_updated.size
+    actual = ForemanTasks.sync_task(TestConnectorPlaybookExecutionReporterTask, @job_invocation)
 
-    assert_not_nil actual_report_updated = actual_json2.find { |l| l['type'] == 'playbook_run_update' && l['host'] == 'TEST_UUID1' }
-    assert_equal 'TEST_CORRELATION', actual_report_updated['correlation_id']
-    assert_equal 'TEST_UUID1', actual_report_updated['host']
-    assert_equal 1, actual_report_updated['sequence']
-    assert_equal 6, actual_report_updated.size
+    actual_report = actual.output[:saved_reports].first.to_s
 
-    assert_not_nil actual_host_finished = actual_json2.find { |l| l['type'] == 'playbook_run_finished' && l['host'] == 'TEST_UUID1' }
-    assert_equal 'TEST_CORRELATION', actual_host_finished['correlation_id']
-    assert_equal 'TEST_UUID1', actual_host_finished['host']
-    assert_equal 'success', actual_host_finished['status']
-    assert_equal 7, actual_host_finished.size
+    assert_equal 1, actual.output[:saved_reports].size
+    assert_not_nil actual_report
+    actual_jsonl = read_jsonl(actual_report)
 
-    assert_not_nil actual_report_finished = actual_json2.find { |l| l['type'] == 'playbook_run_completed' }
-    assert_equal 'TEST_CORRELATION', actual_report_finished['correlation_id']
-    assert_equal 'success', actual_report_finished['status']
-    assert_equal 4, actual_report_finished.size
+    actual_host_updates = actual_jsonl
+      .select { |l| l['type'] == 'playbook_run_update' && l['host'] == @host1.insights.uuid }
+    assert_equal 1, actual_host_updates.size
+    assert_equal 0, actual_host_updates.first['sequence']
   end
 
   test 'It reports two progress messages for in progress host' do
-    class ArrangeTestHostTwo < InsightsCloud::Async::ConnectorPlaybookExecutionReporterTask
-      def send_report(report)
-        iteration_number = output[:iteration_number].to_i
-
-        if iteration_number == 1
-          host1_task = job_invocation.sub_task_for_host(Host.where(name: 'host1').first)
-          host1_task.state = 'stopped'
-          host1_task.save!
-        end
-
-        output[:iteration_number] = iteration_number + 1
-        output[:saved_reports] = (output[:saved_reports] || []) << report
-      end
-    end
+    TestConnectorPlaybookExecutionReporterTask.any_instance.stubs(:done?).returns(false, false, true)
 
-    ArrangeTestHostTwo.instance_variable_set(:@connector_feature_id, nil)
-    host1_task = @job_invocation.sub_task_for_host(Host.where(name: 'host1').first)
+    host1_task = @job_invocation.template_invocations.joins(:host).where(hosts: {name: @host1.name}).first.run_host_job_task
     host1_task.state = 'running'
     host1_task.save!
 
-    ArrangeTestHostTwo.any_instance.stubs(:job_finished?).returns(false, false, true)
-
-    actual = ForemanTasks.sync_task(ArrangeTestHostTwo, @job_invocation)
-
-    actual_report1 = actual.output[:saved_reports].first.to_s
-    actual_report2 = actual.output[:saved_reports].second.to_s
-    actual_report3 = actual.output[:saved_reports].third.to_s
+    actual = ForemanTasks.sync_task(TestConnectorPlaybookExecutionReporterTask, @job_invocation)
 
-    assert_equal 3, actual.output[:saved_reports].size
-    assert_not_nil actual_report1
-    assert_not_nil actual_report2
-    assert_not_nil actual_report3
+    assert_equal 2, actual.output[:saved_reports].size
 
-    actual_json1 = read_jsonl(actual_report1)
-    actual_json2 = read_jsonl(actual_report2)
-    actual_json3 = read_jsonl(actual_report3)
+    first_report = actual.output[:saved_reports].first.to_s
+    actual_jsonl = read_jsonl(first_report)
 
-    assert_equal true, actual.output['task']['invocation_status']['task_state']['task_done_reported']
-    assert_equal 0, actual.output['task']['invocation_status']['hosts_state']['TEST_UUID1']['exit_status']
+    actual_host_updates = actual_jsonl
+      .select { |l| l['type'] == 'playbook_run_update' && l['host'] == @host1.insights.uuid }
+    assert_equal 1, actual_host_updates.size
+    assert_equal 0, actual_host_updates.first['sequence']
 
-    assert_not_nil actual_report_updated = actual_json1.find { |l| l['type'] == 'playbook_run_update' && l['host'] == 'TEST_UUID1' }
-    assert_equal 'TEST_CORRELATION', actual_report_updated['correlation_id']
-    assert_equal 'TEST_UUID1', actual_report_updated['host']
-    assert_equal 0, actual_report_updated['sequence']
-    assert_equal 6, actual_report_updated.size
+    actual_host_updates = actual_jsonl
+      .select { |l| l['type'] == 'playbook_run_update' && l['host'] == @host2.insights.uuid }
+    assert_equal 1, actual_host_updates.size
+    assert_equal 0, actual_host_updates.first['sequence']
 
-    assert_not_nil actual_report_updated = actual_json2.find { |l| l['type'] == 'playbook_run_update' && l['host'] == 'TEST_UUID1' }
-    assert_equal 'TEST_CORRELATION', actual_report_updated['correlation_id']
-    assert_equal 'TEST_UUID1', actual_report_updated['host']
-    assert_equal 1, actual_report_updated['sequence']
-    assert_equal 6, actual_report_updated.size
+    second_report = actual.output[:saved_reports].last.to_s
+    actual_jsonl = read_jsonl(second_report)
 
-    assert_not_nil actual_host_finished = actual_json3.find { |l| l['type'] == 'playbook_run_finished' && l['host'] == 'TEST_UUID1' }
-    assert_equal 'TEST_CORRELATION', actual_host_finished['correlation_id']
-    assert_equal 'TEST_UUID1', actual_host_finished['host']
-    assert_equal 'success', actual_host_finished['status']
-    assert_equal 7, actual_host_finished.size
+    actual_host_updates = actual_jsonl
+      .select { |l| l['type'] == 'playbook_run_update' && l['host'] == @host1.insights.uuid }
+    assert_equal 1, actual_host_updates.size
+    assert_equal 1, actual_host_updates.first['sequence']
 
-    assert_not_nil actual_report_finished = actual_json3.find { |l| l['type'] == 'playbook_run_completed' }
-    assert_equal 'TEST_CORRELATION', actual_report_finished['correlation_id']
-    assert_equal 'success', actual_report_finished['status']
-    assert_equal 4, actual_report_finished.size
+    actual_host_updates = actual_jsonl
+      .select { |l| l['type'] == 'playbook_run_update' && l['host'] == @host2.insights.uuid }
+    assert_equal 0, actual_host_updates.size
   end
 
   private
@@ -245,12 +164,10 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
       :value => '1'
     )
 
-    @host1 = FactoryBot.create(:host, :with_insights_hits)
-    @host1.name = 'host1' # overriding name since there is an issue with Factorybot and setting the name correctly, same for 2nd host
+    @host1 = FactoryBot.create(:host, :with_insights_hits, name: 'host1')
     @host1.insights.uuid = 'TEST_UUID1'
     @host1.insights.save!
-    @host2 = FactoryBot.create(:host, :with_insights_hits)
-    @host2.name = 'host2'
+    @host2 = FactoryBot.create(:host, :with_insights_hits, name: 'host2')
     @host2.insights.uuid = 'TEST_UUID2'
     @host2.insights.save!
 
@@ -273,7 +190,7 @@ class ConnectorPlaybookExecutionReporterTaskTest < ActiveSupport::TestCase
       { 'timestamp' => (Time.now - (5 - i)).to_f, 'output' => "#{i}\n" }
     end
     Support::DummyDynflowAction.any_instance.stubs(:live_output).returns(fake_output)
-    Support::DummyDynflowAction.any_instance.stubs(:exit_status).returns("0")
+    Support::DummyDynflowAction.any_instance.stubs(:exit_status).returns(0)
 
     job_invocation
   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.48
+  version: 8.0.46
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-04 00:00:00.000000000 Z
+date: 2023-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello