foreman_rh_cloud 1.0.6 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58cd71785dedf35f475e09a442c930ba6e703c03a0dcf292a6786efa4b57d6c5
-  data.tar.gz: 0f87e840488f7381b2797012175d5be8a5cb1eae89febbea1c246e46fd2b8fcf
+  metadata.gz: aa962e3bc67676bb6d21b2196824ddef35ece66d0b24dad52658605446c39dfb
+  data.tar.gz: 8ee5a01dda9593c05b2babe5f65ee31a8a88dded967b159972351b5ee07e518a
 SHA512:
-  metadata.gz: c11c234bfbf1349223411b242317987a972aeb343fdeb4dfcc7fe4de8207b111c1bd2c4a5f10b86410e967a4d466b51fa6060670c220129e811f6c0af8b7cbea
-  data.tar.gz: 49d3ca3734f72c765c756c691cad4b66a33491e5772348f63a4358741a11c223348aa2cccd4d96537a2b03ee85c07e364eebbb223a2276972e3b1c17b150d41d
+  metadata.gz: 6d766ae3c9edec7b7041c73058a80c1e268e5dd2323a049fe66963ab7f313e9ce54e4e6f677b022f2c630944b9b8278bac30207fe4b1cf278cd8db3bdaa393cf
+  data.tar.gz: 4e4b112121137835a8a54dd3831ff293e7ba172458a1de2adb310a73afcbb605fc48bfe80456fc7e640218a051d419a98d5e0537f5fa4455ed619de110632fa8

data/lib/foreman_inventory_upload/async/shell_process.rb

@@ -3,13 +3,11 @@ 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(hash_to_s(env), command) do |_stdin, stdout_stderr, wait_thread|
+        Open3.popen2e(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/async/upload_report_job.rb

@@ -37,11 +37,7 @@ module ForemanInventoryUpload
       end
 
       def http_proxy_string
-        @http_proxy_string ||= begin
-          if Setting[:content_default_http_proxy]
-            HttpProxy.unscoped.find_by(name: Setting[:content_default_http_proxy])&.full_url
-          end
-        end
+        @http_proxy_string ||= HttpProxy.default_global_content_proxy&.full_url
       end
 
       def rh_credentials

data/lib/foreman_inventory_upload/generators/fact_helpers.rb

@@ -13,19 +13,6 @@ 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,7 +19,6 @@ 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
+              next unless host&.subscription_facet&.pools&.first
               @stream.comma unless first
               if report_host(host)
                 first = false
@@ -39,10 +39,11 @@ 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', 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('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('bios_uuid', fact_value(host, 'dmi::system::uuid'))
           @stream.simple_field('vm_uuid', fact_value(host, 'virt::uuid'))
           @stream.array_field('ip_addresses') do
@@ -122,10 +123,6 @@ 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|
@@ -146,16 +143,15 @@ 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.try(:instance_id))
-        @stream.simple_field('is_simple_content_access', golden_ticket?(host.organization))
+        @stream.simple_field('satellite_instance_id', Foreman.respond_to?(:instance_id) ? Foreman.instance_id : nil)
         @stream.simple_field('organization_id', host.organization_id, :last)
       end
 

data/lib/foreman_rh_cloud/engine.rb

@@ -26,7 +26,7 @@ module ForemanRhCloud
 
     initializer 'foreman_rh_cloud.register_plugin', :before => :finisher_hook do |_app|
       Foreman::Plugin.register :foreman_rh_cloud do
-        requires_foreman '~> 1.24.0'
+        requires_foreman '> 1.24'
 
         # Add permissions
         security_block :foreman_rh_cloud do

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '1.0.6'.freeze
+  VERSION = '2.0.5'.freeze
 end

data/package.json

