foreman_rh_cloud 3.0.21.1 → 3.0.22

data/test/factories/inventory_upload_factories.rb

@@ -49,7 +49,7 @@ end
 
 FactoryBot.define do
   factory :katello_subscription_facets, :aliases => [:subscription_facet], :class => ::Katello::Host::SubscriptionFacet do
-    sequence(:uuid) { |n| "uuid-#{n}-#{rand(500)}" }
+    sequence(:uuid) { |n| "00000000-%<n>04d-%<r>04d-0000-000000000000" % {n: n, r: rand(500)} }
     facts { { 'memory.memtotal' => "12 GB" } }
   end
 end

data/test/jobs/insights_full_sync_test.rb

@@ -1,6 +1,9 @@
 require 'test_helper'
+require 'foreman_tasks/test_helpers'
 
 class InsightsFullSyncTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+
   setup do
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_rules_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_notifications)

data/test/jobs/insights_resolutions_sync_test.rb

@@ -1,6 +1,9 @@
 require 'test_helper'
+require 'foreman_tasks/test_helpers'
 
 class InsightsResolutionsSyncTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+
   setup do
     @resolutions = {
       "advisor:ansible_deprecated_repo|ANSIBLE_DEPRECATED_REPO" => {

data/test/jobs/insights_rules_sync_test.rb

@@ -1,6 +1,9 @@
 require 'test_helper'
+require 'foreman_tasks/test_helpers'
 
 class InsightsRulesSyncTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+
   setup do
     rules_json = <<-'RULES_JSON'
     {

data/test/jobs/inventory_full_sync_test.rb

@@ -1,6 +1,9 @@
 require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
 
 class InventoryFullSyncTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
+
   setup do
     User.current = User.find_by(login: 'secret_admin')
 

data/test/models/insights_client_report_status_test.rb

@@ -0,0 +1,77 @@
+require 'test_plugin_helper'
+
+class InsightsClientReportStatusTest < ActiveSupport::TestCase
+  describe 'to_status' do
+    let(:host) { FactoryBot.create(:host, :managed) }
+
+    setup do
+      CommonParameter.where(name: 'host_registration_insights').destroy_all
+    end
+
+    test 'host_registration_insights = true & is getting data' do
+      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
+      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
+
+      assert_equal 0, host_status.to_status(data: true)
+    end
+
+    test 'host_registration_insights = true & no data in less than 48 hours' do
+      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
+      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
+      host_status.update(reported_at: 1.day.ago)
+      assert_equal 0, host_status.to_status
+    end
+
+    test 'host_registration_insights = true & no data in more than 48 hours' do
+      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
+      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
+      host_status.update(reported_at: 3.days.ago)
+      assert_equal 1, host_status.to_status
+    end
+
+    test 'host_registration_insights = false & no data' do
+      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
+      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
+      assert_equal 2, host_status.to_status
+    end
+
+    test 'host_registration_insights = false & getting data' do
+      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
+      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
+      assert_equal 3, host_status.to_status(data: true)
+    end
+
+    test 'host_registration_insights = nil & is getting data' do
+      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
+      assert_equal 3, host_status.to_status(data: true)
+    end
+
+    test 'host_registration_insights = nil & no data in less than 48 hours' do
+      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
+      host_status.update(reported_at: 1.day.ago)
+      assert_equal 2, host_status.to_status
+    end
+
+    test 'host_registration_insights = nil & no data in more than 48 hours' do
+      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
+      host_status.update(reported_at: 3.days.ago)
+      assert_equal 2, host_status.to_status
+    end
+
+    test 'override param on host level from `false` to `true`' do
+      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false)
+      FactoryBot.create(:host_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true, host: host)
+
+      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
+      assert_equal 0, host_status.to_status(data: true)
+    end
+
+    test 'override param on host level from `true` to `false`' do
+      FactoryBot.create(:common_parameter, name: 'host_registration_insights', key_type: 'boolean', value: true)
+      FactoryBot.create(:host_parameter, name: 'host_registration_insights', key_type: 'boolean', value: false, host: host)
+
+      host_status = Host.find_by_name(host.name).reload.get_status(InsightsClientReportStatus)
+      assert_equal 2, host_status.to_status
+    end
+  end
+end

data/test/unit/slice_generator_test.rb

@@ -71,7 +71,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_nil actual_host['ip_addresses']
     assert_nil actual_host['mac_addresses']
@@ -102,7 +102,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_system_profile = actual_host['system_profile'])
     assert_equal 4, actual_system_profile['number_of_cpus']
@@ -120,7 +120,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.interfaces.where.not(ip: nil).first.ip, actual_host['ip_addresses'].first
     assert_equal @host.interfaces.where.not(mac: nil).first.mac, actual_host['mac_addresses'].first
@@ -142,7 +142,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.interfaces.where.not(ip: nil).first.ip, actual_host['ip_addresses'].first
     assert_equal @host.interfaces.where.not(mac: nil).first.mac, actual_host['mac_addresses'].first
@@ -172,7 +172,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.interfaces.where.not(ip: nil).first.ip, actual_host['ip_addresses'].first
     assert_equal @host.interfaces.where.not(mac: nil).first.mac, actual_host['mac_addresses'].first
@@ -191,7 +191,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal '10.230.230.1', actual_host['ip_addresses'].first
     assert_not_nil(actual_system_profile = actual_host['system_profile'])
@@ -221,7 +221,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal '10.230.230.100', actual_host['ip_addresses'].first
     assert_not_nil(actual_system_profile = actual_host['system_profile'])
@@ -243,7 +243,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal 'obfuscated_name', actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -263,7 +263,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
 
     obfuscated_fqdn = Digest::SHA1.hexdigest(@host.fqdn) + '.example.com'
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal obfuscated_fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -282,7 +282,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -296,6 +296,13 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     @host.hostgroup = hostgroup
     @host.save!
 
+    ForemanInventoryUpload::Generators::Tags.any_instance.expects(:generate_parameters).returns(
+      [
+        ['bool_param', true],
+        ['int_param', 1],
+      ]
+    )
+
     Foreman.expects(:instance_id).twice.returns('satellite-id')
     batch = Host.where(id: @host.id).in_batches.first
     generator = create_generator(batch)
@@ -316,6 +323,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     assert_tag(@host.location.name, actual_host, 'location')
     assert_tag(@host.organization.name, actual_host, 'organization')
     assert_tag(@host.hostgroup.name, actual_host, 'hostgroup')
+    assert_tag('true', actual_host, 'bool_param', 'satellite_parameter')
+    assert_tag('1', actual_host, 'int_param', 'satellite_parameter')
 
     assert_equal false, satellite_facts['is_hostname_obfuscated']
 
@@ -346,7 +355,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_not_nil(host_facts = actual_host['facts']&.first)
@@ -368,7 +377,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_not_nil(host_facts = actual_host['facts']&.first)
@@ -388,7 +397,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -408,7 +417,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
@@ -427,7 +436,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_equal 1, generator.hosts_count
   end
 
@@ -440,7 +449,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 1024, actual_profile['system_memory_bytes']
@@ -466,7 +475,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_host['account'])
     assert_not_empty(actual_host['account'])
