foreman_rh_cloud 3.0.18.1 → 4.0.21.1

data/test/jobs/insights_full_sync_test.rb

@@ -1,16 +1,27 @@
 require 'test_helper'
+require 'foreman_tasks/test_helpers'
+
+class InsightsFullSyncTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
 
-class InsightsFullSyncTest < ActiveJob::TestCase
   setup do
+    InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_rules_sync)
+    InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_notifications)
+
+    uuid1 = 'accdf444-5628-451d-bf3e-cf909ad72756'
     @host1 = FactoryBot.create(:host, :managed, name: 'host1')
+    FactoryBot.create(:insights_facet, host_id: @host1.id, uuid: uuid1)
+
+    uuid2 = 'accdf444-5628-451d-bf3e-cf909ad72757'
     @host2 = FactoryBot.create(:host, :managed, name: 'host2')
+    FactoryBot.create(:insights_facet, host_id: @host2.id, uuid: uuid2)
 
     hits_json = <<-HITS_JSON
     [
         {
             "hostname": "#{@host1.name}",
             "rhel_version": "7.5",
-            "uuid": "accdf444-5628-451d-bf3e-cf909ad72756",
+            "uuid": "#{uuid1}",
             "last_seen": "2019-11-22T08:41:42.447244Z",
             "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
             "solution_url": "",
@@ -22,7 +33,7 @@ class InsightsFullSyncTest < ActiveJob::TestCase
         {
             "hostname": "#{@host1.name}",
             "rhel_version": "7.5",
-            "uuid": "accdf444-5628-451d-bf3e-cf909ad72756",
+            "uuid": "#{uuid1}",
             "last_seen": "2019-11-22T08:41:42.447244Z",
             "title": "CPU vulnerable to side-channel attacks using Microarchitectural Data Sampling (CVE-2018-12130, CVE-2018-12126, CVE-2018-12127, CVE-2019-11091)",
             "solution_url": "https://access.redhat.com/node/4134081",
@@ -34,7 +45,7 @@ class InsightsFullSyncTest < ActiveJob::TestCase
         {
             "hostname": "#{@host2.name}",
             "rhel_version": "7.5",
-            "uuid": "accdf444-5628-451d-bf3e-cf909ad72757",
+            "uuid": "#{uuid2}",
             "last_seen": "2019-11-22T08:41:42.447244Z",
             "title": "CPU vulnerable to side-channel attacks using L1 Terminal Fault (CVE-2018-3620)",
             "solution_url": "https://access.redhat.com/node/3560291",
@@ -51,23 +62,26 @@ class InsightsFullSyncTest < ActiveJob::TestCase
   test 'Hits data is replaced with data from cloud' do
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits)
 
-    InsightsCloud::Async::InsightsFullSync.perform_now()
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_hosts_sync)
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_rules_sync)
+    InsightsCloud::Async::InsightsFullSync.any_instance.expects(:plan_notifications)
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
 
     @host1.reload
     @host2.reload
 
     assert_equal 2, @host1.insights.hits.count
     assert_equal 1, @host2.insights.hits.count
-    assert_equal 'accdf444-5628-451d-bf3e-cf909ad72756', @host1.insights.uuid
-    assert_equal 'accdf444-5628-451d-bf3e-cf909ad72757', @host2.insights.uuid
   end
 
   test 'Hits counters are reset correctly' do
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(@hits).twice
 
-    InsightsCloud::Async::InsightsFullSync.perform_now()
+    InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_hosts_sync)
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
     # Invoke again
-    InsightsCloud::Async::InsightsFullSync.perform_now()
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
 
     @host1.reload
     @host2.reload
@@ -75,8 +89,6 @@ class InsightsFullSyncTest < ActiveJob::TestCase
     # Check that the counters are correct
     assert_equal 2, @host1.insights.hits.count
     assert_equal 1, @host2.insights.hits.count
-    assert_equal 'accdf444-5628-451d-bf3e-cf909ad72756', @host1.insights.uuid
-    assert_equal 'accdf444-5628-451d-bf3e-cf909ad72757', @host2.insights.uuid
   end
 
   test 'Hits ignoring non-existent hosts' do