@@ -4,14 +4,14 @@
   "description": "Inventory Upload =============",
   "main": "index.js",
   "scripts": {
-    "lint": "./node_modules/.bin/eslint -c .eslintrc webpack/",
-    "test": "node node_modules/.bin/jest --no-cache",
-    "test:watch": "node node_modules/.bin/jest --watchAll",
-    "test:current": "node node_modules/.bin/jest --watch",
-    "coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
-    "storybook": "start-storybook -p 6006",
-    "storybook:build": "node --max_old_space_size=2048 ./node_modules/.bin/build-storybook --config-dir .storybook --output-dir .storybook-dist",
-    "storybook:deploy": "surge --project .storybook-dist"
+    "lint": "tfm-lint --plugin -d /webpack",
+    "test": "tfm-test --plugin",
+    "test:watch": "tfm-test --plugin --watchAll",
+    "test:current": "tfm-test --plugin --watch",
+    "publish-coverage": "tfm-publish-coverage",
+    "stories": "tfm-stories --plugin",
+    "stories:build": "tfm-build-stories --plugin",
+    "stories:deploy": "surge --project .storybook-dist"
   },
   "repository": {
     "type": "git",
@@ -20,106 +20,26 @@
   "bugs": {
     "url": "http://projects.theforeman.org/projects/foreman_rh_cloud/issues"
   },
-  "optionalDependencies": {
-    "babel-plugin-module-resolver": "^3.2.0"
+  "peerDependencies": {
+    "@theforeman/vendor": ">= 4.0.2"
   },
   "devDependencies": {
-    "@storybook/addon-actions": "^5.0.1",
-    "@storybook/addon-knobs": "^5.0.1",
-    "@storybook/react": "^5.0.1",
-    "babel-cli": "^6.10.1",
-    "babel-core": "^6.26.3",
-    "babel-eslint": "^8.2.3",
-    "babel-jest": "^23.6.0",
-    "babel-loader": "^7.1.1",
-    "babel-plugin-dynamic-import-node": "^2.0.0",
-    "babel-plugin-lodash": "^3.3.4",
-    "babel-plugin-syntax-dynamic-import": "^6.18.0",
-    "babel-plugin-transform-class-properties": "^6.24.1",
-    "babel-plugin-transform-object-assign": "^6.8.0",
-    "babel-plugin-transform-object-rest-spread": "^6.8.0",
-    "babel-preset-env": "^1.7.0",
-    "babel-preset-react": "^6.5.0",
-    "coveralls": "^3.0.0",
-    "enzyme": "^3.4.0",
-    "enzyme-adapter-react-16": "^1.4.0",
-    "enzyme-to-json": "^3.2.1",
-    "eslint": "^4.10.0",
-    "eslint-import-resolver-babel-module": "^4.0.0",
-    "eslint-plugin-patternfly-react": "0.2.0",
-    "identity-obj-proxy": "^3.0.0",
-    "jed": "^1.1.1",
-    "jest-cli": "^23.6.0",
-    "jest-prop-type-error": "^1.1.0",
-    "node-sass": "^4.5.0",
-    "patternfly": "^3.58.0",
+    "@babel/core": "^7.7.0",
+    "@theforeman/builder": "^4.0.2",
+    "@theforeman/stories": "^4.0.2",
+    "@theforeman/test": "^4.0.2",
+    "@theforeman/vendor-dev": "^4.0.2",
+    "@theforeman/eslint-plugin-foreman": "^4.0.2",
+    "babel-eslint": "^10.0.0",
+    "eslint": "^6.7.2",
     "prettier": "^1.13.5",
     "raf": "^3.4.0",
-    "react-redux-test-utils": "^0.1.1",
-    "react-remarkable": "^1.1.3",
-    "sass-loader": "^6.0.7",
     "stylelint": "^9.3.0",
     "stylelint-config-standard": "^18.0.0",
     "surge": "^0.20.3"
   },
   "dependencies": {
-    "babel-polyfill": "^6.26.0",
-    "classnames": "^2.2.5",
-    "lodash": "^4.17.10",
-    "patternfly-react": "^2.19.1",
-    "prop-types": "^15.6.0",
-    "react": "^16.4.0",
-    "react-dom": "^16.4.0",
-    "react-intl": "^2.8.0",
-    "react-redux": "^5.0.6",
-    "redux": "^3.6.0",
-    "redux-thunk": "^2.2.0",
-    "reselect": "^3.0.1",
-    "seamless-immutable": "^7.1.2",
-    "urijs": "^1.18.10",
-    "uuid": "^3.0.1"
-  },
-  "jest": {
-    "automock": true,
-    "verbose": true,
-    "testMatch": [
-      "**/*.test.js"
-    ],
-    "testURL": "http://localhost/",
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "webpack/**/*.js",
-      "!webpack/index.js",
-      "!webpack/test_setup.js",
-      "!webpack/**/bundle*",
-      "!webpack/stories/**",
-      "!webpack/**/*stories.js"
-    ],
-    "coverageReporters": [
-      "lcov"
-    ],
-    "unmockedModulePathPatterns": [
-      "webpack/",
-      "react",
-      "node_modules/"
-    ],
-    "moduleNameMapper": {
-      "^.+\\.(png|gif|css|scss)$": "identity-obj-proxy"
-    },
-    "globals": {
-      "__testing__": true
-    },
-    "transform": {
-      "^.+\\.js$": "babel-jest"
-    },
-    "moduleDirectories": [
-      "node_modules",
-      "webpack"
-    ],
-    "setupFiles": [
-      "raf/polyfill",
-      "jest-prop-type-error",
-      "./webpack/test_setup.js"
-    ]
+    "jed": "^1.1.1",
+    "react-intl": "^2.8.0"
   }
 }

