foreman_ansible 6.2.0 → 6.3.0

data/test/unit/services/api_roles_importer_test.rb

@@ -12,11 +12,28 @@ class ApiRolesImporterTest < ActiveSupport::TestCase
   end
 
   test 'should import roles' do
-    @importer.stubs(:import_role_names).returns(:new => @test_roles)
-    res = @importer.import!
-    assert_equal 2, res.count
-    assert AnsibleRole.find_by :name => @test_roles.first.name
-    assert AnsibleRole.find_by :name => @test_roles.last.name
+    @importer.stubs(:prepare_ansible_import_rows).returns(
+      [{
+        :name => 'test_user.test_name',
+        :id => nil,
+        :role_action => 'Import Role',
+        :variables => 'Add: 7',
+        :hosts_count => '',
+        :hostgroup_count => '',
+        :kind => 'new'
+      },
+       {
+         :name => 'some_user.some_role',
+         :id => nil,
+         :role_action => 'Import Role',
+         :variables => 'Add: 3',
+         :hosts_count => '',
+         :hostgroup_count => '',
+         :kind => 'new'
+       }]
+    )
+    res = @importer.import!([@test_roles.first.name, @test_roles.last.name])
+    assert_equal 2, res['changed']['new'].count
   end
 
   test 'should obsolete roles' do

data/test/unit/services/fact_parser_test.rb

@@ -29,6 +29,22 @@ module ForemanAnsible
       refute @facts_parser.environment
     end
 
+    test 'calculates virtual reported data' do
+      refute @facts_parser.virtual
+    end
+
+    test 'calculates ram reported data' do
+      assert_equal 7899, @facts_parser.ram
+    end
+
+    test 'calculates sockets reported data' do
+      assert_equal 1, @facts_parser.sockets
+    end
+
+    test 'calculates cores reported data' do
+      assert_equal 2, @facts_parser.cores
+    end
+
     test 'creates operatingsystem from operating system options' do
       sample_mock = mock
       major_fact = @facts_parser.facts['ansible_distribution_major_version']

data/test/unit/services/inventory_creator_test.rb

@@ -61,8 +61,7 @@ module ForemanAnsible
                    connection_params['ansible_user']
       refute_equal Setting['remote_execution_ssh_port'],
                    connection_params['ansible_port']
-      assert_equal ForemanRemoteExecutionCore.settings[:ssh_identity_key_file],
-                   connection_params['ansible_ssh_private_key_file']
+      assert_nil   connection_params['ansible_ssh_private_key_file']
       assert_equal extra_options['ansible_port'],
                    connection_params['ansible_port']
       assert_equal Setting['ansible_winrm_server_cert_validation'],
@@ -128,11 +127,15 @@ module ForemanAnsible
     end
 
     test 'ansible_roles are passed as top-level "hostvars"' do
+      host = FactoryBot.create(:host)
       roles = [].tap do |array|
-        2.times { array << FactoryBot.create(:ansible_role) }
+        2.times do |idx|
+          role = FactoryBot.create(:ansible_role)
+          FactoryBot.create(:host_ansible_role, :host_id => host.id, :ansible_role_id => role.id, :position => idx)
+          array << role
+        end
       end
 
-      host = FactoryBot.create(:host, :ansible_roles => roles)
       inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
       inventory_roles = inventory['_meta']['hostvars'][host.name]['foreman_ansible_roles']
       assert_equal 2, inventory_roles.count
@@ -156,7 +159,9 @@ module ForemanAnsible
         end
       end
 
-      host = FactoryBot.create(:host, :ansible_roles => [role])
+      host = FactoryBot.create(:host)
+      FactoryBot.create(:host_ansible_role, :host_id => host.id, :ansible_role_id => role.id, :position => 0)
+
       inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
       host_inventory = inventory['_meta']['hostvars'][host.name]
       assert host_inventory[variables.first.key]
@@ -174,7 +179,9 @@ module ForemanAnsible
         end
       end
 
