foreman_rh_cloud 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d3adffa464bc496cf7b3d80bf897e5f9720f343316af3a32e61b99f55f41655
-  data.tar.gz: fabb5e4334b5c9d9f6c17d5c44cc70a27afb165fc5e2684f0609a280b40a61db
+  metadata.gz: d7eee1b8b134db1bd55e2d737aab48dd46a97a8b97a5e8cd077ffe6381f13187
+  data.tar.gz: 6d00068cd4e2ca0cf50ccf45d5eff5ba6546b8c45638c53c3ac3a3703c974812
 SHA512:
-  metadata.gz: 9eb34258b36236a537dfea9d5160f553cef3ffc4d39b2f95007cf4fab3d3d9aaaef29671cb056fcb73ade319ba847db47b9719c7fd5124f456a8d7ccca976481
-  data.tar.gz: 8bb6f9bf92278d2ab534681fb6950c3169f1da6a5f543dcaa56946745ca6d626d3edd37c21d7d1d3ede5a30de5cc1790449c92e13f2859e99c756cadb9546e8d
+  metadata.gz: 66a8870e7e6950cfbfeab6ee4f1f98718bcc7ac4dbd5ac8a38c5ba5165c9d9e577e4f459092eb2b121fd388dddd3c9aa8b225e069645a248a5a43db7ab79ebed
+  data.tar.gz: 48820898171bca9808a0dedd1d0f494cd7407a40e668fde73d8e33b4a311812609b9c37ec0bd99f7244a431fcd8cf93243607e041884549aa63270ae14c0fe85

data/lib/foreman_inventory_upload/async/async_helpers.rb

@@ -0,0 +1,13 @@
+module ForemanInventoryUpload
+  module Async
+    module AsyncHelpers
+      extend ActiveSupport::Concern
+
+      def hash_to_s(hash)
+        hash.each_with_object({}) do |(k, v), a|
+          a[k.to_s] = v.to_s
+        end
+      end
+    end
+  end
+end

data/lib/foreman_inventory_upload/async/shell_process.rb

@@ -3,11 +3,13 @@ require 'open3'
 module ForemanInventoryUpload
   module Async
     class ShellProcess < ::ApplicationJob
+      include AsyncHelpers
+
       def perform(instance_label)
         klass_name = self.class.name
         logger.debug("Starting #{klass_name} with label #{instance_label}")
         progress_output = ProgressOutput.register(instance_label)
-        Open3.popen2e(env, command) do |_stdin, stdout_stderr, wait_thread|
+        Open3.popen2e(hash_to_s(env), command) do |_stdin, stdout_stderr, wait_thread|
           progress_output.status = "Running in pid #{wait_thread.pid}"
 
           stdout_stderr.each do |out_line|

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -13,6 +13,19 @@ module ForemanInventoryUpload
       def kilobytes_to_bytes(kilobytes)
         kilobytes * 1024
       end
+
+      def account_id(organization)
+        @organization_accounts ||= {}
+        @organization_accounts[organization.id] ||= organization.pools.where.not(account_number: nil).pluck(:account_number).first
+      end
+
+      def golden_ticket?(organization)
+        result = organization.try(:golden_ticket?)
+        result = organization.content_access_mode == 'org_environment' if result.nil?
+
+        @organization_golden_tickets ||= {}
+        @organization_golden_tickets[organization.id] ||= result
+      end
     end
   end
 end

data/lib/foreman_inventory_upload/generators/queries.rb

@@ -19,6 +19,7 @@ module ForemanInventoryUpload
               'lscpu::flags',
               'distribution::version',
               'distribution::id',
+              'virt::is_guest',
             ]).pluck(:name, :id)
           ]
       end

data/lib/foreman_inventory_upload/generators/slice.rb

@@ -26,7 +26,7 @@ module ForemanInventoryUpload
           @stream.array_field('hosts', :last) do
             first = true
             hosts_batch.each do |host|
-              next unless host&.subscription_facet&.pools&.first
+              next unless host&.subscription_facet
               @stream.comma unless first
               if report_host(host)
                 first = false
