foreman_rh_cloud 0.9.4 → 2.0.5

data/test/controllers/uploads_controller_test.rb

@@ -18,4 +18,17 @@ 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/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/slice_generator_test.rb

@@ -17,6 +17,8 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     )
 
     @host.subscription_facet.pools << FactoryBot.create(:katello_pool, account_number: '1234', cp_id: 1)
+
+    ForemanInventoryUpload::Generators::Queries.instance_variable_set(:@fact_names, nil)
   end
 
   def interesting_facts
@@ -30,9 +32,11 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       'dmi::bios::vendor',
       'dmi::bios::version',
       'dmi::bios::relase_date',
-      'distribution::name',
       'uname::release',
       'lscpu::flags',
+      'distribution::name',
+      'distribution::version',
+      'distribution::id',
     ]
   end
 
@@ -56,6 +60,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     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 'generates a report with satellite facts' do
@@ -72,13 +77,13 @@ 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, org_id_tag['value']
+    assert_equal @host.organization_id.to_s, org_id_tag['value']
 
     version = satellite_facts['satellite_version']
     if defined?(ForemanThemeSatellite)
@@ -158,6 +163,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     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 'shows system_memory_bytes in bytes' do
@@ -174,4 +180,41 @@ class ReportGeneratorTest < 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.subscription_facet.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
+
+    batch = Host.where(id: @host.id).in_batches.first
+    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_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 = 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_not_nil(actual_profile = actual_host['system_profile'])
+    assert_equal 'Red Hat Test Linux 7.1 (TestId)', actual_profile['os_release']
+  end
 end

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.fixtures.js

@@ -28,6 +28,8 @@ export const accountID = 'user@redhat.com';
 
 export const processStatusName = 'upload_report_status';
 