-      host = FactoryBot.create(:host, :ansible_roles => [role])
+      host = FactoryBot.create(:host)
+      FactoryBot.create(:host_ansible_role, :host_id => host.id, :ansible_role_id => role.id, :position => 0)
+
       inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
       inventory_roles = inventory['_meta']['hostvars'][host.name]['foreman']
       refute inventory_roles[variables.first.key]
@@ -188,7 +195,8 @@ module ForemanAnsible
                         :ansible_role_id => role.id,
                         :default_value => "variable value",
                         :override => true)
-      host = FactoryBot.create(:host, :ansible_roles => [role])
+      host = FactoryBot.create(:host)
+      FactoryBot.create(:host_ansible_role, :host_id => host.id, :ansible_role_id => role.id, :position => 0)
       host.expects(:host_params).returns('test_var' => 'param value').at_least_once
       inventory = ForemanAnsible::InventoryCreator.new([host]).to_hash
       assert_equal 'variable value', inventory['_meta']['hostvars'][host.name]['test_var']

data/test/unit/services/ui_roles_importer_test.rb

@@ -26,7 +26,7 @@ class UiRolesImporterTest < ActiveSupport::TestCase
     @role = FactoryBot.create(:ansible_role)
     new_role_name = 'test_role.foreman'
     @new_role = { :id => nil, :name => new_role_name }
-    @changes = { 'new' => { 'test_role.foreman' => @new_role.to_json },
-                 'obsolete' => { @role.name => @role.to_json } }
+    @changes = { 'new' => { 'test_role.foreman' => @new_role },
+                 'obsolete' => { @role.name => @role } }
   end
 end

data/webpack/__mocks__/foremanReact/common/helpers.js

@@ -0,0 +1,13 @@
+import { camelCase } from 'lodash';
+
+export const propsToCamelCase = ob =>
+  propsToCase(camelCase, 'propsToCamelCase only takes objects', ob);
+
+const propsToCase = (casingFn, errorMsg, ob) => {
+  if (typeof ob !== 'object') throw Error(errorMsg);
+
+  return Object.keys(ob).reduce((memo, key) => {
+    memo[casingFn(key)] = ob[key];
+    return memo;
+  }, {});
+};

data/webpack/__mocks__/foremanReact/components/common/forms/OrderableSelect/helpers.js

@@ -0,0 +1,5 @@
+import React from 'react';
+
+export const orderable = (Component, orderableProps) => props => (
+  <Component {...orderableProps} {...props} />
+);

data/webpack/__mocks__/foremanReact/redux/API.js

@@ -0,0 +1,7 @@
+export const API = {
+  get: jest.fn(),
+  put: jest.fn(),
+  post: jest.fn(),
+  delete: jest.fn(),
+  patch: jest.fn(),
+};

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariables.js