@@ -39,11 +39,10 @@ module ForemanInventoryUpload
 
       def report_host(host)
         @stream.object do
-          @stream.simple_field('display_name', host.name)
           @stream.simple_field('fqdn', host.fqdn)
-          @stream.simple_field('account', host.subscription_facet.pools.where.not(account_number: nil).first&.account_number&.to_s)
-          @stream.simple_field('subscription_manager_id', host.subscription_facet.uuid)
-          @stream.simple_field('satellite_id', host.subscription_facet.uuid)
+          @stream.simple_field('account', account_id(host.organization).to_s)
+          @stream.simple_field('subscription_manager_id', host.subscription_facet&.uuid)
+          @stream.simple_field('satellite_id', host.subscription_facet&.uuid)
           @stream.simple_field('bios_uuid', fact_value(host, 'dmi::system::uuid'))
           @stream.simple_field('vm_uuid', fact_value(host, 'virt::uuid'))
           @stream.array_field('ip_addresses') do
@@ -123,6 +122,10 @@ module ForemanInventoryUpload
         @stream.simple_field('subscription_status', host.subscription_status_label)
         @stream.simple_field('katello_agent_running', host.content_facet&.katello_agent_installed?)
         @stream.simple_field('satellite_managed', true)
+        @stream.simple_field(
+          'infrastructure_type',
+          ActiveModel::Type::Boolean.new.cast(fact_value(host, 'virt::is_guest')) ? 'virtual' : 'physical'
+        )
         unless (installed_products = host.subscription_facet&.installed_products).empty?
           @stream.array_field('installed_products') do
             @stream.raw(installed_products.map do |product|
@@ -143,15 +146,16 @@ module ForemanInventoryUpload
       end
 
       def report_satellite_facts(host)
-        @stream.simple_field('virtual_host_name', host.subscription_facet.hypervisor_host&.name)
-        @stream.simple_field('virtual_host_uuid', host.subscription_facet.hypervisor_host&.subscription_facet&.uuid)
+        @stream.simple_field('virtual_host_name', host.subscription_facet&.hypervisor_host&.name)
+        @stream.simple_field('virtual_host_uuid', host.subscription_facet&.hypervisor_host&.subscription_facet&.uuid)
         if defined?(ForemanThemeSatellite)
           @stream.simple_field('satellite_version', ForemanThemeSatellite::SATELLITE_VERSION)
         end
         @stream.simple_field('system_purpose_usage', host.subscription_facet.purpose_usage)
         @stream.simple_field('system_purpose_role', host.subscription_facet.purpose_role)
         @stream.simple_field('distribution_version', fact_value(host, 'distribution::version'))
-        @stream.simple_field('satellite_instance_id', Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil)
+        @stream.simple_field('satellite_instance_id', Foreman.try(:instance_id))
+        @stream.simple_field('is_simple_content_access', golden_ticket?(host.organization))
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
 

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '0.9.5'.freeze
+  VERSION = '0.9.6'.freeze
 end

data/test/unit/archived_report_generator_test.rb

@@ -49,6 +49,7 @@ class ArchivedReportGeneratorTest < ActiveSupport::TestCase
     test_org = FactoryBot.create(:organization)
 
     ForemanInventoryUpload::Generators::Queries.expects(:for_org).with(test_org.id).returns(batches)
+    ForemanInventoryUpload::Generators::Slice.any_instance.stubs(:golden_ticket?).returns(false)
     Dir.mktmpdir do |tmpdir|
       target = File.join(tmpdir, 'test.tar.gz')
       generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))

data/test/unit/fact_helpers_test.rb

@@ -0,0 +1,29 @@
+require 'test_plugin_helper'
+
+class FactHelpersTest < ActiveSupport::TestCase
+  class FactsHelpersTestStub
+    include ForemanInventoryUpload::Generators::FactHelpers
+  end
+
+  setup do
+    @instance = FactsHelpersTestStub.new
+
+    @org = FactoryBot.create(:organization)
+  end
+
+  test 'golden_ticket uses golden_ticket method when defined' do
+    @org.expects(:golden_ticket?).returns(true)
+
+    actual = @instance.golden_ticket?(@org)
+
+    assert actual
+  end
+
+  test 'golden_ticket uses content_access_mode method when golden_ticket not defined' do
+    @org.expects(:content_access_mode).returns('org_environment')
+
+    actual = @instance.golden_ticket?(@org)
+
+    assert actual
+  end
+end

