foreman_ansible 6.1.1 → 6.3.2

data/test/unit/host_ansible_role_test.rb

@@ -12,7 +12,8 @@ class HostAnsibleRoleTest < ActiveSupport::TestCase
   describe 'uniqueness' do
     subject do
       HostAnsibleRole.new(:host => FactoryBot.build(:host),
-                          :ansible_role => FactoryBot.build(:ansible_role))
+                          :ansible_role => FactoryBot.build(:ansible_role),
+                          :position => 0)
     end
     should validate_uniqueness_of(:ansible_role_id).scoped_to(:host_id)
   end

data/test/unit/hostgroup_ansible_role_test.rb

@@ -13,9 +13,23 @@ class HostgroupAnsibleRoleTest < ActiveSupport::TestCase
     subject do
       HostgroupAnsibleRole.new(
         :hostgroup => FactoryBot.build(:hostgroup),
-        :ansible_role => FactoryBot.build(:ansible_role)
+        :ansible_role => FactoryBot.build(:ansible_role),
+        :position => 0
       )
     end
     should validate_uniqueness_of(:ansible_role_id).scoped_to(:hostgroup_id)
   end
+
+  describe 'ordering' do
+    test 'should list roles in correct order' do
+      hg = FactoryBot.create(:hostgroup)
+      5.times do |idx|
+        HostgroupAnsibleRole.create(:hostgroup => hg, :ansible_role => FactoryBot.create(:ansible_role), :position => idx)
+      end
+
+      hg.hostgroup_ansible_roles.each_with_index do |item, idx|
+        assert_equal(item.position, idx + 1)
+      end
+    end
+  end
 end

data/test/unit/ignore_roles_test.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+# Tests for testing the ignore list
+class IgnoreRolesTest < ActiveSupport::TestCase
+  include ForemanAnsible::AnsibleRolesDataPreparations
+
+  role1 = AnsibleRole.new(:name => 'foo')
+  role2 = AnsibleRole.new(:name => 'bar')
+  role3 = AnsibleRole.new(:name => 'hello.txt')
+  role4 = AnsibleRole.new(:name => 'hello.yml')
+  role5 = AnsibleRole.new(:name => 'foo.yml')
+
+  describe 'It should Ignore Role' do
+    test 'If role starts with h' do
+      Setting.stubs(:[]).with(:ansible_roles_to_ignore).returns(['h*'])
+      assert_not role_match_excluded_roles(role1.name)
+      assert_not role_match_excluded_roles(role2.name)
+      assert role_match_excluded_roles(role3.name)
+      assert role_match_excluded_roles(role4.name)
+      assert_not role_match_excluded_roles(role5.name)
+    end
+
+    test 'If role ends with .yml' do
+      Setting.stubs(:[]).with(:ansible_roles_to_ignore).returns(['*.yml'])
+      assert_not role_match_excluded_roles(role1.name)
+      assert_not role_match_excluded_roles(role2.name)
+      assert_not role_match_excluded_roles(role3.name)
+      assert role_match_excluded_roles(role4.name)
+      assert role_match_excluded_roles(role5.name)
+    end
+
+    test 'If role have o char in the middle' do
+      Setting.stubs(:[]).with(:ansible_roles_to_ignore).returns(['*o*'])
+      assert role_match_excluded_roles(role1.name)
+      assert_not role_match_excluded_roles(role2.name)
+      assert role_match_excluded_roles(role3.name)
+      assert role_match_excluded_roles(role4.name)
+      assert role_match_excluded_roles(role5.name)
+    end
+  end
+end

