foreman_rh_cloud 3.0.21 → 3.0.24

data/test/jobs/inventory_scheduled_sync_test.rb

@@ -0,0 +1,22 @@
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+
+class InventoryScheduledSyncTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+
+  test 'Schedules an execution if auto upload is enabled' do
+    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => true)
+
+    InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).times(Organization.unscoped.count)
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
+  end
+
+  test 'Skips execution if auto upload is disabled' do
+    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
+
+    InventorySync::Async::InventoryScheduledSync.any_instance.expects(:plan_org_sync).never
+
+    ForemanTasks.sync_task(InventorySync::Async::InventoryScheduledSync)
+  end
+end

data/test/jobs/inventory_self_host_sync_test.rb

@@ -0,0 +1,103 @@
+require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
+
+class InventorySelfHostSyncTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+
+  setup do
+    User.current = User.find_by(login: 'secret_admin')
+
+    # this host would pass our plugin queries, so it could be uploaded to the cloud.
+    @host1 = FactoryBot.create(:host)
+    @host1_inventory_id = '3255d080-e6c1-44e2-8d72-b044b9a38d8f'
+
+    ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
+
+    ForemanRhCloud.stubs(:foreman_host).returns(@host1)
+
+    inventory_json = <<-INVENTORY_JSON
+    {
+      "total": 1,
+      "count": 1,
+      "page": 1,
+      "per_page": 1,
+      "results": [
+        {
+          "insights_id": "e0dc5144-d78e-43ed-97be-a7a21d1b6946",
+          "rhel_machine_id": null,
+          "subscription_manager_id": "0f97ee19-6862-4900-aea4-f121c8754776",
+          "satellite_id": "0f97ee19-6862-4900-aea4-f121c8754776",
+          "bios_uuid": "6a0b199a-8225-4ade-ae44-3b18cfc84a01",
+          "ip_addresses": [
+            "192.168.122.136"
+          ],
+          "fqdn": "#{@host1.fqdn}",
+          "mac_addresses": [
+            "52:54:00:02:d1:2a",
+            "00:00:00:00:00:00"
+          ],
+          "external_id": null,
+          "id": "#{@host1_inventory_id}",
+          "account": "1460290",
+          "display_name": "insights-rh8.example.com",
+          "ansible_host": null,
+          "facts": [
+            {
+              "namespace": "satellite",
+              "facts": {
+                "virtual_host_name": "virt-who-nobody.home-1",
+                "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
+                "is_simple_content_access": false,
+                "distribution_version": "8.3",
+                "satellite_version": "6.8.4",
+                "organization_id": 1,
+                "is_hostname_obfuscated": false,
+                "virtual_host_uuid": "a90e6294-4766-420a-8dc0-3ec5b96d60ec"
+              }
+            },
+            {
+              "namespace": "yupana",
+              "facts": {
+                "report_platform_id": "d37afa50-08ce-4efb-a0e5-759c2a016661",
+                "report_slice_id": "5bf791d7-5e30-4a3c-929a-11dd9fa6eb72",
+                "source": "Satellite",
+                "yupana_host_id": "78c62486-0ac4-406c-a4c0-3a1f81112a2d",
+                "account": "1460290"
+              }
+            }
+          ],
+          "reporter": "puptoo",
+          "stale_timestamp": "2021-03-19T06:05:12.092136+00:00",
+          "stale_warning_timestamp": "2021-03-26T06:05:12.092136+00:00",
+          "culled_timestamp": "2021-04-02T06:05:12.092136+00:00",
+          "created": "2021-02-08T13:22:50.555671+00:00",
+          "updated": "2021-03-18T01:05:12.131847+00:00"
+        }
+      ]
+    }
+    INVENTORY_JSON
+    @inventory = JSON.parse(inventory_json)
+  end
+
+  test 'Inventory should sync UUID for existing Insights Facets' do
+    InventorySync::Async::InventorySelfHostSync.any_instance.expects(:query_inventory).returns(@inventory)
+
+    @host1.build_insights.save
+
+    ForemanTasks.sync_task(InventorySync::Async::InventorySelfHostSync)
+
+    @host1.reload
+
+    assert_equal @host1_inventory_id, @host1.insights.uuid
+  end
+
+  test 'Inventory should sync UUID for new Insights Facets' do
+    InventorySync::Async::InventorySelfHostSync.any_instance.expects(:query_inventory).returns(@inventory)
+
+    ForemanTasks.sync_task(InventorySync::Async::InventorySelfHostSync)
+
+    @host1.reload
+
+    assert_equal @host1_inventory_id, @host1.insights.uuid
+  end
+end

