foreman_rh_cloud 3.0.18.1 → 3.0.19

data/test/jobs/inventory_full_sync_test.rb

@@ -2,13 +2,25 @@ require 'test_plugin_helper'
 
 class InventoryFullSyncTest < ActiveJob::TestCase
   setup do
-    @host1 = FactoryBot.create(:host, :managed, name: 'host1')
-
     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 +31,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 +41,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 +241,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

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/InventoryFilter.js

@@ -18,7 +18,7 @@ const InventoryFilter = ({
     const initialTerm =
       organization === __(ANY_ORGANIZATION) ? '' : organization;
     handleFilterChange(initialTerm);
-  }, [organization]);
+  }, []);
 
   return (
     <form id="inventory_filter_form">

data/webpack/ForemanInventoryUpload/Components/InventoryFilter/__tests__/__snapshots__/integration.test.js.snap

@@ -37,7 +37,6 @@ Object {
         "inventoryFilter": Object {
           "filterTerm": "some-org",
         },
-        "inventorySync": Object {},
       },
     },
   },

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonActions.js

@@ -1,57 +1,92 @@
 import React from 'react';
-import { API } from 'foremanReact/redux/API';
+import { get, post } from 'foremanReact/redux/API';
+import { withInterval } from 'foremanReact/redux/middlewares/IntervalMiddleware';
 import { addToast } from 'foremanReact/redux/actions/toasts';
+import { translate as __ } from 'foremanReact/common/I18n';
 import { inventoryUrl } from '../../../../ForemanInventoryHelpers';
 import Toast from './components/Toast';
 import {
-  INVENTORY_SYNC_REQUEST,
-  INVENTORY_SYNC_SUCCESS,
-  INVENTORY_SYNC_ERROR,
+  INVENTORY_SYNC,
+  INVENTORY_SYNC_TASK_UPDATE,
 } from './SyncButtonConstants';
+import { foremanUrl } from '../../../../../ForemanRhCloudHelpers';
 
