foreman_rh_cloud 1.0.5 → 2.0.7

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,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,12 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       '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',
     ]
   end
 
@@ -50,14 +56,65 @@ 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.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_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 = Base64.urlsafe_encode64(Digest::SHA1.digest(@host.fqdn), padding: false)
+
+    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_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.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 +123,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"))
@@ -77,11 +134,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,14 +164,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 +185,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 +200,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 +224,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 +240,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 +252,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 +276,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 +286,121 @@ 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
+
+  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
+
+  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/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js

@@ -1,6 +1,6 @@
 import { noop } from 'patternfly-react';
 
-export const API_SUCCESS_RESPONSE = {
+export const accounts = {
   Account1: {
     label: 'test_org1',
     upload_report_status: 'running',
@@ -18,7 +18,9 @@ export const API_SUCCESS_RESPONSE = {
   },
 };
 
-export const accounts = API_SUCCESS_RESPONSE;
+export const accountIDs = Object.keys(accounts);
+
+export const API_SUCCESS_RESPONSE = accounts;
 
 export const pollingProcessID = 0;
 
@@ -30,6 +32,8 @@ export const processStatusName = 'upload_report_status';
 
 export const autoUploadEnabled = true;
 
+export const filterTerm = 'some_filter';
+
 export const props = {
   accounts,
   fetchAccountsStatus: noop,