foreman_inventory_upload 0.0.1.dev1 → 0.9.0

data/package.json

@@ -0,0 +1,125 @@
+{
+  "name": "foreman_inventory_upload",
+  "version": "0.0.1",
+  "description": "Inventory Upload =============",
+  "main": "index.js",
+  "scripts": {
+    "lint": "./node_modules/.bin/eslint -c .eslintrc webpack/",
+    "test": "node node_modules/.bin/jest --no-cache",
+    "test:watch": "node node_modules/.bin/jest --watchAll",
+    "test:current": "node node_modules/.bin/jest --watch",
+    "coveralls": "cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
+    "storybook": "start-storybook -p 6006",
+    "storybook:build": "node --max_old_space_size=2048 ./node_modules/.bin/build-storybook --config-dir .storybook --output-dir .storybook-dist",
+    "storybook:deploy": "surge --project .storybook-dist"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/theforeman/foreman_inventory_upload.git"
+  },
+  "bugs": {
+    "url": "http://projects.theforeman.org/projects/foreman_inventory_upload/issues"
+  },
+  "optionalDependencies": {
+    "babel-plugin-module-resolver": "^3.2.0"
+  },
+  "devDependencies": {
+    "@storybook/addon-actions": "^5.0.1",
+    "@storybook/addon-knobs": "^5.0.1",
+    "@storybook/react": "^5.0.1",
+    "babel-cli": "^6.10.1",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^8.2.3",
+    "babel-jest": "^23.6.0",
+    "babel-loader": "^7.1.1",
+    "babel-plugin-dynamic-import-node": "^2.0.0",
+    "babel-plugin-lodash": "^3.3.4",
+    "babel-plugin-syntax-dynamic-import": "^6.18.0",
+    "babel-plugin-transform-class-properties": "^6.24.1",
+    "babel-plugin-transform-object-assign": "^6.8.0",
+    "babel-plugin-transform-object-rest-spread": "^6.8.0",
+    "babel-preset-env": "^1.7.0",
+    "babel-preset-react": "^6.5.0",
+    "coveralls": "^3.0.0",
+    "enzyme": "^3.4.0",
+    "enzyme-adapter-react-16": "^1.4.0",
+    "enzyme-to-json": "^3.2.1",
+    "eslint": "^4.10.0",
+    "eslint-import-resolver-babel-module": "^4.0.0",
+    "eslint-plugin-patternfly-react": "0.2.0",
+    "identity-obj-proxy": "^3.0.0",
+    "jed": "^1.1.1",
+    "jest-cli": "^23.6.0",
+    "jest-prop-type-error": "^1.1.0",
+    "node-sass": "^4.5.0",
+    "patternfly": "^3.58.0",
+    "prettier": "^1.13.5",
+    "raf": "^3.4.0",
+    "react-redux-test-utils": "^0.1.1",
+    "react-remarkable": "^1.1.3",
+    "sass-loader": "^6.0.7",
+    "stylelint": "^9.3.0",
+    "stylelint-config-standard": "^18.0.0",
+    "surge": "^0.20.3"
+  },
+  "dependencies": {
+    "babel-polyfill": "^6.26.0",
+    "classnames": "^2.2.5",
+    "lodash": "^4.17.10",
+    "patternfly-react": "^2.19.1",
+    "prop-types": "^15.6.0",
+    "react": "^16.4.0",
+    "react-dom": "^16.4.0",
+    "react-intl": "^2.8.0",
+    "react-redux": "^5.0.6",
+    "redux": "^3.6.0",
+    "redux-thunk": "^2.2.0",
+    "reselect": "^3.0.1",
+    "seamless-immutable": "^7.1.2",
+    "urijs": "^1.18.10",
+    "uuid": "^3.0.1"
+  },
+  "jest": {
+    "automock": true,
+    "verbose": true,
+    "testMatch": [
+      "**/*.test.js"
+    ],
+    "testURL": "http://localhost/",
+    "collectCoverage": true,
+    "collectCoverageFrom": [
+      "webpack/**/*.js",
+      "!webpack/index.js",
+      "!webpack/test_setup.js",
+      "!webpack/**/bundle*",
+      "!webpack/stories/**",
+      "!webpack/**/*stories.js"
+    ],
+    "coverageReporters": [
+      "lcov"
+    ],
+    "unmockedModulePathPatterns": [
+      "webpack/",
+      "react",
+      "node_modules/"
+    ],
+    "moduleNameMapper": {
+      "^.+\\.(png|gif|css|scss)$": "identity-obj-proxy"
+    },
+    "globals": {
+      "__testing__": true
+    },
+    "transform": {
+      "^.+\\.js$": "babel-jest"
+    },
+    "moduleDirectories": [
+      "node_modules",
+      "webpack"
+    ],
+    "setupFiles": [
+      "raf/polyfill",
+      "jest-prop-type-error",
+      "./webpack/test_setup.js"
+    ]
+  }
+}