-export const handleSync = () => async dispatch => {
-  dispatch({
-    type: INVENTORY_SYNC_REQUEST,
-    payload: {},
-  });
-  try {
-    const {
-      data: { syncHosts, disconnectHosts },
-    } = await API.post(inventoryUrl('tasks'));
-    dispatch({
-      type: INVENTORY_SYNC_SUCCESS,
-      payload: {
-        syncHosts,
-        disconnectHosts,
-      },
-    });
-
-    dispatch(
-      addToast({
-        sticky: true,
-        type: 'success',
-        message: (
-          <Toast syncHosts={syncHosts} disconnectHosts={disconnectHosts} />
-        ),
-      })
-    );
-  } catch ({
-    message,
-    response: { data: { message: toastMessage } = {} } = {},
-  }) {
-    dispatch({
-      type: INVENTORY_SYNC_ERROR,
-      payload: {
-        error: message,
+export const handleSync = () => dispatch => {
+  dispatch(
+    post({
+      key: INVENTORY_SYNC,
+      url: inventoryUrl('tasks'),
+      handleSuccess: ({
+        data: {
+          task: { id },
+        },
+      }) => {
+        dispatch(getSyncTaskInterval(id));
+        return dispatch(
+          taskPageRefererToast(id, 'info', __('Inventory sync has started:'))
+        );
       },
-    });
+      errorToast: inventorySyncErrorToast,
+    })
+  );
+};
 
-    dispatch(
-      addToast({
-        sticky: true,
-        type: 'error',
-        message: toastMessage || message,
+export const getSyncTaskInterval = id => dispatch => {
+  dispatch(
+    withInterval(
+      get({
+        key: INVENTORY_SYNC_TASK_UPDATE,
+        url: inventoryUrl(`tasks/${id}`),
+        handleSuccess: ({ data: { result, output } }, stopTaskInterval) => {
+          if (result === 'success') {
+            const {
+              host_statuses: { sync, disconnect },
+            } = output;
+            dispatch(
+              addToast({
+                sticky: true,
+                type: 'success',
+                message: (
+                  <Toast syncHosts={sync} disconnectHosts={disconnect} />
+                ),
+              })
+            );
+          }
+          if (result === 'error') {
+            dispatch(
+              taskPageRefererToast(
+                id,
+                'error',
+                __('Inventory sync has failed:'),
+                true
+              )
+            );
+          }
+          stopTaskInterval();
+        },
+        errorToast: inventorySyncErrorToast,
       })
-    );
-  }
+    )
+  );
 };
+
+const inventorySyncErrorToast = ({ message, response }) =>
+  `${__('Inventory sync has failed: ')} ${response.data?.message || message}`;
+
+const taskPageRefererToast = (taskID, toastType, prefix, sticky = false) =>
+  addToast({
+    sticky,
+    type: toastType,
+    message: (
+      <span>
+        {prefix}{' '}
+        <a
+          target="_blank"
+          rel="noopener noreferrer"
+          href={foremanUrl(`/foreman_tasks/tasks/${taskID}`)}
+        >
+          {__('view the task page for more details')}
+        </a>
+      </span>
+    ),
+  });

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonConstants.js

@@ -1,3 +1,3 @@
-export const INVENTORY_SYNC_REQUEST = 'INVENTORY_SYNC_REQUEST';
-export const INVENTORY_SYNC_SUCCESS = 'INVENTORY_SYNC_SUCCESS';
-export const INVENTORY_SYNC_ERROR = 'INVENTORY_SYNC_ERROR';
+export const INVENTORY_SYNC = 'INVENTORY_SYNC';
+
+export const INVENTORY_SYNC_TASK_UPDATE = 'INVENTORY_SYNC_TASK_UPDATE';

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/SyncButtonSelectors.js

@@ -1,13 +1,7 @@
-import { selectForemanInventoryUpload } from '../../../../../ForemanRhCloudSelectors';
+import { selectAPIResponse } from 'foremanReact/redux/API/APISelectors';
+import { INVENTORY_SYNC_TASK_UPDATE } from './SyncButtonConstants';
 
-export const selectInventorySync = state =>
-  selectForemanInventoryUpload(state).inventorySync;
-
-export const selectStatus = state => selectInventorySync(state).status;
-
-export const selectError = state => selectInventorySync(state).error;
-
-export const selectSyncHosts = state => selectInventorySync(state).syncHosts;
-
-export const selectDisconnectHosts = state =>
-  selectInventorySync(state).disconnectHosts;
+export const selectTaskStatus = state => {
+  const { result } = selectAPIResponse(state, INVENTORY_SYNC_TASK_UPDATE);
+  return typeof result === 'string' ? result.toUpperCase() : null;
+};

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonFixtures.js

@@ -1,9 +1 @@
-export const syncHosts = 1;
-
-export const disconnectHosts = 0;
-
-export const successResponse = { data: { syncHosts, disconnectHosts } };
-
-export const status = 'RESOLVED';
-
-export const error = 'some-error';
+export const successResponse = { data: { task: { id: 1 } } };

data/webpack/ForemanInventoryUpload/Components/PageHeader/components/SyncButton/__tests__/SyncButtonSelectors.test.js

@@ -1,35 +1,26 @@
 import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
-import { inventoryStateWrapper } from '../../../../../../ForemanRhCloudTestHelpers';
-import {
-  status,
-  error,
-  syncHosts,
-  disconnectHosts,
-} from './SyncButtonFixtures';
-import {
-  selectInventorySync,
-  selectStatus,
-  selectError,
-  selectSyncHosts,
-  selectDisconnectHosts,
-} from '../SyncButtonSelectors';
+import { selectTaskStatus } from '../SyncButtonSelectors';
 
-const state = inventoryStateWrapper({
-  inventorySync: {
-    status,
-    error,
-    syncHosts,
-    disconnectHosts,
+const state = {
+  API: {
+    INVENTORY_SYNC_TASK_UPDATE: {
+      response: {
+        endedAt: '2021-03-08T14:27:30.718+02:00',
+        output: {
+          host_statuses: {
+            sync: 0,
+            disconnect: 2,
+          },
+        },
+        result: 'pending',
+      },
+      status: 'RESOLVED',
+    },
   },
-});
+};
 
 const fixtures = {
-  'should return InventorySync': () => selectInventorySync(state),
-  'should return InventorySync status': () => selectStatus(state),
-  'should return InventorySync error': () => selectError(state),
-  'should return InventorySync SyncHosts': () => selectSyncHosts(state),
-  'should return InventorySync disconnectHosts': () =>
-    selectDisconnectHosts(state),
+  'should return InventorySync status': () => selectTaskStatus(state),
 };
 
 describe('SyncButton selectors', () =>