data/test/test_plugin_helper.rb

@@ -2,6 +2,8 @@
 require 'test_helper'
 
 # Add plugin to FactoryBot's paths
+FactoryBot.definition_file_paths << "#{ForemanTasks::Engine.root}/test/factories"
+FactoryBot.definition_file_paths << "#{ForemanRemoteExecution::Engine.root}/test/factories"
 FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
 # FactoryBot.definition_file_paths << "#{Katello::Engine.root}/test/factories"
 FactoryBot.reload

data/test/unit/services/foreman_rh_cloud/cloud_request_forwarder_test.rb

@@ -42,9 +42,9 @@ class CloudRequestForwarderTest < ActiveSupport::TestCase
   test 'should prepare correct cloud url' do
     paths = {
       "/redhat_access/r/insights/platform/module-update-router/v1/channel?module=insights-core" => "https://cert.cloud.redhat.com/api/module-update-router/v1/channel?module=insights-core",
-      "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cloud.redhat.com/api/v1/static/release/insights-core.egg",
-      "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cloud.redhat.com/api/v1/static/uploader.v2.json",
-      "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cloud.redhat.com/api/v1/static/uploader.v2.json.asc",
+      "/redhat_access/r/insights/v1/static/release/insights-core.egg" => "https://cert-api.access.redhat.com/r/insights/v1/static/release/insights-core.egg",
+      "/redhat_access/r/insights/v1/static/uploader.v2.json" => "https://cert-api.access.redhat.com/r/insights/v1/static/uploader.v2.json",
+      "/redhat_access/r/insights/v1/static/uploader.v2.json.asc" => "https://cert-api.access.redhat.com/r/insights/v1/static/uploader.v2.json.asc",
       "/redhat_access/r/insights/platform/inventory/v1/hosts" => "https://cert.cloud.redhat.com/api/inventory/v1/hosts",
       "/redhat_access/r/insights/platform/ingress/v1/upload" => "https://cert.cloud.redhat.com/api/ingress/v1/upload",
       "/redhat_access/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4" => "https://cert-api.access.redhat.com/r/insights/uploads/67200803-132b-474b-a6f9-37be74185df4",

data/test/unit/slice_generator_test.rb

@@ -53,6 +53,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       'insights_client::hostname',
       'insights_client::obfuscate_ip_enabled',
       'insights_client::ips',
+      'insights_id',
     ]
   end
 
@@ -71,7 +72,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_nil actual_host['ip_addresses']
     assert_nil actual_host['mac_addresses']
@@ -102,7 +103,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_system_profile = actual_host['system_profile'])
     assert_equal 4, actual_system_profile['number_of_cpus']
@@ -120,7 +121,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.interfaces.where.not(ip: nil).first.ip, actual_host['ip_addresses'].first
     assert_equal @host.interfaces.where.not(mac: nil).first.mac, actual_host['mac_addresses'].first
@@ -142,7 +143,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.interfaces.where.not(ip: nil).first.ip, actual_host['ip_addresses'].first
     assert_equal @host.interfaces.where.not(mac: nil).first.mac, actual_host['mac_addresses'].first
@@ -172,7 +173,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.interfaces.where.not(ip: nil).first.ip, actual_host['ip_addresses'].first
     assert_equal @host.interfaces.where.not(mac: nil).first.mac, actual_host['mac_addresses'].first