+export const autoUploadEnabled = true;
+
 export const props = {
   accounts,
   fetchAccountsStatus: noop,

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountList.stories.js

@@ -1,18 +1,9 @@
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { withKnobs } from '@storybook/addon-knobs';
-import { Provider } from 'react-redux';
-import configureStore from '../../../stories/configureStore';
 import AccountList from './AccountList';
 
-const store = configureStore();
+export default {
+  title: 'AccountList',
+  component: AccountList,
+};
 
-storiesOf('Account list', module)
-  .addDecorator(withKnobs)
-  .add('Account list', () => (
-    <div style={{ margin: '20px' }}>
-      <Provider store={store}>
-        <AccountList />
-      </Provider>
-    </div>
-  ));
+export const Basic = () => <AccountList />;

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListActions.js

@@ -10,12 +10,13 @@ import {
 export const fetchAccountsStatus = () => async dispatch => {
   try {
     const {
-      data: { accounts },
+      data: { accounts, autoUploadEnabled },
     } = await API.get('accounts');
     dispatch({
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
+        autoUploadEnabled,
       },
     });
   } catch (error) {

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListReducer.js

@@ -5,6 +5,7 @@ import {
   INVENTORY_ACCOUNT_STATUS_POLLING_START,
   INVENTORY_PROCESS_RESTART,
 } from './AccountListConstants';
+import { AUTO_UPLOAD_TOGGLE } from '../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 
 const initialState = Immutable({
   accounts: {},
@@ -20,6 +21,7 @@ export default (state = initialState, action) => {
       accounts,
       accountID,
       processStatusName,
+      autoUploadEnabled,
     } = {},
   } = action;
 
@@ -28,6 +30,7 @@ export default (state = initialState, action) => {
       return state.merge({
         ...state,
         accounts,
+        autoUploadEnabled,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
@@ -49,6 +52,11 @@ export default (state = initialState, action) => {
           [processStatusName]: 'Restarting...',
         },
       });
+    case AUTO_UPLOAD_TOGGLE:
+      return state.merge({
+        ...state,
+        autoUploadEnabled,
+      });
     default:
       return state;
   }

data/webpack/ForemanInventoryUpload/Components/AccountList/AccountListSelectors.js

@@ -6,3 +6,5 @@ export const selectAccounts = state => selectAccountsList(state).accounts;
 export const selectPollingProcessID = state =>
   selectAccountsList(state).pollingProcessID;
 export const selectError = state => selectAccountsList(state).error;
+export const selectAutoUploadEnabled = state =>
+  selectAccountsList(state).autoUploadEnabled;

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/__tests__/EmptyState.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import EmptyState from '../EmptyState';
 

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ErrorState/__tests__/ErrorState.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ErrorState from '../ErrorState';
 

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItem/__tests__/ListItem.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ListItem from '../ListItem';
 import { props } from '../ListItem.fixtures';

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/ListItemStatus/__tests__/ListItemStatus.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import ListItemStatus from '../ListItemStatus';
 import { props } from '../ListItemStatus.fixtures';

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountList.test.js

@@ -1,4 +1,4 @@
-import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+import { testComponentSnapshotsWithFixtures } from '@theforeman/test';
 
 import AccountList from '../AccountList';
 import { props } from '../AccountList.fixtures';

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListActions.test.js

@@ -1,4 +1,4 @@
-import { testActionSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testActionSnapshotWithFixtures } from '@theforeman/test';
 import {
   fetchAccountsStatus,
   startAccountStatusPolling,

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListIntegration.test.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { IntegrationTestHelper } from 'react-redux-test-utils';
+import { IntegrationTestHelper } from '@theforeman/test';
 
 import AccountList from '../index';
 import reducers from '../../../ForemanInventoryUploadReducers';

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListReducer.test.js

@@ -1,4 +1,4 @@
-import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testReducerSnapshotWithFixtures } from '@theforeman/test';
 
 import {
   INVENTORY_ACCOUNT_STATUS_POLLING,
@@ -14,7 +14,9 @@ import {
   pollingProcessID,
   accountID,
   processStatusName,
+  autoUploadEnabled,
 } from '../AccountList.fixtures';
+import { AUTO_UPLOAD_TOGGLE } from '../../AutoUploadSwitcher/AutoUploadSwitcherConstants';
 
 const fixtures = {
   'should return the initial state': {},
@@ -23,6 +25,7 @@ const fixtures = {
       type: INVENTORY_ACCOUNT_STATUS_POLLING,
       payload: {
         accounts,
+        autoUploadEnabled,
       },
     },
   },
@@ -54,6 +57,14 @@ const fixtures = {
       },
     },
   },
+  'should handle AUTO_UPLOAD_TOGGLE': {
+    action: {
+      type: AUTO_UPLOAD_TOGGLE,
+      payload: {
+        autoUploadEnabled,
+      },
+    },
+  },
 };
 
 describe('AccountList reducer', () =>

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/AccountListSelectors.test.js

@@ -1,16 +1,22 @@
-import { testSelectorsSnapshotWithFixtures } from 'react-redux-test-utils';
+import { testSelectorsSnapshotWithFixtures } from '@theforeman/test';
 import {
   selectAccountsList,
   selectAccounts,
   selectPollingProcessID,
+  selectAutoUploadEnabled,
 } from '../AccountListSelectors';
-import { pollingProcessID, accounts } from '../AccountList.fixtures';
+import {
+  pollingProcessID,
+  accounts,
+  autoUploadEnabled,
+} from '../AccountList.fixtures';
 
 const state = {
   ForemanInventoryUpload: {
     accountsList: {
       accounts,
       pollingProcessID,
+      autoUploadEnabled,
     },
   },
 };
@@ -20,6 +26,8 @@ const fixtures = {
   'should return AccountList accounts': () => selectAccounts(state),
   'should return AccountList pollingProcessID': () =>
     selectPollingProcessID(state),
+  'should return AccountList autoUploadEnabled': () =>
+    selectAutoUploadEnabled(state),
 };
 
 describe('AccountList selectors', () =>

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListReducer.test.js.snap

@@ -1,5 +1,14 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`AccountList reducer should handle AUTO_UPLOAD_TOGGLE 1`] = `
+Object {
+  "accounts": Object {},
+  "autoUploadEnabled": true,
+  "error": null,
+  "pollingProcessID": 0,
+}
+`;
+
 exports[`AccountList reducer should handle INVENTORY_ACCOUNT_STATUS_POLLING 1`] = `
 Object {
   "accounts": Object {
@@ -19,6 +28,7 @@ Object {
       "upload_report_status": "success",
     },
   },
+  "autoUploadEnabled": true,
   "error": null,
   "pollingProcessID": 0,
 }

data/webpack/ForemanInventoryUpload/Components/AccountList/__tests__/__snapshots__/AccountListSelectors.test.js.snap

@@ -1,7 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`AccountList selectors should return AccountList pollingProcessID 1`] = `0`;
-
 exports[`AccountList selectors should return AccountList accounts 1`] = `
 Object {
   "Account1": Object {
@@ -22,6 +20,10 @@ Object {
 }
 `;
 
+exports[`AccountList selectors should return AccountList autoUploadEnabled 1`] = `true`;
+
+exports[`AccountList selectors should return AccountList pollingProcessID 1`] = `0`;
+
 exports[`AccountList selectors should return AccountsList 1`] = `
 Object {
   "accounts": Object {
@@ -41,6 +43,7 @@ Object {
       "upload_report_status": "success",
     },
   },
+  "autoUploadEnabled": true,
   "pollingProcessID": 0,
 }
 `;

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcher.fixtures.js

@@ -0,0 +1 @@
+export const handleToggleResponse = { data: { autoUploadEnabled: true } };

data/webpack/ForemanInventoryUpload/Components/AutoUploadSwitcher/AutoUploadSwitcher.js

@@ -0,0 +1,32 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Switch, FieldLevelHelp } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import './autoUploadSwitcher.scss';
+
+const AutoUploadSwitcher = ({ autoUploadEnabled, handleToggle }) => (
+  <div className="auto_upload_switcher">
+    <Switch
+      size="mini"
+      value={autoUploadEnabled}
+      onChange={() => handleToggle(autoUploadEnabled)}
+    />
+    <FieldLevelHelp
+      content={__(
+        'Enable automatic upload of your host inventory to the Red Hat cloud'
+      )}
+    />
+    <span>Allow Auto Upload</span>
+  </div>
+);
+
+AutoUploadSwitcher.propTypes = {
+  autoUploadEnabled: PropTypes.bool,
+  handleToggle: PropTypes.func.isRequired,
+};
+
+AutoUploadSwitcher.defaultProps = {
+  autoUploadEnabled: true,
+};
+
+export default AutoUploadSwitcher;