data/test/controllers/{statuses_controller_test.rb → accounts_controller_test.rb}

@@ -1,25 +1,24 @@
 require 'test_plugin_helper'
 
-class StatusesControllerTest < ActionController::TestCase
-  tests ForemanInventoryUpload::StatusesController
+class AccountsControllerTest < ActionController::TestCase
+  tests ForemanInventoryUpload::AccountsController
 
   include FolderIsolation
 
   test 'Returns statuses for each process type' do
-    configuration = RedhatAccess::TelemetryConfiguration.new(enable_telemetry: true, portal_user: 'test')
-    configuration.save!
+    test_org = FactoryBot.create(:organization)
 
-    generate_label = ForemanInventoryUpload::Async::GenerateReportJob.output_label('test')
+    generate_label = ForemanInventoryUpload::Async::GenerateReportJob.output_label(test_org.id)
     generate_output = ForemanInventoryUpload::Async::ProgressOutput.register(generate_label)
     generate_output.status = 'generate_status_test'
-    upload_label = ForemanInventoryUpload::Async::UploadReportJob.output_label('test')
+    upload_label = ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id)
     upload_output = ForemanInventoryUpload::Async::ProgressOutput.register(upload_label)
     upload_output.status = 'upload_status_test'
 
     get :index, session: set_session_user
 
     assert_response :success
-    actual = JSON.parse(response.body)['statuses']['test']
+    actual = JSON.parse(response.body)['accounts'][test_org.id.to_s]
     assert_equal 'generate_status_test', actual['generate_report_status']
     assert_equal 'upload_status_test', actual['upload_report_status']
   end

data/test/controllers/reports_controller_test.rb

@@ -5,14 +5,14 @@ class ReportsControllerTest < ActionController::TestCase
 
   test 'Returns latest report generation status' do
     progress_output = mock('progress_output')
-    test_portal_user = 'test_portal_user'
+    test_org = FactoryBot.create(:organization)
     ForemanInventoryUpload::Async::ProgressOutput
       .expects(:get)
-      .with(ForemanInventoryUpload::Async::GenerateReportJob.output_label(test_portal_user))
+      .with(ForemanInventoryUpload::Async::GenerateReportJob.output_label(test_org.id))
       .returns(progress_output)
     progress_output.expects(:full_output).returns('test output')
 
-    get :last, params: { portal_user: test_portal_user }, session: set_session_user
+    get :last, params: { organization_id: test_org.id }, session: set_session_user
 
     assert_response :success
     actual = JSON.parse(response.body)

data/test/controllers/uploads_controller_test.rb

@@ -5,14 +5,14 @@ class UploadsControllerTest < ActionController::TestCase
 
   test 'Returns latest upload status' do
     progress_output = mock('progress_output')
-    test_portal_user = 'test_portal_user'
+    test_org = FactoryBot.create(:organization)
     ForemanInventoryUpload::Async::ProgressOutput
       .expects(:get)
-      .with(ForemanInventoryUpload::Async::UploadReportJob.output_label(test_portal_user))
+      .with(ForemanInventoryUpload::Async::UploadReportJob.output_label(test_org.id))
       .returns(progress_output)
     progress_output.expects(:full_output).returns('test output')
 
-    get :last, params: { portal_user: test_portal_user }, session: set_session_user
+    get :last, params: { organization_id: test_org.id }, session: set_session_user
 
     assert_response :success
     actual = JSON.parse(response.body)

data/test/unit/archived_report_generator_test.rb

@@ -32,7 +32,7 @@ class ArchivedReportGeneratorTest < ActiveSupport::TestCase
       'dmi::bios::relase_date',
       'distribution::name',
       'uname::release',
-      'lscpu::flags'
+      'lscpu::flags',
     ]
   end
 