@@ -191,7 +192,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal '10.230.230.1', actual_host['ip_addresses'].first
     assert_not_nil(actual_system_profile = actual_host['system_profile'])
@@ -221,7 +222,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal '10.230.230.100', actual_host['ip_addresses'].first
     assert_not_nil(actual_system_profile = actual_host['system_profile'])
@@ -243,7 +244,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal 'obfuscated_name', actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -263,7 +264,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
 
     obfuscated_fqdn = Digest::SHA1.hexdigest(@host.fqdn) + '.example.com'
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal obfuscated_fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -282,7 +283,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -296,6 +297,13 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     @host.hostgroup = hostgroup
     @host.save!
 
+    ForemanInventoryUpload::Generators::Tags.any_instance.expects(:generate_parameters).returns(
+      [
+        ['bool_param', true],
+        ['int_param', 1],
+      ]
+    )
+
     Foreman.expects(:instance_id).twice.returns('satellite-id')
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -316,6 +324,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_tag(@host.location.name, actual_host, 'location')
     assert_tag(@host.organization.name, actual_host, 'organization')
     assert_tag(@host.hostgroup.name, actual_host, 'hostgroup')
+    assert_tag('true', actual_host, 'bool_param', 'satellite_parameter')
+    assert_tag('1', actual_host, 'int_param', 'satellite_parameter')
 
     assert_equal false, satellite_facts['is_hostname_obfuscated']
 
@@ -346,7 +356,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_not_nil(host_facts = actual_host['facts']&.first)
@@ -368,7 +378,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_not_nil(host_facts = actual_host['facts']&.first)
@@ -388,7 +398,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -408,7 +418,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -427,7 +437,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_equal 1, generator.hosts_count
   end
 
@@ -440,7 +450,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 1024, actual_profile['system_memory_bytes']
@@ -466,7 +476,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_host['account'])
     assert_not_empty(actual_host['account'])
@@ -483,7 +493,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'Red Hat Test Linux 7.1 (TestId)', actual_profile['os_release']
@@ -498,7 +508,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'virtual', actual_profile['infrastructure_type']
@@ -513,7 +523,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'physical', actual_profile['infrastructure_type']
@@ -528,7 +538,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'aws', actual_profile['cloud_provider']
@@ -543,7 +553,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'google', actual_profile['cloud_provider']
@@ -558,7 +568,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'azure', actual_profile['cloud_provider']
@@ -573,7 +583,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'alibaba', actual_profile['cloud_provider']
@@ -588,7 +598,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'alibaba', actual_profile['cloud_provider']
@@ -614,15 +624,57 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_not_nil(actual_profile['installed_packages'])
   end
 
+  test 'omits malformed bios_uuid field' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::system::uuid'], value: 'test value', host: @host)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_nil actual_host['bios_uuid']
+  end
+
+  test 'passes valid bios_uuid field' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::system::uuid'], value: 'D30B0B42-7824-2635-C62D-491394DE43F7', host: @host)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil actual_host['bios_uuid']
+  end
+
+  test 'passes valid insights_id field' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['insights_id'], value: 'D30B0B42-7824-2635-C62D-491394DE43F7', host: @host)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil actual_host['insights_id']
+  end
+
   private
 
-  def create_generator(batch, name = 'slice_123')
+  def create_generator(batch, name = '00000000-0000-0000-0000-000000000000')
     generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], name)
     if block_given?
       yield(generator)
@@ -632,8 +684,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     generator
   end
 
-  def assert_tag(expected_value, host, tag_id)
-    actual_tag = host['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == tag_id }
+  def assert_tag(expected_value, host, tag_id, namespace = 'satellite')
+    actual_tag = host['tags'].find { |tag| tag['namespace'] == namespace && tag['key'] == tag_id }
     assert_not_nil actual_tag
     assert_equal expected_value, actual_tag['value']
   end