foreman_rh_cloud 1.0.18 → 2.0.4

data/lib/foreman_rh_cloud/version.rb

@@ -1,3 +1,3 @@
 module ForemanRhCloud
-  VERSION = '1.0.18'.freeze
+  VERSION = '2.0.4'.freeze
 end

data/lib/tasks/generator.rake

@@ -0,0 +1,29 @@
+require 'tempfile'
+
+namespace :foreman_inventory_upload do
+  namespace :report do
+    desc 'Generate inventory report to be sent to Red Hat cloud'
+    task generate: :environment do
+      portal_user = ENV['portal_user']
+      organizations = [ENV['organization_id']]
+      base_folder = ENV['target'] || Dir.pwd
+
+      unless portal_user || organizations.empty?
+        puts "Must specify either portal_user or organization_id"
+      end
+
+      if portal_user
+        puts "Generating report for all organizations associated with #{portal_user}"
+        base_folder = File.join(base_folder, portal_user)
+        organizations = ForemanInventoryUpload::Generators::Queries.organizations_for_user(portal_user).pluck(:id)
+      end
+
+      organizations.each do |organization|
+        target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization))
+        archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
+        archived_report_generator.render(organization: organization)
+        puts "Successfully generated #{target} for organization id #{organization}"
+      end
+    end
+  end
+end

data/package.json

@@ -1,17 +1,17 @@
 {
   "name": "foreman_rh_cloud",
-  "version": "1.0.18",
+  "version": "0.0.1",
   "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,108 +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",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-spellcheck": "^0.0.17",
-    "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/controllers/accounts_controller_test.rb

@@ -14,17 +14,12 @@ class AccountsControllerTest < ActionController::TestCase
     upload_label = ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id)
     upload_output = ForemanInventoryUpload::Async::ProgressOutput.register(upload_label)
     upload_output.status = 'upload_status_test'
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :value => true)
-    assert_equal true, Setting[:allow_auto_inventory_upload]
 
     get :index, session: set_session_user
 
     assert_response :success
-    actual = JSON.parse(response.body)
-    actual_account_statuses = actual['accounts'][test_org.label]
-    assert_equal 'generate_status_test', actual_account_statuses['generate_report_status']
-    assert_equal 'upload_status_test', actual_account_statuses['upload_report_status']
-
-    assert_equal true, actual['autoUploadEnabled']
+    actual = JSON.parse(response.body)['accounts'][test_org.id.to_s]
+    assert_equal 'generate_status_test', actual['generate_report_status']
+    assert_equal 'upload_status_test', actual['upload_report_status']
   end
 end

data/test/controllers/uploads_controller_test.rb

@@ -18,17 +18,4 @@ class UploadsControllerTest < ActionController::TestCase
     actual = JSON.parse(response.body)
     assert_equal 'test output', actual['output']
   end
-
-  test 'should update allow_auto_inventory_upload setting' do
-    FactoryBot.create(:setting, :name => 'allow_auto_inventory_upload', :settings_type => "boolean", :category => "Setting::RhCloud", :default => false, :value => false)
-
-    assert_equal false, Setting[:allow_auto_inventory_upload]
-
-    post :auto_upload, params: { value: true }, session: set_session_user
-
-    assert_response :success
-    actual = JSON.parse(response.body)
-    assert_equal true, actual['autoUploadEnabled']
-    assert_equal true, Setting[:allow_auto_inventory_upload]
-  end
 end

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/metadata_generator_test.rb

@@ -13,8 +13,6 @@ class MetadataGeneratorTest < ActiveSupport::TestCase
 
     assert_not_nil actual['report_id']
     assert_equal 'Satellite', actual['source']
-    assert_not_nil (actual_metadata = actual['source_metadata'])
-    assert_equal ForemanRhCloud::VERSION, actual_metadata['foreman_rh_cloud_version']
     assert_equal({}, actual['report_slices'])
   end
 

data/test/unit/slice_generator_test.rb

@@ -1,6 +1,6 @@
 require 'test_plugin_helper'
 