@@ -483,7 +492,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'Red Hat Test Linux 7.1 (TestId)', actual_profile['os_release']
@@ -498,7 +507,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'virtual', actual_profile['infrastructure_type']
@@ -513,7 +522,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'physical', actual_profile['infrastructure_type']
@@ -528,7 +537,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'aws', actual_profile['cloud_provider']
@@ -543,7 +552,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'google', actual_profile['cloud_provider']
@@ -558,7 +567,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'azure', actual_profile['cloud_provider']
@@ -573,7 +582,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'alibaba', actual_profile['cloud_provider']
@@ -588,7 +597,7 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_equal 'alibaba', actual_profile['cloud_provider']
@@ -614,15 +623,43 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     json_str = generator.render
     actual = JSON.parse(json_str.join("\n"))
 
-    assert_equal 'slice_123', actual['report_slice_id']
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
     assert_not_nil(actual_host = actual['hosts'].first)
     assert_not_nil(actual_profile = actual_host['system_profile'])
     assert_not_nil(actual_profile['installed_packages'])
   end
 
+  test 'omits malformed bios_uuid field' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::system::uuid'], value: 'test value', host: @host)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_nil actual_host['bios_uuid']
+  end
+
+  test 'passes valid bios_uuid field' do
+    FactoryBot.create(:fact_value, fact_name: fact_names['dmi::system::uuid'], value: 'D30B0B42-7824-2635-C62D-491394DE43F7', host: @host)
+
+    batch = Host.where(id: @host.id).in_batches.first
+    generator = create_generator(batch)
+
+    json_str = generator.render
+    actual = JSON.parse(json_str.join("\n"))
+
+    assert_equal '00000000-0000-0000-0000-000000000000', actual['report_slice_id']
+    assert_not_nil(actual_host = actual['hosts'].first)
+    assert_not_nil actual_host['bios_uuid']
+  end
+
   private
 