data/test/unit/slice_generator_test.rb

@@ -16,7 +16,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
 
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
@@ -37,6 +37,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       'distribution::name',
       'distribution::version',
       'distribution::id',
+      'virt::is_guest',
     ]
   end
 
@@ -50,14 +51,13 @@ class ReportGeneratorTest < ActiveSupport::TestCase
 
   test 'generates a report for a single host' do
     batch = Host.where(id: @host.id).in_batches.first
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+    generator = create_generator(batch)
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
     assert_equal 'slice_123', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.name, actual_host['display_name']
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
     assert_equal 1, generator.hosts_count
@@ -66,7 +66,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
   test 'generates a report with satellite facts' do
     Foreman.expects(:instance_id).twice.returns('satellite-id')
     batch = Host.where(id: @host.id).in_batches.first
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice-123')
+    generator = create_generator(batch)
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
@@ -107,14 +107,13 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     @host.save!
 
     batch = Host.where(id: @host.id).in_batches.first
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+    generator = create_generator(batch)
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
     assert_equal 'slice_123', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.name, actual_host['display_name']
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_not_nil(host_facts = actual_host['facts']&.first)
     assert_equal 'satellite', host_facts['namespace']
@@ -129,14 +128,13 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     @host.subscription_facet.save!
 
     batch = Host.where(id: @host.id).in_batches.first
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+    generator = create_generator(batch)
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
     assert_equal 'slice_123', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.name, actual_host['display_name']
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_not_nil(host_facts = actual_host['facts']&.first)
     assert_equal 'satellite', host_facts['namespace']
@@ -145,6 +143,22 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal 'test_role', fact_values['system_purpose_role']
   end
 
+  test 'generates a report for a golden ticket' do
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch) do |generator|
+      generator.stubs(:golden_ticket?).returns(true)
+    end
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal 'slice_123', 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']
+    assert_equal 1, generator.hosts_count
+  end
+
   test 'skips hosts without subscription' do
     a_host = FactoryBot.create(
       :host,
@@ -153,14 +167,13 @@ class ReportGeneratorTest < ActiveSupport::TestCase
 
     # make a_host last
     batch = Host.where(id: [@host.id, a_host.id]).order(:name).in_batches.first
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+    generator = create_generator(batch)
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
     assert_equal 'slice_123', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
-    assert_equal @host.name, actual_host['display_name']
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
     assert_equal 1, generator.hosts_count
@@ -170,7 +183,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     FactoryBot.create(:fact_value, fact_name: fact_names['memory::memtotal'], value: '1', host: @host)
 
     batch = Host.where(id: @host.id).in_batches.first
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+    generator = create_generator(batch)
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
@@ -182,15 +195,14 @@ class ReportGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'reports an account for hosts with multiple pools' do
-    first_pool = @host.subscription_facet.pools.first
+    first_pool = @host.organization.pools.first
     second_pool = FactoryBot.create(:katello_pool, account_number: nil, cp_id: 2)
-    @host.subscription_facet.pools = []
-    @host.subscription_facet.save!
-    @host.subscription_facet.pools << first_pool
-    @host.subscription_facet.pools << second_pool
+    new_org = FactoryBot.create(:organization, pools: [first_pool, second_pool])
+    @host.organization = new_org
+    @host.save!
 
     batch = Host.where(id: @host.id).in_batches.first
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+    generator = create_generator(batch)
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
@@ -207,7 +219,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     FactoryBot.create(:fact_value, fact_name: fact_names['distribution::id'], value: 'TestId', host: @host)
 
     batch = Host.where(id: @host.id).in_batches.first
-    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+    generator = create_generator(batch)
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
@@ -217,4 +229,46 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'Red Hat Test Linux 7.1 (TestId)', actual_profile['os_release']
   end
+
+  test 'sets infrastructure_type to "virtual" based on virt.is_guest fact' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['virt::is_guest'], value: true, 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 'slice_123', 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']
+  end
+
+  test 'sets infrastructure_type to "physical" based on virt.is_guest fact' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['virt::is_guest'], value: false, 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 'slice_123', 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']
+  end
+
+  private
+
+  def create_generator(batch, name = 'slice_123')
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], name)
+    if block_given?
+      yield(generator)
+    else
+      generator.stubs(:golden_ticket?).returns(false)
+    end
+    generator
+  end
 end