data/test/factories/inventory_upload_factories.rb

@@ -1,16 +1,16 @@
 # redefine katello factories, as long as katello is not compatible with dynamic properties
 FactoryBot.define do
   factory :katello_organization, :class => "Organization" do
-    type {"Organization"}
+    type { "Organization" }
     sequence(:name) { |n| "Organization#{n}" }
     sequence(:label) { |n| "org#{n}" }
     sequence(:id) { |n| n }
 
     trait :acme_corporation do
-      name {"ACME_Corporation"}
-      type {"Organization"}
-      description {"This is the first Organization."}
-      label {"acme_corporation_label"}
+      name { "ACME_Corporation" }
+      type { "Organization" }
+      description { "This is the first Organization." }
+      label { "acme_corporation_label" }
     end
 
     trait :with_library do
@@ -24,11 +24,11 @@ end
 FactoryBot.define do
   factory :katello_content_view, :class => Katello::ContentView do
     sequence(:name) { |n| "Database#{n}" }
-    description {"This content view is for database content"}
+    description { "This content view is for database content" }
     association :organization, :factory => :katello_organization
 
     trait :composite do
-      composite {true}
+      composite { true }
     end
   end
 end
@@ -50,23 +50,23 @@ end
 FactoryBot.define do
   factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
     sequence(:uuid) { |n| "uuid-#{n}-#{rand(500)}" }
-    facts { {'memory.memtotal' => "12 GB"} }
+    facts { { 'memory.memtotal' => "12 GB" } }
   end
 end
 
 FactoryBot.define do
   factory :katello_pool, :class => Katello::Pool do
-    active {true}
-    end_date {Date.today + 1.year}
+    active { true }
+    end_date { Date.today + 1.year }
   end
 end
 
 FactoryBot.modify do
   factory :host do
     transient do
-      content_view {nil}
-      lifecycle_environment {nil}
-      content_source {nil}
+      content_view { nil }
+      lifecycle_environment { nil }
+      content_source { nil }
     end
 
     trait :with_content do

data/test/unit/archived_report_generator_test.rb

@@ -49,7 +49,6 @@ 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/slice_generator_test.rb

@@ -16,7 +16,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+    @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
 
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
@@ -37,7 +37,6 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       'distribution::name',
       'distribution::version',
       'distribution::id',
-      'virt::is_guest',
     ]
   end
 
@@ -51,13 +50,14 @@ class ReportGeneratorTest < ActiveSupport::TestCase
 
   test 'generates a report for a single host' do
     batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
+    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_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 = create_generator(batch)
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice-123')
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
@@ -77,11 +77,11 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     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'}
+    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'}
+    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']
 
@@ -107,13 +107,14 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     @host.save!
 
     batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
+    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_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']
@@ -128,13 +129,14 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     @host.subscription_facet.save!
 
     batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
+    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_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']
@@ -143,22 +145,6 @@ 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,
@@ -167,13 +153,14 @@ class ReportGeneratorTest < ActiveSupport::TestCase
 
     # make a_host last
     batch = Host.where(id: [@host.id, a_host.id]).order(:name).in_batches.first
-    generator = create_generator(batch)
+    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_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
@@ -183,7 +170,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 = create_generator(batch)
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
@@ -195,14 +182,15 @@ class ReportGeneratorTest < ActiveSupport::TestCase
   end
 
   test 'reports an account for hosts with multiple pools' do
-    first_pool = @host.organization.pools.first
+    first_pool = @host.subscription_facet.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!
+    @host.subscription_facet.pools = []
+    @host.subscription_facet.save!
+    @host.subscription_facet.pools << first_pool
+    @host.subscription_facet.pools << second_pool
 
     batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
@@ -219,7 +207,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 = create_generator(batch)
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
@@ -229,46 +217,4 @@ 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