-  def create_generator(batch, name = 'slice_123')
+  def create_generator(batch, name = '00000000-0000-0000-0000-000000000000')
     generator = ForemanInventoryUpload::Generators::Slice.new(batch, [], name)
     if block_given?
       yield(generator)
@@ -632,8 +669,8 @@ class SliceGeneratorTest < ActiveSupport::TestCase
     generator
   end
 
-  def assert_tag(expected_value, host, tag_id)
-    actual_tag = host['tags'].find { |tag| tag['namespace'] == 'satellite' && tag['key'] == tag_id }
+  def assert_tag(expected_value, host, tag_id, namespace = 'satellite')
+    actual_tag = host['tags'].find { |tag| tag['namespace'] == namespace && tag['key'] == tag_id }
     assert_not_nil actual_tag
     assert_equal expected_value, actual_tag['value']
   end

data/webpack/ForemanInventoryUpload/Components/FullScreenModal/FullScreenModal.js

@@ -12,7 +12,7 @@ const FullScreenModal = ({
   terminalProps,
 }) => (
   <Modal
-    id="full-screen-terminal"
+    id="rh-cloud-inventory-full-screen-terminal"
     show={showFullScreen}
     onHide={toggleFullScreen}
   >

data/webpack/ForemanInventoryUpload/Components/FullScreenModal/__tests__/__snapshots__/FullScreenModal.test.js.snap

@@ -8,7 +8,7 @@ exports[`FullScreenModal rendering render without Props 1`] = `
   bsClass="modal"
   dialogComponentClass={[Function]}
   enforceFocus={true}
-  id="full-screen-terminal"
+  id="rh-cloud-inventory-full-screen-terminal"
   keyboard={true}
   manager={
     ModalManager {

data/webpack/ForemanInventoryUpload/Components/FullScreenModal/fullScreenModal.scss

@@ -1,21 +1,19 @@
-.rh-cloud-inventory-page {
-  #full-screen-terminal {
-    .modal-dialog {
-      width: 95%;
-      height: 95%;
-      margin: 30px 0 0 30px;
+#rh-cloud-inventory-full-screen-terminal {
+  .modal-dialog {
+    width: 95%;
+    height: 95%;
+    margin: 30px 0 0 30px;
 
-      .modal-body {
-        padding: 0;
-        display: flex;
-        height: -webkit-fill-available;
-        height: -moz-available;
-        height: fill-available;
+    .modal-body {
+      padding: 0;
+      display: flex;
+      height: -webkit-fill-available;
+      height: -moz-available;
+      height: fill-available;
 
-        .terminal {
-          margin: 0 -20px;
-          height: 100%;
-        }
+      .rh-cloud-inventory-terminal {
+        margin: 0 -20px;
+        height: 100%;
       }
     }
   }