data/test/unit/slice_generator_test.rb.orig

@@ -0,0 +1,280 @@
+require 'test_plugin_helper'
+
+class ReportGeneratorTest < ActiveSupport::TestCase
+  setup do
+    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)
+
+    @host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: cv.first,
+      lifecycle_environment: env,
+      organization: env.organization
+    )
+
+    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+
+    ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
+  end
+
+  def interesting_facts
+    [
+      'dmi::system::uuid',
+      'virt::uuid',
+      'cpu::cpu(s)',
+      'cpu::cpu_socket(s)',
+      'cpu::core(s)_per_socket',
+      'memory::memtotal',
+      'dmi::bios::vendor',
+      'dmi::bios::version',
+      'dmi::bios::relase_date',
+      'uname::release',
+      'lscpu::flags',
+      'distribution::name',
+      'distribution::version',
+      'distribution::id',
+      'virt::is_guest',
+    ]
+  end
+
+  def fact_names
+    @fact_names ||= Hash[
+      interesting_facts.map do |fact|
+        [fact, FactoryBot.create(:fact_name, name: fact, type: 'Katello::RhsmFactName')]
+      end
+    ]
+  end
+
+  test 'generates a report for a single host' do
+    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 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal @host.name, actual_host['display_name']
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+  end
+
+  test 'generates a report with satellite facts' do
+    Foreman.expects(:instance_id).twice.returns('satellite-id')
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    facts = actual['hosts'].first['facts'].first
+    assert_equal 'satellite', facts['namespace']
+    satellite_facts = facts['facts']
+    assert_equal 'satellite-id', satellite_facts['satellite_instance_id']
+    assert_equal @host.organization_id, satellite_facts['organization_id']
+
+    instance_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'satellite_instance_id' }
+    assert_not_nil instance_id_tag
+    assert_equal 'satellite-id', instance_id_tag['value']
+
+    org_id_tag = actual['hosts'].first['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == 'organization_id' }
+    assert_not_nil org_id_tag
+    assert_equal @host.organization_id.to_s, org_id_tag['value']
+
+    version = satellite_facts['satellite_version']
+    if defined?(ForemanThemeSatellite)
+      assert_equal ForemanThemeSatellite::SATELLITE_VERSION, version
+    else
+      assert_nil version
+    end
+  end
+
+  test 'generates a report for a host with hypervisor' do
+    hypervisor_host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: @host.content_view,
+      lifecycle_environment: @host.lifecycle_environment,
+      organization: @host.organization
+    )
+
+    @host.subscription_facet.hypervisor_host = hypervisor_host
+    @host.save!
+
+    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 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal @host.name, actual_host['display_name']
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_not_nil(host_facts = actual_host['facts']&.first)
+    assert_equal 'satellite', host_facts['namespace']
+    assert_not_nil(fact_values = host_facts['facts'])
+    assert_equal hypervisor_host.name, fact_values['virtual_host_name']
+    assert_equal hypervisor_host.subscription_facet.uuid, fact_values['virtual_host_uuid']
+  end
+
+  test 'generates a report with system purpose' do
+    @host.subscription_facet.purpose_usage = 'test_usage'
+    @host.subscription_facet.purpose_role = 'test_role'
+    @host.subscription_facet.save!
+
+    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 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal @host.name, actual_host['display_name']
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_not_nil(host_facts = actual_host['facts']&.first)
+    assert_equal 'satellite', host_facts['namespace']
+    assert_not_nil(fact_values = host_facts['facts'])
+    assert_equal 'test_usage', fact_values['system_purpose_usage']
+    assert_equal 'test_role', fact_values['system_purpose_role']
+  end
+
+  test 'generates a report for a golden ticket' do
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch) do |generator|
+      generator.stubs(:golden_ticket?).returns(true)
+    end
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal @host.name, actual_host['display_name']
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+  end
+
+  test 'skips hosts without subscription' do
+    a_host = FactoryBot.create(
+      :host,
+      organization: @host.organization
+    )
+
+    # make a_host last
+    batch = Host.where(id: [@host.id, a_host.id]).order(:name).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_equal @host.name, actual_host['display_name']
+    assert_equal @host.fqdn, actual_host['fqdn']
+    assert_equal '1234', actual_host['account']
+    assert_equal 1, generator.hosts_count
+  end
+
+  test 'shows system_memory_bytes in bytes' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['memory::memtotal'], value: '1', 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 'slice_123', 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']
+  end
+
+  test 'reports an account for hosts with multiple pools' do
+    first_pool = @host.organization.pools.first
+    second_pool = FactoryBot.create(:katello_pool, account_number: nil, cp_id: 2)
+    new_org = FactoryBot.create(:organization, pools: [first_pool, second_pool])
+    @host.organization = new_org
+    @host.save!
+
+    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 'slice_123', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil(actual_host['account'])
+    assert_not_empty(actual_host['account'])
+  end
+
+  test 'Generates os_release with version and id' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['distribution::name'], value: 'Red Hat Test Linux', host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['distribution::version'], value: '7.1', host: @host)
+    FactoryBot.create(:fact_value, fact_name: fact_names['distribution::id'], value: 'TestId', 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 'slice_123', 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']
+  end
+
+<<<<<<< HEAD
+  test 'sets infrastructure_type to "virtual" based on virt.is_guest fact' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['virt::is_guest'], value: true, host: @host)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal 'slice_123', 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']
+  end
+
+  test 'sets infrastructure_type to "physical" based on virt.is_guest fact' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['virt::is_guest'], value: false, host: @host)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal 'slice_123', 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']
+=======
+  private
+
+  def create_generator(batch, name = 'slice_123')
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], name)
+    if block_given?
+      yield(generator)
+    else
+      generator.stubs(:golden_ticket?).returns(false)
+    end
+    generator
+>>>>>>> Add support fo golden ticket
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_rh_cloud
 version: !ruby/object:Gem::Version