@@ -85,7 +97,7 @@ class InsightsFullSyncTest < ActiveJob::TestCase
         {
             "hostname": "#{@host1.name}_non_existent",
             "rhel_version": "7.5",
-            "uuid": "accdf444-5628-451d-bf3e-cf909ad72756",
+            "uuid": "accdf444-5628-451d-bf3e-cf909ad00000",
             "last_seen": "2019-11-22T08:41:42.447244Z",
             "title": "New Ansible Engine packages are inaccessible when dedicated Ansible repo is not enabled",
             "solution_url": "",
@@ -98,14 +110,15 @@ class InsightsFullSyncTest < ActiveJob::TestCase
     HITS_JSON
     hits = JSON.parse(hits_json)
 
+    InsightsCloud::Async::InsightsFullSync.any_instance.stubs(:plan_hosts_sync)
     InsightsCloud::Async::InsightsFullSync.any_instance.expects(:query_insights_hits).returns(hits)
 
-    InsightsCloud::Async::InsightsFullSync.perform_now()
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsFullSync)
 
     @host1.reload
     @host2.reload
 
-    assert_nil @host1.insights
-    assert_nil @host2.insights
+    assert_equal 0, @host1.insights.hits_count
+    assert_equal 0, @host2.insights.hits_count
   end
 end

data/test/jobs/insights_resolutions_sync_test.rb

@@ -0,0 +1,77 @@
+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" => {
+        "id" => "advisor:ansible_deprecated_repo|ANSIBLE_DEPRECATED_REPO",
+        "resolution_risk" => 1,
+        "resolutions" => [
+          {
+            "description" => "Enable ansible repo and update ansible package",
+            "id" => "fix",
+            "needs_reboot" => false,
+            "resolution_risk" => 1,
+          },
+        ],
+      },
+      "advisor:hardening_logging_auditd|HARDENING_LOGGING_5_AUDITD" => {
+        "id" => "advisor:hardening_logging_auditd|HARDENING_LOGGING_5_AUDITD",
+        "resolution_risk" => 1,
+        "resolutions" => [
+          {
+            "description" => "Install and enable auditd",
+            "id" => "fix",
+            "needs_reboot" => false,
+            "resolution_risk" => 1,
+          },
+        ],
+      },
+      "advisor:network_manager_dhcp_client_network_issue|NETWORK_MANAGER_DHCP_CLIENT_NETWORK_ISSUE" => {
+        "id" => "advisor:network_manager_dhcp_client_network_issue|NETWORK_MANAGER_DHCP_CLIENT_NETWORK_ISSUE",
+        "resolution_risk" => 1,
+        "resolutions" => [
+          {
+            "description" => "Update the NetworkManager package to fix this issue",
+            "id" => "fix",
+            "needs_reboot" => false,
+            "resolution_risk" => 1,
+          },
+        ],
+      },
+      "advisor:network_tcp_connection_hang|NETWORK_TCP_CONNECTION_HANG_WARN" => {
+        "id" => "advisor:network_tcp_connection_hang|NETWORK_TCP_CONNECTION_HANG_WARN",
+        "resolution_risk" => 3,
+        "resolutions" => [
+          {
+            "description" => "Update system to the latest kernel and reboot",
+            "id" => "kernel_update",
+            "needs_reboot" => true,
+            "resolution_risk" => 3,
+          },
+          {
+            "description" => "Run in panic and scream",
+            "id" => "panic",
+            "needs_reboot" => true,
+            "resolution_risk" => 10,
+          },
+        ],
+      },
+    }
+
+    @rule = FactoryBot.create(:insights_rule, rule_id: 'network_tcp_connection_hang|NETWORK_TCP_CONNECTION_HANG_WARN')
+  end
+
+  test 'Resolutions data is replaced with data from cloud' do
+    InsightsCloud::Async::InsightsResolutionsSync.any_instance.stubs(:query_insights_resolutions).returns(@resolutions)
+
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsResolutionsSync)
+    @rule.reload
+
+    assert_equal 5, InsightsResolution.all.count
+    assert_equal 2, @rule.resolutions.count
+  end
+end

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
 
