foreman_inventory_upload 1.0.0.beta7 → 1.0.0

data/lib/foreman_inventory_upload/version.rb

@@ -1,3 +1,3 @@
 module ForemanInventoryUpload
-  VERSION = '1.0.0.beta7'.freeze
+  VERSION = '1.0.0'.freeze
 end

data/lib/tasks/generator.rake

@@ -4,12 +4,26 @@ namespace :foreman_inventory_upload do
   namespace :report do
     desc 'Generate inventory report to be sent to Red Hat cloud'
     task generate: :environment do
-      target = ENV['target'] || ForemanInventoryUpload.facts_archive_name
-      portal_user = ENV['portal_user'] || 'anonymous'
+      portal_user = ENV['portal_user']
+      organizations = [ENV['organization_id']]
+      base_folder = ENV['target'] || Dir.pwd
 
-      archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
-      archived_report_generator.render(portal_user)
-      puts "Successfully generated #{target} for #{portal_user}"
+      unless portal_user || organizations.empty?
+        puts "Must specify either portal_user or organization_id"
+      end
+
+      if portal_user
+        puts "Generating report for all organizations associated with #{portal_user}"
+        base_folder = File.join(base_folder, portal_user)
+        organizations = ForemanInventoryUpload::Generators::Queries.organizations_for_user(portal_user).pluck(:id)
+      end
+
+      organizations.each do |organization|
+        target = File.join(base_folder, ForemanInventoryUpload.facts_archive_name(organization))
+        archived_report_generator = ForemanInventoryUpload::Generators::ArchivedReport.new(target, Logger.new(STDOUT))
+        archived_report_generator.render(organization: organization)
+        puts "Successfully generated #{target} for organization id #{organization}"
+      end
     end
   end
 end

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

@@ -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

@@ -109,4 +109,26 @@ class ReportGeneratorTest < ActiveSupport::TestCase
     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

@@ -2,20 +2,23 @@ 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 statuses = API_SUCCESS_RESPONSE;
+export const accounts = API_SUCCESS_RESPONSE;
 
 export const pollingProcessID = 0;
 