-  version: 0.9.5
+  version: 0.9.6
 platform: ruby
 authors:
 - Foreman Red Hat Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-07 00:00:00.000000000 Z
+date: 2020-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -85,6 +85,7 @@ files:
 - app/views/foreman_inventory_upload/layouts/react.html.erb
 - config/routes.rb
 - lib/foreman_inventory_upload.rb
+- lib/foreman_inventory_upload/async/async_helpers.rb
 - lib/foreman_inventory_upload/async/generate_all_reports_job.rb
 - lib/foreman_inventory_upload/async/generate_report_job.rb
 - lib/foreman_inventory_upload/async/progress_output.rb
@@ -114,9 +115,11 @@ files:
 - test/factories/inventory_upload_factories.rb
 - test/test_plugin_helper.rb
 - test/unit/archived_report_generator_test.rb
+- test/unit/fact_helpers_test.rb
 - test/unit/metadata_generator_test.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/slice_generator_test.rb
+- test/unit/slice_generator_test.rb.orig
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.js
 - webpack/ForemanInventoryUpload/Components/AccountList/AccountList.stories.js
@@ -329,5 +332,7 @@ test_files:
 - test/factories/inventory_upload_factories.rb
 - test/unit/shell_process_job_test.rb
 - test/unit/metadata_generator_test.rb
+- test/unit/slice_generator_test.rb.orig
+- test/unit/fact_helpers_test.rb
 - test/unit/archived_report_generator_test.rb
 - test/unit/slice_generator_test.rb