-class InsightsRulesSyncTest < ActiveJob::TestCase
   setup do
     rules_json = <<-'RULES_JSON'
     {
@@ -107,12 +110,14 @@ class InsightsRulesSyncTest < ActiveJob::TestCase
     @rules = JSON.parse(rules_json)
     @host = FactoryBot.create(:host, :managed, name: 'host1')
     @hit = FactoryBot.create(:insights_hit, host_id: @host.id)
+
+    InsightsCloud::Async::InsightsRulesSync.any_instance.stubs(:plan_resolutions)
   end
 
   test 'Hits data is replaced with data from cloud' do
     InsightsCloud::Async::InsightsRulesSync.any_instance.expects(:query_insights_rules).returns(@rules)
 
-    InsightsCloud::Async::InsightsRulesSync.perform_now()
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsRulesSync)
     @hit.reload
 
     assert_equal 2, InsightsRule.all.count
@@ -191,7 +196,7 @@ class InsightsRulesSyncTest < ActiveJob::TestCase
     InsightsCloud::Async::InsightsRulesSync.any_instance.
       stubs(:query_insights_rules).returns(@rules).then.returns(@last_rule)
 
-    InsightsCloud::Async::InsightsRulesSync.perform_now()
+    ForemanTasks.sync_task(InsightsCloud::Async::InsightsRulesSync)
 
     assert_equal 3, InsightsRule.all.count
   end

data/test/jobs/inventory_full_sync_test.rb

@@ -1,14 +1,29 @@
 require 'test_plugin_helper'
+require 'foreman_tasks/test_helpers'
 
-class InventoryFullSyncTest < ActiveJob::TestCase
-  setup do
-    @host1 = FactoryBot.create(:host, :managed, name: 'host1')
+class InventoryFullSyncTest < ActiveSupport::TestCase
+  include ForemanTasks::TestHelpers::WithInThreadExecutor
 
+  setup do
     User.current = User.find_by(login: 'secret_admin')
 
     env = FactoryBot.create(:katello_k_t_environment)
     cv = env.content_views << FactoryBot.create(:katello_content_view, organization: env.organization)
 
+    # this host would pass our plugin queries, so it could be uploaded to the cloud.
+    @host1 = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: cv.first,
+      lifecycle_environment: env,
+      organization: env.organization
+    )
+
+    pool = FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+
+    @host1.subscription_facet.pools << pool
+
     # this host would pass our plugin queries, so it could be uploaded to the cloud.
     @host2 = FactoryBot.create(
       :host,
@@ -19,7 +34,8 @@ class InventoryFullSyncTest < ActiveJob::TestCase
       organization: env.organization
     )
 
-    @host2.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+    @host2.subscription_facet.pools << pool
+    @host2_inventory_id = '4536bf5c-ff03-4154-a8c9-32ff4b40e40c'
 
     ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
 
@@ -28,8 +44,165 @@ class InventoryFullSyncTest < ActiveJob::TestCase
       "total": 3,
       "count": 3,
       "page": 1,