@@ -26,7 +29,7 @@ export const accountID = 'user@redhat.com';
 export const processStatusName = 'upload_report_status';
 
 export const props = {
-  statuses,
+  accounts,
   fetchAccountsStatus: noop,
   startAccountStatusPolling: noop,
   stopAccountStatusPolling: noop,

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

@@ -20,23 +20,23 @@ class AccountList extends Component {
   }
 
   render() {
-    const { statuses, error } = this.props;
-    const accountNames = Object.keys(statuses);
+    const { accounts, error } = this.props;
+    const accountIds = Object.keys(accounts);
 
     if (error) {
       return <ErrorState error={error} />;
     }
 
-    if (accountNames.length === 0) {
+    if (accountIds.length === 0) {
       return <EmptyState />;
     }
-    const items = accountNames.map((name, index) => {
-      const status = statuses[name];
+    const items = accountIds.map((accountID, index) => {
+      const account = accounts[accountID];
       return (
         <ListItem
           key={index}
-          name={name}
-          statuses={status}
+          accountID={accountID}
+          account={account}
           initExpanded={index === 0}
         />
       );
@@ -50,10 +50,11 @@ AccountList.propTypes = {
   startAccountStatusPolling: PropTypes.func,
   stopAccountStatusPolling: PropTypes.func,
   pollingProcessID: PropTypes.number,
-  statuses: PropTypes.shape({
+  account: PropTypes.shape({
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
   }),
+  accounts: PropTypes.object,
   error: PropTypes.string,
 };
 
@@ -62,10 +63,11 @@ AccountList.defaultProps = {
   startAccountStatusPolling: noop,
   stopAccountStatusPolling: noop,
   pollingProcessID: 0,
-  statuses: {
+  account: {
     generate_report_status: 'unknown',
     upload_report_status: 'unknown',
   },
+  accounts: {},
   error: '',
 };
 

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

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

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

@@ -7,7 +7,7 @@ import {
 } from './AccountListConstants';
 
 const initialState = Immutable({
-  statuses: {},
+  accounts: {},
   pollingProcessID: 0,
   error: null,
 });
@@ -17,7 +17,7 @@ export default (state = initialState, action) => {
     payload: {
       pollingProcessID,
       error,
-      statuses,
+      accounts,
       accountID,
       processStatusName,
     } = {},
@@ -27,13 +27,13 @@ export default (state = initialState, action) => {
     case INVENTORY_ACCOUNT_STATUS_POLLING:
       return state.merge({
         ...state,
-        statuses,
+        accounts,
         error: null,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_ERROR:
       return state.merge({
         ...state,
-        statuses: {},
+        accounts: {},
         error,
       });
     case INVENTORY_ACCOUNT_STATUS_POLLING_START:
@@ -42,10 +42,10 @@ export default (state = initialState, action) => {
         pollingProcessID,
       });
     case INVENTORY_PROCESS_RESTART:
-      return state.setIn(['statuses'], {
-        ...state.statuses,
+      return state.setIn(['accounts'], {
+        ...state.accounts,
         [accountID]: {
-          ...state.statuses[accountID],
+          ...state.accounts[accountID],
           [processStatusName]: 'Restarting...',
         },
       });

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

@@ -2,7 +2,7 @@ import { selectForemanInventoryUpload } from '../../ForemanInventoryUploadSelect
 
 export const selectAccountsList = state =>
   selectForemanInventoryUpload(state).accountsList;
-export const selectStatuses = state => selectAccountsList(state).statuses;
+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/ListItem/ListItem.fixtures.js

@@ -1 +1 @@
-export const props = { name: 'some-name' };
+export const props = { accountID: '1' };

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

@@ -4,34 +4,36 @@ import PropTypes from 'prop-types';
 import ListItemStatus from '../ListItemStatus';
 import Dashboard from '../../../Dashboard';
 
-const ListItem = ({ name, statuses, initExpanded }) => (
+const ListItem = ({ accountID, account, initExpanded }) => (
   <ListView.Item
     leftContent={<ListView.Icon name="user" />}
-    heading={name}
+    heading={account.label}
     additionalInfo={[
-      <ListItemStatus key={`${name}_status`} statuses={statuses} />,
+      <ListItemStatus key={`${accountID}_status`} account={account} />,
     ]}
     stacked
     hideCloseIcon
     initExpanded={initExpanded}
   >
-    <Dashboard accountID={name} statuses={statuses} />
+    <Dashboard accountID={accountID} account={account} />
   </ListView.Item>
 );
 
 ListItem.propTypes = {
-  name: PropTypes.string.isRequired,
-  statuses: PropTypes.shape({
+  accountID: PropTypes.string.isRequired,
+  account: PropTypes.shape({
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
+    label: PropTypes.string,
   }),
   initExpanded: PropTypes.bool,
 };
 
 ListItem.defaultProps = {
-  statuses: {
+  account: {
     generate_report_status: 'unknown',
     upload_report_status: 'unknown',
+    label: 'default_org_name',
   },
   initExpanded: false,
 };

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

@@ -6,9 +6,10 @@ exports[`ListItem rendering render with Props 1`] = `
   additionalInfo={
     Array [
       <ListItemStatus
-        statuses={
+        account={
           Object {
             "generate_report_status": "unknown",
+            "label": "default_org_name",
             "upload_report_status": "unknown",
           }
         }
@@ -19,7 +20,7 @@ exports[`ListItem rendering render with Props 1`] = `
   compoundExpand={false}
   compoundExpanded={false}
   description={null}
-  heading="some-name"
+  heading="default_org_name"
   hideCloseIcon={true}
   initExpanded={false}
   leftContent={
@@ -36,13 +37,14 @@ exports[`ListItem rendering render with Props 1`] = `
   stacked={true}
 >
   <Connect(Dashboard)
-    accountID="some-name"
-    statuses={
+    account={
       Object {
         "generate_report_status": "unknown",
+        "label": "default_org_name",
         "upload_report_status": "unknown",
       }
     }
+    accountID="1"
   />
 </ListViewItem>
 `;

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

@@ -1,6 +1,7 @@
 export const props = {
-  statuses: {
+  account: {
     generate_report_status: 'Exit Code: pid 22191 exit 0',
     upload_report_status: 'Exit Code: Running in pid 22376',
+    label: 'Default Org',
   },
 };

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

@@ -5,12 +5,12 @@ import { translate as __ } from 'foremanReact/common/I18n';
 import './listItemStatus.scss';
 import { getStatusIconByRegex } from './ListItemStatusHelper';
 
-const ListItemStatus = ({ statuses }) => {
+const ListItemStatus = ({ account }) => {
   const generatingStatusIcon = getStatusIconByRegex(
-    statuses.generate_report_status
+    account.generate_report_status
   );
   const uploadingStatusIcon = getStatusIconByRegex(
-    statuses.upload_report_status
+    account.upload_report_status
   );
   return (
     <Grid className="status">
@@ -27,14 +27,14 @@ const ListItemStatus = ({ statuses }) => {
 };
 
 ListItemStatus.propTypes = {
-  statuses: PropTypes.shape({
+  account: PropTypes.shape({
     generate_report_status: PropTypes.string,
     upload_report_status: PropTypes.string,
   }),
 };
 
 ListItemStatus.defaultProps = {
-  statuses: {
+  account: {
     generate_report_status: 'unknown',
     uploupload_report_statusading: 'unknown',
   },