@@ -46,13 +46,13 @@ class ArchivedReportGeneratorTest < ActiveSupport::TestCase
 
   test 'generates a report for a single host' do
     batches = Host.where(id: @host.id).in_batches
-    portal_user = 'test_portal_user'
+    test_org = FactoryBot.create(:organization)
 
-    ForemanInventoryUpload::Generators::Queries.expects(:for_report).with(portal_user).returns(batches)
+    ForemanInventoryUpload::Generators::Queries.expects(:for_org).with(test_org.id).returns(batches)
     Dir.mktmpdir do |tmpdir|
       target = File.join(tmpdir, 'test.tar.gz')
       generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
-      generator.render(portal_user)
+      generator.render(organization: test_org.id)
 
       files = Dir["#{tmpdir}/*"]
       assert_equal "#{tmpdir}/test.tar.gz", files.first

data/test/unit/slice_generator_test.rb

@@ -32,7 +32,7 @@ class ReportGeneratorTest < ActiveSupport::TestCase
       'dmi::bios::relase_date',
       'distribution::name',
       'uname::release',
-      'lscpu::flags'
+      'lscpu::flags',
     ]
   end
 
@@ -57,4 +57,78 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     assert_equal @host.fqdn, actual_host['fqdn']
     assert_equal '1234', actual_host['account']
   end
+
+  test 'generates a report with satellite facts' do
+    Foreman.expects(:instance_id).returns('satellite-id')
+    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"))
+
+    facts = actual['hosts'].first['facts'].first
+    assert_equal 'satellite', facts['namespace']
+    satellite_facts = facts['facts']
+    assert_equal 'satellite-id', satellite_facts['satellite_instance_id']
+    assert_equal @host.organization_id, satellite_facts['organization_id']
+
+    version = satellite_facts['satellite_version']
+    if defined?(ForemanThemeSatellite)
+      assert_equal ForemanThemeSatellite::SATELLITE_VERSION, version
+    else
+      assert_nil version
+    end
+  end
+
+  test 'generates a report for a host with hypervisor' do
+    hypervisor_host = FactoryBot.create(
+      :host,
+      :with_subscription,
+      :with_content,
+      content_view: @host.content_view,
+      lifecycle_environment: @host.lifecycle_environment,
+      organization: @host.organization
+    )
+
+    @host.subscription_facet.hypervisor_host = hypervisor_host
+    @host.save!
+
+    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_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']
+    assert_not_nil(fact_values = host_facts['facts'])
+    assert_equal hypervisor_host.name, fact_values['virtual_host_name']
+    assert_equal hypervisor_host.subscription_facet.uuid, fact_values['virtual_host_uuid']
+  end
+
+  test 'generates a report with system purpose' do
+    @host.subscription_facet.purpose_usage = 'test_usage'
+    @host.subscription_facet.purpose_role = 'test_role'
+    @host.subscription_facet.save!
+
+    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_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']
+    assert_not_nil(fact_values = host_facts['facts'])
+    assert_equal 'test_usage', fact_values['system_purpose_usage']
+    assert_equal 'test_role', fact_values['system_purpose_role']
+  end
 end

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

@@ -0,0 +1,37 @@
+import { noop } from 'patternfly-react';
+
+export const API_SUCCESS_RESPONSE = {
+  Account1: {
+    label: 'test_org1',
+    upload_report_status: 'running',
+    generate_report_status: 'running',
+  },
+  Account2: {
+    label: 'test_org2',
+    upload_report_status: 'unknown',
+    generate_report_status: 'failure',
+  },
+  Account3: {
+    label: 'test_org3',
+    upload_report_status: 'success',
+    generate_report_status: 'running',
+  },
+};
+
+export const accounts = API_SUCCESS_RESPONSE;
+
+export const pollingProcessID = 0;
+
+export const error = 'some-error';
+
+export const accountID = 'user@redhat.com';
+
+export const processStatusName = 'upload_report_status';
+
+export const props = {
+  accounts,
+  fetchAccountsStatus: noop,
+  startAccountStatusPolling: noop,
+  stopAccountStatusPolling: noop,
+  pollingProcessID,
+};

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