-      "per_page": 50,
-      "results": [{"fqdn": "#{@host1.fqdn}"}]
+      "per_page": 3,
+      "results": [
+        {
+          "insights_id": "72d29d75-dbbf-4121-9566-2f581ab77f36",
+          "rhel_machine_id": null,
+          "subscription_manager_id": "#{@host2.subscription_facet.uuid}",
+          "satellite_id": "bb72bf95-0a19-4090-8009-f0d8c68aca61",
+          "bios_uuid": "b48a7e5f-cb50-4029-a75e-366bf43db641",
+          "ip_addresses": [
+            "192.168.122.56"
+          ],
+          "fqdn": "#{@host2.fqdn}",
+          "mac_addresses": [
+            "52:54:00:aa:12:12",
+            "00:00:00:00:00:00"
+          ],
+          "external_id": null,
+          "id": "#{@host2_inventory_id}",
+          "account": "1460290",
+          "display_name": "insights-rh7.example.com",
+          "ansible_host": null,
+          "facts": [
+            {
+              "namespace": "satellite",
+              "facts": {
+                "virtual_host_name": "virt-who-nobody.home-1",
+                "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
+                "is_simple_content_access": false,
+                "distribution_version": "7.3",
+                "satellite_version": "6.8.4",
+                "organization_id": 1,
+                "is_hostname_obfuscated": false,
+                "virtual_host_uuid": "a90e6294-4766-420a-8dc0-3ec5b96d60ec"
+              }
+            },
+            {
+              "namespace": "yupana",
+              "facts": {
+                "report_platform_id": "d37afa50-08ce-4efb-a0e5-759c2a016661",
+                "report_slice_id": "5bf791d7-5e30-4a3c-929a-11dd9fa6eb72",
+                "source": "Satellite",
+                "yupana_host_id": "e85958b6-58db-4cfd-aeb6-01ee81bc0f43",
+                "account": "1460290"
+              }
+            }
+          ],
+          "reporter": "puptoo",
+          "stale_timestamp": "2021-03-19T07:57:42.466399+00:00",
+          "stale_warning_timestamp": "2021-03-26T07:57:42.466399+00:00",
+          "culled_timestamp": "2021-04-02T07:57:42.466399+00:00",
+          "created": "2021-02-08T14:36:03.613880+00:00",
+          "updated": "2021-03-18T02:57:42.535250+00:00"
+        },
+        {
+          "insights_id": "e0dc5144-d78e-43ed-97be-a7a21d1b6946",
+          "rhel_machine_id": null,
+          "subscription_manager_id": "0f97ee19-6862-4900-aea4-f121c8754776",
+          "satellite_id": "0f97ee19-6862-4900-aea4-f121c8754776",
+          "bios_uuid": "6a0b199a-8225-4ade-ae44-3b18cfc84a01",
+          "ip_addresses": [
+            "192.168.122.136"
+          ],
+          "fqdn": "#{@host1.fqdn}",
+          "mac_addresses": [
+            "52:54:00:02:d1:2a",
+            "00:00:00:00:00:00"
+          ],
+          "external_id": null,
+          "id": "3255d080-e6c1-44e2-8d72-b044b9a38d8f",
+          "account": "1460290",
+          "display_name": "insights-rh8.example.com",
+          "ansible_host": null,
+          "facts": [
+            {
+              "namespace": "satellite",
+              "facts": {
+                "virtual_host_name": "virt-who-nobody.home-1",
+                "satellite_instance_id": "fc4d0cb0-a0b0-421e-b096-b028319b8e47",
+                "is_simple_content_access": false,
+                "distribution_version": "8.3",
+                "satellite_version": "6.8.4",
+                "organization_id": 1,
+                "is_hostname_obfuscated": false,
+                "virtual_host_uuid": "a90e6294-4766-420a-8dc0-3ec5b96d60ec"
+              }
+            },
+            {
+              "namespace": "yupana",
+              "facts": {
+                "report_platform_id": "d37afa50-08ce-4efb-a0e5-759c2a016661",
+                "report_slice_id": "5bf791d7-5e30-4a3c-929a-11dd9fa6eb72",
+                "source": "Satellite",
+                "yupana_host_id": "78c62486-0ac4-406c-a4c0-3a1f81112a2d",
+                "account": "1460290"
+              }
+            }
+          ],
+          "reporter": "puptoo",
+          "stale_timestamp": "2021-03-19T06:05:12.092136+00:00",
+          "stale_warning_timestamp": "2021-03-26T06:05:12.092136+00:00",
+          "culled_timestamp": "2021-04-02T06:05:12.092136+00:00",
+          "created": "2021-02-08T13:22:50.555671+00:00",
+          "updated": "2021-03-18T01:05:12.131847+00:00"
+        },
+        {
+          "insights_id": "b533848e-465f-4f1a-9b2b-b71cb2d5239d",
+          "rhel_machine_id": null,
+          "subscription_manager_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
+          "satellite_id": "d29bde40-348e-437c-8acf-8fa98320fc1b",
+          "bios_uuid": "3cd5d972-cfb5-451a-8314-fd2f56629d7c",
+          "ip_addresses": [
+            "172.16.5.39",
+            "fd6e:2298:736e::857",
+            "fd6e:2298:736e:0:2c66:6101:9cc6:2b23"
+          ],
+          "fqdn": "rhel8-demo.oss-lab.net",
+          "mac_addresses": [
+            "6e:66:a6:fe:fc:07",
+            "00:00:00:00:00:00"
+          ],
+          "external_id": null,
+          "id": "59ab38db-c25b-4fc7-bfb2-c8eb01d865a9",
+          "account": "1460290",
+          "display_name": "rhel8-demo.oss-lab.net",
+          "ansible_host": null,
+          "facts": [
+            {
+              "namespace": "satellite",
+              "facts": {
+                "satellite_instance_id": "fb3643d8-9030-487b-b95c-684783806ffd",
+                "system_purpose_sla": "",
+                "is_simple_content_access": false,
+                "distribution_version": "8.3",
+                "satellite_version": "6.8.1",
+                "organization_id": 1,
+                "system_purpose_role": "",
+                "system_purpose_usage": "",
+                "is_hostname_obfuscated": false
+              }
+            },
+            {
+              "namespace": "yupana",
+              "facts": {
+                "report_platform_id": "fa8b924c-51ee-479d-97d2-b4623cf1d4aa",
+                "report_slice_id": "0b49103f-6471-4ade-ad74-a51537bc5691",
+                "source": "Satellite",
+                "yupana_host_id": "30e43340-12fb-445d-b23f-faaf5cbc2092",
+                "account": "1460290"
+              }
+            }
+          ],
+          "reporter": "puptoo",
+          "stale_timestamp": "2021-03-19T05:55:23.700781+00:00",
+          "stale_warning_timestamp": "2021-03-26T05:55:23.700781+00:00",
+          "culled_timestamp": "2021-04-02T05:55:23.700781+00:00",
+          "created": "2021-01-13T20:05:51.059012+00:00",
+          "updated": "2021-03-18T00:55:23.739162+00:00"
+        }
+      ]
     }
     INVENTORY_JSON
     @inventory = JSON.parse(inventory_json)