-class SliceGeneratorTest < ActiveSupport::TestCase
+class ReportGeneratorTest < ActiveSupport::TestCase
   setup do
     User.current = User.find_by(login: 'secret_admin')
 
@@ -9,7 +9,6 @@ class SliceGeneratorTest < ActiveSupport::TestCase
 
     @host = FactoryBot.create(
       :host,
-      :redhat,
       :with_subscription,
       :with_content,
       content_view: cv.first,
@@ -17,11 +16,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       organization: env.organization
     )
 
-    @host.organization.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
-    @host.interfaces.first.identifier = 'test_nic1'
-    @host.save!
-
-    ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
+    @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
   end
 
   def interesting_facts
@@ -35,19 +30,9 @@ class SliceGeneratorTest < ActiveSupport::TestCase
       'dmi::bios::vendor',
       'dmi::bios::version',
       'dmi::bios::relase_date',
+      'distribution::name',
       'uname::release',
       'lscpu::flags',
-      'distribution::name',
-      'distribution::version',
-      'distribution::id',
-      'virt::is_guest',
-      'dmi::system::manufacturer',
-      'dmi::system::product_name',
-      'dmi::chassis::asset_tag',
-      'insights_client::obfuscate_hostname_enabled',
-      'insights_client::hostname',
-      'insights_client::obfuscate_ip_enabled',
-      'insights_client::ips',
     ]
   end
 