@@ -0,0 +1,74 @@
+import React, { Component } from 'react';
+import { ListView, noop } from 'patternfly-react';
+import PropTypes from 'prop-types';
+import ListItem from './Components/ListItem';
+import EmptyState from './Components/EmptyState';
+import ErrorState from './Components/ErrorState';
+import './accountList.scss';
+
+class AccountList extends Component {
+  componentDidMount() {
+    const { fetchAccountsStatus, startAccountStatusPolling } = this.props;
+    fetchAccountsStatus();
+    const pollingProcessID = setInterval(fetchAccountsStatus, 5000);
+    startAccountStatusPolling(pollingProcessID);
+  }
+
+  componentWillUnmount() {
+    const { stopAccountStatusPolling, pollingProcessID } = this.props;
+    stopAccountStatusPolling(pollingProcessID);
+  }
+
+  render() {
+    const { accounts, error } = this.props;
+    const accountIds = Object.keys(accounts);
+
+    if (error) {
+      return <ErrorState error={error} />;
+    }
+
+    if (accountIds.length === 0) {
+      return <EmptyState />;
+    }
+    const items = accountIds.map((accountID, index) => {
+      const account = accounts[accountID];
+      return (
+        <ListItem
+          key={index}
+          accountID={accountID}
+          account={account}
+          initExpanded={index === 0}
+        />
+      );
+    });
+    return <ListView className="account_list">{items}</ListView>;
+  }
+}
+
+AccountList.propTypes = {
+  fetchAccountsStatus: PropTypes.func,
+  startAccountStatusPolling: PropTypes.func,
+  stopAccountStatusPolling: PropTypes.func,
+  pollingProcessID: PropTypes.number,
+  account: PropTypes.shape({
+    generate_report_status: PropTypes.string,
+    upload_report_status: PropTypes.string,
+  }),
+  accounts: PropTypes.object,
+  error: PropTypes.string,
+};
+
+AccountList.defaultProps = {
+  fetchAccountsStatus: noop,
+  startAccountStatusPolling: noop,
+  stopAccountStatusPolling: noop,
+  pollingProcessID: 0,
+  account: {
+    generate_report_status: 'unknown',
+    upload_report_status: 'unknown',
+  },
+  accounts: {},
+  error: '',
+};
+
+export default AccountList;

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

@@ -0,0 +1,18 @@
+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();
+
+storiesOf('Account list', module)
+  .addDecorator(withKnobs)
+  .add('Account list', () => (
+    <div style={{ margin: '20px' }}>
+      <Provider store={store}>
+        <AccountList />
+      </Provider>
+    </div>
+  ));

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

@@ -0,0 +1,65 @@
+import API from 'foremanReact/API';
+import {
+  INVENTORY_ACCOUNT_STATUS_POLLING,
+  INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
+  INVENTORY_ACCOUNT_STATUS_POLLING_START,
+  INVENTORY_ACCOUNT_STATUS_POLLING_STOP,
+  INVENTORY_PROCESS_RESTART,
+} from './AccountListConstants';
+
+export const fetchAccountsStatus = () => async dispatch => {
+  try {
+    const {
+      data: { accounts },
+    } = await API.get('accounts');
+    dispatch({
+      type: INVENTORY_ACCOUNT_STATUS_POLLING,
+      payload: {
+        accounts,
+      },
+    });
+  } catch (error) {
+    dispatch({
+      type: INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
+      payload: {
+        error: error.message,
+      },
+    });
+  }
+};
+
+export const startAccountStatusPolling = pollingProcessID => ({
+  type: INVENTORY_ACCOUNT_STATUS_POLLING_START,
+  payload: {
+    pollingProcessID,
+  },
+});
+
+export const stopAccountStatusPolling = pollingProcessID => dispatch => {
+  clearInterval(pollingProcessID);
+  dispatch({
+    type: INVENTORY_ACCOUNT_STATUS_POLLING_STOP,
+  });
+};
+
+export const restartProcess = (accountID, activeTab) => dispatch => {
+  let processController = null;
+  let processStatusName = null;
+
+  if (activeTab === 'uploading') {
+    processController = 'uploads';
+    processStatusName = 'upload_report_status';
+  } else {
+    processController = 'reports';
+    processStatusName = 'generate_report_status';
+  }
+
+  API.post(`${accountID}/${processController}`);
+  dispatch({
+    type: INVENTORY_PROCESS_RESTART,
+    payload: {
+      accountID,
+      processStatusName,
+    },
+  });
+};

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