@@ -0,0 +1,178 @@
+import React, { useState } from 'react';
+import {
+  Table,
+  TableHeader,
+  TableBody,
+  cellWidth,
+} from '@patternfly/react-table';
+import {
+  Button,
+  Toolbar,
+  ToolbarGroup,
+  ToolbarContent,
+  ToolbarItem,
+  Checkbox,
+  Pagination,
+} from '@patternfly/react-core';
+
+import PropTypes from 'prop-types';
+import { DEFAULT_PER_PAGE } from './AnsibleRolesAndVariablesConstants';
+import './AnsibleRolesAndVariables.scss';
+
+const ImportRolesAndVariablesTable = ({
+  columnsData,
+  rowsData,
+  proxy,
+  onSubmit,
+  onCancel,
+}) => {
+  const columns = columnsData.map(col => ({
+    ...col,
+    transforms: [cellWidth(10)],
+  }));
+  const [rows, setRows] = useState(rowsData);
+
+  const [isChecked, setIsChecked] = useState(false);
+  const [selectedRowsCount, setSelectRowsCount] = useState(0);
+
+  const [page, setPage] = useState();
+  const [perPage, setPerPage] = useState(DEFAULT_PER_PAGE);
+  const [paginatedRows, setPaginatedRows] = useState(rows.slice(0, perPage));
+
+  const onSelect = (event, isSelected, rowId, row) => {
+    const selectableRowLength = rows.filter(
+      tempRow => tempRow.parent === undefined
+    ).length;
+    let rowsCount = selectedRowsCount;
+    const tempRows = rows.map(tempRow => {
+      if (rowId === -1) {
+        tempRow.selected = isSelected;
+        setIsChecked(isSelected);
+        setSelectRowsCount(isSelected ? selectableRowLength : 0);
+      } else if (tempRow.id === row.id) {
+        tempRow.selected = isSelected;
+        rowsCount = isSelected ? selectedRowsCount + 1 : selectedRowsCount - 1;
+        if (rowsCount > 0 && rowsCount === selectableRowLength) {
+          setIsChecked(true);
+        } else {
+          setIsChecked(false);
+        }
+        setSelectRowsCount(rowsCount);
+      }
+      return tempRow;
+    });
+    setRows(tempRows);
+  };
+
+  const SelectAll = checked => {
+    onSelect(null, checked, -1);
+  };
+
+  const handleSetPage = (event, newPage) => {
+    const startIdx = (newPage - 1) * perPage;
+    const endIdx =
+      rows.length < newPage * perPage ? rows.length : newPage * perPage;
+    setPage(newPage);
+    setPaginatedRows(rows.slice(startIdx, endIdx));
+  };
+
+  const handlePerPageSelect = (
+    event,
+    newPerPage,
+    newPage,
+    startIdx,
+    endIdx
+  ) => {
+    setPerPage(newPerPage);
+    setPage(newPage);
+    setPaginatedRows(rows.slice(startIdx, endIdx));
+  };
+
+  const renderPagination = (variant = 'top') => (
+    <Pagination
+      isCompact
+      itemCount={rows.length}
+      page={page}
+      perPage={perPage}
+      defaultToFullPage
+      onSetPage={handleSetPage}
+      onPerPageSelect={handlePerPageSelect}
+      perPageOptions={[
+        { title: '3', value: 3 },
+        { title: '5', value: 5 },
+        { title: '10', value: 10 },
+      ]}
+      titles={{
+        paginationTitle: `${variant} pagination`,
+      }}
+    />
+  );
+
+  const renderSelectAll = () => (
+    <Toolbar>
+      <ToolbarContent>
+        <ToolbarGroup variant="icon-button-group">
+          <ToolbarItem>
+            <Checkbox
+              isChecked={isChecked}
+              onChange={SelectAll}
+              aria-label="select all checkbox"
+              id="select-all"
+              name="select-all"
+              label={isChecked ? 'Deselect all' : 'Select all'}
+            />
+          </ToolbarItem>
+        </ToolbarGroup>
+      </ToolbarContent>
+    </Toolbar>
+  );
+
+  const renderSubmitAndCancel = () => (
+    <div className="submit-cancel-btns">
+      <br />
+      <br />
+      <Button variant="primary" onClick={() => onSubmit(rows, proxy)}>
+        Submit
+      </Button>
+      <Button variant="secondary" onClick={onCancel}>
+        Cancel
+      </Button>
+    </div>
+  );
+
+  return (
+    <div id="import-ansible-roles-variables">
+      {renderSelectAll()}
+      <Table
+        aria-label="import roles and variables"
+        onSelect={onSelect}
+        rows={paginatedRows}
+        cells={columns}
+        canSelectAll={false}
+      >
+        <TableHeader />
+        <TableBody />
+      </Table>
+      {renderPagination()}
+      {renderSubmitAndCancel()}
+    </div>
+  );
+};
+
+ImportRolesAndVariablesTable.defaultProps = {
+  columnsData: undefined,
+  rowsData: [],
+  proxy: undefined,
+  onSubmit: undefined,
+  onCancel: undefined,
+};
+
+ImportRolesAndVariablesTable.propTypes = {
+  columnsData: PropTypes.array,
+  rowsData: PropTypes.array,
+  proxy: PropTypes.number,
+  onSubmit: PropTypes.func,
+  onCancel: PropTypes.func,
+};
+
+export default ImportRolesAndVariablesTable;

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariables.scss