@@ -61,242 +46,22 @@ class SliceGeneratorTest < 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_nil actual_host['ip_addresses']
-    assert_nil actual_host['mac_addresses']
+    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
-    assert_not_nil(actual_system_profile = actual_host['system_profile'])
-    assert_nil actual_system_profile['number_of_cpus']
-    assert_nil actual_system_profile['number_of_sockets']
-    assert_nil actual_system_profile['cores_per_socket']
-    assert_nil actual_system_profile['system_memory_bytes']
-    assert_nil actual_system_profile['os_release']
-    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
-    assert_not_nil(actual_nic = actual_network_interfaces.first)
-    refute actual_nic.key?('mtu')
-    refute actual_nic.key?('mac_address')
-    assert_equal 'test_nic1', actual_nic['name']
-  end
-
-  test 'hosts report fields should be present if fact exist' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::cpu(s)'], value: '4', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::cpu_socket(s)'], value: '2', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['cpu::core(s)_per_socket'], 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_system_profile = actual_host['system_profile'])
-    assert_equal 4, actual_system_profile['number_of_cpus']
-    assert_equal 2, actual_system_profile['number_of_sockets']
-    assert_equal 1, actual_system_profile['cores_per_socket']
-  end
-
-  test 'generates ip_address and mac_address fields' do
-    nic = FactoryBot.build(:nic_managed)
-    nic.attrs['mtu'] = '1500'
-    @host.interfaces << nic
-    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.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
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_equal 1, generator.hosts_count
-  end
-
-  test 'generates nic fields' do
-    empty_nic = FactoryBot.build(:nic_managed, ip6: '', identifier: 'empty_nic')
-    @host.interfaces << empty_nic
-    ip6 = Array.new(4) { '%x' % rand(16**4) }.join(':') + '::' + '5'
-    nic = FactoryBot.build(:nic_managed, ip6: ip6, identifier: 'good_nic')
-    nic.attrs['mtu'] = '1500'
-    @host.interfaces << nic
-    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)
-    expected_ip = @host.interfaces.where.not(ip: nil).first.ip
-    assert_not_nil actual_host['ip_addresses'].find { |addr| addr == expected_ip }
-    expected_mac = @host.interfaces.where.not(mac: nil).first.mac
-    assert_not_nil actual_host['mac_addresses'].find { |mac| mac == expected_mac }
-    assert_not_nil(actual_system_profile = actual_host['system_profile'])
-    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
-    assert_not_nil(actual_empty_nic = actual_network_interfaces.find { |actual_nic| actual_nic['name'] == 'empty_nic' })
-    assert actual_empty_nic['ipv6_addresses'].empty?
-    assert_not_nil(actual_nic = actual_network_interfaces.find { |actual_nic| actual_nic['name'] == 'good_nic' })
-    assert_equal nic.ip, actual_nic['ipv4_addresses'].first
-    assert_equal nic.ip6, actual_nic['ipv6_addresses'].first
-    assert_equal 1500, actual_nic['mtu']
-    assert_equal nic.mac, actual_nic['mac_address']
-    assert_equal nic.identifier, actual_nic['name']
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_equal 1, generator.hosts_count
-  end
-
-  test 'skips nameless nics' do
-    ip6 = Array.new(4) { '%x' % rand(16**4) }.join(':') + '::' + '5'
-    nic = FactoryBot.build(:nic_managed, ip6: ip6, identifier: '')
-    nic.attrs['mtu'] = '1500'
-    @host.interfaces << nic
-    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.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
-    assert_not_nil(actual_system_profile = actual_host['system_profile'])
-    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
-    assert_nil actual_network_interfaces.find { |actual_nic| actual_nic['name'].empty? }
-  end
-
-  test 'generates obfuscated ip_address fields without inisghts-client' do
-    FactoryBot.create(:setting, :name => 'obfuscate_inventory_ips', :value => true)
-
-    @host.interfaces << FactoryBot.build(:nic_managed)
-    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 '10.230.230.1', actual_host['ip_addresses'].first
-    assert_not_nil(actual_system_profile = actual_host['system_profile'])
-    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
-    assert_not_nil(actual_nic = actual_network_interfaces.first)
-    assert_equal '10.230.230.1', actual_nic['ipv4_addresses'].first
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_equal 1, generator.hosts_count
-  end
-
-  test 'generates obfuscated ip_address fields with inisghts-client' do
-    nic = FactoryBot.build(:nic_primary_and_provision)
-    @host.interfaces = [nic]
-    @host.save!
-
-    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::obfuscate_ip_enabled'], value: 'true', host: @host)
-    FactoryBot.create(
-      :fact_value,
-      fact_name: fact_names['insights_client::ips'],
-      value: "[{\"obfuscated\": \"10.230.230.100\", \"original\": \"#{nic.ip}\"}]",
-      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_equal '10.230.230.100', actual_host['ip_addresses'].first
-    assert_not_nil(actual_system_profile = actual_host['system_profile'])
-    assert_not_nil(actual_network_interfaces = actual_system_profile['network_interfaces'])
-    assert_not_nil(actual_nic = actual_network_interfaces.first)
-    assert_equal '10.230.230.100', actual_nic['ipv4_addresses'].first
-    assert_equal @host.fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_equal 1, generator.hosts_count
-  end
-
-  test 'obfuscates fqdn when instructed by insights-client' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::obfuscate_hostname_enabled'], value: 'true', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::hostname'], value: 'obfuscated_name', 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_equal 'obfuscated_name', actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_not_nil(actual_facts = actual_host['facts'].first['facts'])
-    assert_equal true, actual_facts['is_hostname_obfuscated']
-    assert_equal 1, generator.hosts_count
-  end
-
-  test 'obfuscates fqdn when setting set' do
-    FactoryBot.create(:setting, :name => 'obfuscate_inventory_hostnames', :value => true)
-
-    batch = Host.where(id: @host.id).in_batches.first
-    generator = create_generator(batch)
-
-    json_str = generator.render
-    actual = JSON.parse(json_str.join("\n"))
-
-    obfuscated_fqdn = Digest::SHA1.hexdigest(@host.fqdn) + '.example.com'
-
-    assert_equal 'slice_123', 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']
-    assert_not_nil(actual_facts = actual_host['facts'].first['facts'])
-    assert_equal true, actual_facts['is_hostname_obfuscated']
-    assert_equal 1, generator.hosts_count
-  end
-
-  test 'does not obfuscate fqdn when insights-client sets to false' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::obfuscate_hostname_enabled'], value: 'false', host: @host)
-    FactoryBot.create(:fact_value, fact_name: fact_names['insights_client::hostname'], value: 'obfuscated_name', 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_equal @host.fqdn, actual_host['fqdn']
-    assert_equal '1234', actual_host['account']
-    assert_not_nil(actual_facts = actual_host['facts'].first['facts'])
-    assert_equal false, actual_facts['is_hostname_obfuscated']
-    assert_equal 1, generator.hosts_count
   end
 
   test 'generates a report with satellite facts' do
-    hostgroup = FactoryBot.create(:hostgroup, name: 'Special"name')
-    @host.hostgroup = hostgroup
-    @host.save!
-
     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"))
@@ -307,15 +72,13 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_equal 'satellite-id', satellite_facts['satellite_instance_id']
     assert_equal @host.organization_id, satellite_facts['organization_id']
 
-    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.location.name, actual_host, 'location')
-    assert_tag(@host.organization.name, actual_host, 'organization')
-    assert_tag(@host.hostgroup.name, actual_host, 'hostgroup')
+    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']
 