@@ -71,21 +244,21 @@ class InventoryFullSyncTest < ActiveJob::TestCase
   test 'Host status should be SYNC for inventory hosts' do
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
 
-    InventorySync::Async::InventoryFullSync.perform_now(@host1.organization)
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host2.organization)
 
-    @host1.reload
+    @host2.reload
 
-    assert_equal InventorySync::InventoryStatus::SYNC, InventorySync::InventoryStatus.where(host_id: @host1.id).first.status
+    assert_equal InventorySync::InventoryStatus::SYNC, InventorySync::InventoryStatus.where(host_id: @host2.id).first.status
+    assert_equal @host2_inventory_id, @host2.insights.uuid
   end
 
   test 'Host status should be DISCONNECT for hosts that are not returned from cloud' do
     InventorySync::Async::InventoryFullSync.any_instance.expects(:query_inventory).returns(@inventory)
     FactoryBot.create(:fact_value, fact_name: fact_names['virt::uuid'], value: '1234', host: @host2)
 
-    InventorySync::Async::InventoryFullSync.perform_now(@host2.organization)
-
+    ForemanTasks.sync_task(InventorySync::Async::InventoryFullSync, @host1.organization)
     @host2.reload
 
-    assert_equal InventorySync::InventoryStatus::DISCONNECT, InventorySync::InventoryStatus.where(host_id: @host2.id).first.status
+    assert_equal InventorySync::InventoryStatus::DISCONNECT, InventorySync::InventoryStatus.where(host_id: @host1.id).first.status
   end
 end