data/test/unit/import_roles_and_variables.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+# Tests for testing the ignore list
+class ImportRolesAndVariables < ActiveSupport::TestCase
+  include ForemanAnsible::AnsibleRolesDataPreparations
+
+  # existing Roles -> should be updated
+  role1 = AnsibleRole.new(:name => 'ntp', :id => 10)
+  role2 = AnsibleRole.new(:name => 'bar', :id => 11)
+
+  # New Roles -> Should be imported
+  role3 = AnsibleRole.new(:name => 'foo', :id => nil)
+  role4 = AnsibleRole.new(:name => 'world', :id => nil)
+
+  # Existing Role -> should be removed
+  role5 = AnsibleRole.new(:name => 'h', :id => 12)
+
+  # role1 variables -> add
+  variable1 = AnsibleVariable.new(:key => 'ntp_statistics', :ansible_role_id => 10, :id => nil)
+  variable2 = AnsibleVariable.new(:key => 'ntp_broadcast', :ansible_role_id  => 10, :id => nil)
+
+  # role1 variables -> update
+  variable3 = AnsibleVariable.new(:key => 'ntp_statistics', :ansible_role_id => 10, :id => 4)
+  variable4 = AnsibleVariable.new(:key => 'ntp_crypto', :ansible_role_id => 10, :id => 5)
+
+  # role1 variables -> obsolete
+  variable5 = AnsibleVariable.new(:key => 'ntp_controlkey', :ansible_role_id => 10, :id => 6)
+  variable6 = AnsibleVariable.new(:key => 'ntp_key', :ansible_role_id  => 10, :id => 7)
+
+  # role2 variable -> Update
+  variable7 = AnsibleVariable.new(:key => 'bar_key', :ansible_role_id  => 11, :id => 7, :override => false, :hidden_value => true)
+  changed = { 'old' => [role1, role2], 'new' => [role3, role4], 'obsolete' => [role5] }
+  old_roles_variables = { 'new' => [variable1, variable2], 'update' => [variable3, variable4, variable7], 'obsolete' => [variable5, variable6] }
+
+  describe 'It should prepare the rows correctly' do
+    setup do
+      @variables_importer = mock('mock_variables_importer')
+    end
+
+    test 'prepare 5 rows' do
+      expected = [{ :cells => [role1.name, 'Update Role Variables', 'Add: 2, Remove: 2, Update: 2', '', ''],
+                    :role => role1, :kind => 'old', :id => role1.name },
+                  { :cells => [role2.name, 'Update Role Variables', 'Update: 1', '', ''], :role => role2, :kind => 'old', :id => role2.name },
+                  { :cells => [role3.name, 'Import Role', 'Add: 3', '', ''], :role => role3, :kind => 'new', :id => role3.name },
+                  { :cells => [role4.name, 'Import Role', 'Add: 2', '', ''], :role => role4, :kind => 'new', :id => role4.name },
+                  { :cells => [role5.name, 'Remove Role', '', 0, 0], :role => role5, :kind => 'obsolete', :id => role5.name }]
+      # role3 and role4 importing new variables
+      @variables_importer.expects(:get_variables_names).with(role3.name).returns({ 'a' => true, 'b' => false, 'c' => [] })
+      @variables_importer.expects(:get_variables_names).with(role4.name).returns({ 'd' => true, 'e' => false })
+
+      @variables_importer.expects(:import_variable_names).with([role3, role4]).returns(old_roles_variables)
+      @variables_importer.expects(:import_variable_names).with([role1, role2]).returns(old_roles_variables)
+      @variables_importer.expects(:import_variable_names).with([role5]).returns(old_roles_variables)
+      result = prepare_ansible_import_rows(changed, @variables_importer)
+      assert_equal result, expected
+    end
+  end
+end

data/test/unit/services/ansible_variables_importer_test.rb

@@ -59,6 +59,19 @@ class AnsibleVariablesImporterTest < ActiveSupport::TestCase
       assert_empty changes['update']
     end
 
+    test 'sets hidden value to false by default' do
+      role = FactoryBot.create(:ansible_role)
+      variable = FactoryBot.create(:ansible_variable)
+      api_response = {
+        role.name => { variable.key => 'new value' }
+      }
+      changes = importer.import_variables(api_response, [role.name])
+      assert_empty changes['update']
+      assert_not_empty changes['new']
+      assert_equal variable.key, changes['new'].first.key
+      assert_not changes['new'].first.hidden_value?
+    end
+
     test 'reimports variable with same key for different role' do
       role = FactoryBot.create(:ansible_role)
       variable = FactoryBot.create(:ansible_variable)

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;