@@ -0,0 +1,9 @@
+export const INVENTORY_ACCOUNT_STATUS_POLLING =
+  'INVENTORY_ACCOUNT_STATUS_POLLING';
+export const INVENTORY_ACCOUNT_STATUS_POLLING_ERROR =
+  'INVENTORY_ACCOUNT_STATUS_POLLING_ERROR';
+export const INVENTORY_ACCOUNT_STATUS_POLLING_START =
+  'INVENTORY_ACCOUNT_STATUS_POLLING_START';
+export const INVENTORY_ACCOUNT_STATUS_POLLING_STOP =
+  'INVENTORY_ACCOUNT_STATUS_POLLING_STOP';
+export const INVENTORY_PROCESS_RESTART = 'INVENTORY_PROCESS_RESTART';

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

@@ -0,0 +1,55 @@
+import Immutable from 'seamless-immutable';
+import {
+  INVENTORY_ACCOUNT_STATUS_POLLING,
+  INVENTORY_ACCOUNT_STATUS_POLLING_ERROR,
+  INVENTORY_ACCOUNT_STATUS_POLLING_START,
+  INVENTORY_PROCESS_RESTART,
+} from './AccountListConstants';
+
+const initialState = Immutable({
+  accounts: {},
+  pollingProcessID: 0,
+  error: null,
+});
+
+export default (state = initialState, action) => {
+  const {
+    payload: {
+      pollingProcessID,
+      error,
+      accounts,
+      accountID,
+      processStatusName,
+    } = {},
+  } = action;
+
+  switch (action.type) {
+    case INVENTORY_ACCOUNT_STATUS_POLLING:
+      return state.merge({
+        ...state,
+        accounts,
+        error: null,
+      });
+    case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
+      return state.merge({
+        ...state,
+        accounts: {},
+        error,
+      });
+    case INVENTORY_ACCOUNT_STATUS_POLLING_START:
+      return state.merge({
+        ...state,
+        pollingProcessID,
+      });
+    case INVENTORY_PROCESS_RESTART:
+      return state.setIn(['accounts'], {
+        ...state.accounts,
+        [accountID]: {
+          ...state.accounts[accountID],
+          [processStatusName]: 'Restarting...',
+        },
+      });
+    default:
+      return state;
+  }
+};

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

@@ -0,0 +1,8 @@
+import { selectForemanInventoryUpload } from '../../ForemanInventoryUploadSelectors';
+
+export const selectAccountsList = state =>
+  selectForemanInventoryUpload(state).accountsList;
+export const selectAccounts = state => selectAccountsList(state).accounts;
+export const selectPollingProcessID = state =>
+  selectAccountsList(state).pollingProcessID;
+export const selectError = state => selectAccountsList(state).error;

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

@@ -0,0 +1,16 @@
+import React from 'react';
+import { EmptyState, Spinner } from 'patternfly-react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import './emptyState.scss';
+
+const inventoryEmptyState = () => (
+  <EmptyState>
+    <Spinner loading inline size="lg" />
+    <EmptyState.Title>
+      {__('Fetching data about your accounts')}
+    </EmptyState.Title>
+    <EmptyState.Info>{__('Loading')}...</EmptyState.Info>
+  </EmptyState>
+);
+
+export default inventoryEmptyState;

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

@@ -0,0 +1,13 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import EmptyState from '../EmptyState';
+
+const fixtures = {
+  'render without Props': {},
+  /** fixtures, props for the component */
+};
+
+describe('EmptyState', () => {
+  describe('rendering', () =>
+    testComponentSnapshotsWithFixtures(EmptyState, fixtures));
+});

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

@@ -0,0 +1,26 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`EmptyState rendering render without Props 1`] = `
+<EmptyState
+  className=""
+>
+  <Spinner
+    className=""
+    inline={true}
+    inverse={false}
+    loading={true}
+    size="lg"
+  />
+  <EmptyStateTitle
+    className=""
+  >
+    Fetching data about your accounts
+  </EmptyStateTitle>
+  <EmptyStateInfo
+    className=""
+  >
+    Loading
+    ...
+  </EmptyStateInfo>
+</EmptyState>
+`;

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/emptyState.scss

@@ -0,0 +1,7 @@
+.blank-slate-pf {
+  margin-top: 100px;
+
+  .spinner {
+    float: none;
+  }
+}

data/webpack/ForemanInventoryUpload/Components/AccountList/Components/EmptyState/index.js

@@ -0,0 +1 @@
+export { default } from './EmptyState';