-    assert_equal false, satellite_facts['is_hostname_obfuscated']
+    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, org_id_tag['value']
 
     version = satellite_facts['satellite_version']
     if defined?(ForemanThemeSatellite)
@@ -339,13 +102,14 @@ class SliceGeneratorTest < 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']
@@ -357,40 +121,23 @@ class SliceGeneratorTest < ActiveSupport::TestCase
   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.service_level = 'test_sla'
     @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']
     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']
-    assert_equal 'test_sla', fact_values['system_purpose_sla']
-  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
@@ -401,39 +148,23 @@ class SliceGeneratorTest < 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
-  end
-
-  test 'include also hosts with non-redhat OS' do
-    os = @host.operatingsystem
-    os.name = 'Centos'
-    os.save!
-
-    # make a_host last
-    batch = ForemanInventoryUpload::Generators::Queries.for_org(@host.organization_id).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_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)
+    generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], 'slice_123')
 
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
@@ -443,196 +174,4 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     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])
-
-    another_host = FactoryBot.create(
-      :host,
-      :with_subscription,
-      :with_content,
-      content_view: @host.content_view,
-      lifecycle_environment: @host.lifecycle_environment,
-      organization: new_org
-    )
-
-    batch = Host.where(id: another_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
-
-  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
-
-  test 'Identifies Amazon cloud provider' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::bios::version'], value: 'Test Amazon version', 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 'aws', actual_profile['cloud_provider']
-  end
-
-  test 'Identifies Google cloud provider' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::bios::version'], value: 'Test Google version', 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 'google', actual_profile['cloud_provider']
-  end
-
-  test 'Identifies Azure cloud provider' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::chassis::asset_tag'], value: '7783-7084-3265-9085-8269-3286-77', 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 'azure', actual_profile['cloud_provider']
-  end
-
-  test 'Identifies Alibaba cloud provider via manufacturer' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::system::manufacturer'], value: 'Test Alibaba Cloud version', 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 'alibaba', actual_profile['cloud_provider']
-  end
-
-  test 'Identifies Alibaba cloud provider via product name' do
-    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::system::product_name'], value: 'Test Alibaba Cloud ECS product', 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 'alibaba', actual_profile['cloud_provider']
-  end
-
-  test 'include packages installed in the report' do
-    FactoryBot.create(:setting, :name => 'exclude_installed_packages', :value => false)
-    installed_package = ::Katello::InstalledPackage.create(name: 'test-package', nvra: 'test-package-1.0.x86_64')
-
-    another_host = FactoryBot.create(
-      :host,
-      :with_subscription,
-      :with_content,
-      content_view: @host.content_view,
-      lifecycle_environment: @host.lifecycle_environment,
-      organization: @host.organization,
-      installed_packages: [installed_package]
-    )
-
-    batch = Host.where(id: another_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_not_nil(actual_profile['installed_packages'])
-  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
-
-  def assert_tag(expected_value, host, tag_id)
-    actual_tag = host['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == tag_id }
-    assert_not_nil actual_tag
-    assert_equal expected_value, actual_tag['value']
-  end
 end