@@ -0,0 +1,9 @@
+#import-ansible-roles-variables {
+  .submit-cancel-btns {
+    padding-top: 20px;
+
+    button {
+      margin-right: 5px;
+    }
+  }
+}

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesActions.js

@@ -0,0 +1,39 @@
+import React from 'react';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { post } from 'foremanReact/redux/API';
+import { push } from 'connected-react-router';
+import { prepareResult } from './AnsibleRolesAndVariablesHelpers';
+import {
+  ANSIBLE_ROLE_CONFIRM_IMPORT_PATH,
+  ANSIBLE_ROLES_INDEX,
+} from './AnsibleRolesAndVariablesConstants';
+
+export const foremanUrl = path => `${window.URL_PREFIX}${path}`;
+
+export const onSubmit = (rows, proxy) => dispatch => {
+  const params = prepareResult(rows);
+  dispatch(
+    post({
+      key: 'import_ansible_v_r',
+      url: ANSIBLE_ROLE_CONFIRM_IMPORT_PATH,
+      params: { changed: params, proxy },
+      handleSuccess: () => {
+        setTimeout(() => dispatch(push(ANSIBLE_ROLES_INDEX)), 500);
+      },
+      successToast: response => (
+        <span>
+          {__('Import roles and variables started: ')}
+          <a
+            target="_blank"
+            rel="noopener noreferrer"
+            href={foremanUrl(`/foreman_tasks/tasks/${response.data?.task?.id}`)}
+          >
+            {__('view the task in progress')}
+          </a>
+        </span>
+      ),
+      errorToast: error =>
+        `${__('Failed to import roles and variables ')} ${error}`,
+    })
+  );
+};

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesConstants.js

@@ -0,0 +1,4 @@
+export const ANSIBLE_ROLES_INDEX = '/ansible/ansible_roles';
+export const ANSIBLE_ROLE_CONFIRM_IMPORT_PATH =
+  '/ansible/ansible_roles/confirm_import';
+export const DEFAULT_PER_PAGE = 5;

data/webpack/components/AnsibleRolesAndVariables/AnsibleRolesAndVariablesHelpers.js

@@ -0,0 +1,11 @@
+export const prepareResult = rows => {
+  const result = {};
+  const selectRows = rows.filter(row => row.selected === true);
+  selectRows.forEach(row => {
+    result[row.kind] = {};
+  });
+  selectRows.forEach(row => {
+    result[row.kind][row.role.name] = row.role;
+  });
+  return result;
+};

data/webpack/components/AnsibleRolesAndVariables/__test__/AnsibleRolesAndVariablesHelpers.test.js

@@ -0,0 +1,50 @@
+import { prepareResult } from '../AnsibleRolesAndVariablesHelpers';
+
+const bennojoy = { created_at: null, id: null, name: 'bennojoy.ntp' };
+const gitRole = { created_at: null, id: null, name: '0ta2.git_role' };
+const jriguera = { created_at: null, id: null, name: 'jriguera.monit' };
+const rows = [
+  {
+    cells: [
+      'bennojoy.ntp',
+      'Update Role Variables',
+      'Add: 1 Remove: 2 ',
+      '',
+      '',
+    ],
+    kind: 'old',
+    id: 'bennojoy.ntp',
+    role: bennojoy,
+    selected: true,
+  },
+  {
+    cells: ['0ta2.git_role', 'Import Role ', 'Add: 5 ', '', ''],
+    kind: 'new',
+    id: '0ta2.git_role',
+    role: gitRole,
+    selected: true,
+  },
+  {
+    cells: ['jriguera.monit', 'Import Role ', 'Add: 12 ', '', ''],
+    kind: 'new',
+    id: 'jriguera.monit',
+    role: jriguera,
+  },
+];
+
+const result = {
+  old: {
+    'bennojoy.ntp': bennojoy,
+  },
+  new: {
+    '0ta2.git_role': gitRole,
+  },
+};
+
+describe('AnsibleRolesAndVariablesHelpers', () => {
+  describe('prepareResult', () => {
+    it('should return correct results', () => {
+      expect(prepareResult(rows)).toStrictEqual(result);
+    });
+  });
+});