foreman_acd 0.2.1 → 0.7.0

data/test/controllers/ui_acd_controller_test.rb

@@ -19,20 +19,36 @@ class UiAcdControllerTest < ActionController::TestCase
     get :app, :params => { :id => app_def.id }, :session => set_session_user
     assert_response :success
 
+    json_app_services = JSON.parse(app_def.services)
+    json_app_all = JSON.parse(app_def.ansible_vars_all)
+    parsed_services_response = JSON.parse(json_response['app_definition']['services'])
+    parsed_all_response = JSON.parse(json_response['app_definition']['ansible_vars_all'])
+
     assert_equal app_def.name, json_response['app_definition']['name']
-    assert_equal app_def.hostgroup_id, json_response['fdata']['hostgroup_id']
-    assert_equal app_def.hostgroup.domain.name, json_response['fdata']['domains'][0]['name']
-    assert_equal app_def.hostgroup.environment.name, json_response['fdata']['environments'][0]['name']
-    assert_equal app_def.hostgroup.ptable.name, json_response['fdata']['ptables'][0]['name']
+    assert_equal json_app_services.first['name'], parsed_services_response.first['name']
+    assert_equal json_app_services.first['ansibleGroup'], parsed_services_response.first['ansibleGroup']
+    assert_equal json_app_all.first['name'], parsed_all_response.first['name']
   end
 
-  test 'get fdata json' do
+  test 'get foreman data json' do
     hostgroup = FactoryBot.create(:hostgroup, :with_domain, :with_os, :with_environment)
-    get :fdata, :params => { :id => hostgroup.id }, :session => set_session_user
+    get :foreman_data, :params => { :id => hostgroup.id }, :session => set_session_user
     assert_response :success
 
+    assert_equal hostgroup.id, json_response['hostgroup_id']
     assert_equal hostgroup.environment.name, json_response['environments'][0]['name']
     assert_equal hostgroup.domain.name, json_response['domains'][0]['name']
     assert_equal hostgroup.ptable.name, json_response['ptables'][0]['name']
   end
+
+  test 'get ansible data json' do
+    ansible_playbook = FactoryBot.create(:ansible_playbook)
+    get :ansible_data, :params => { :id => ansible_playbook.id }, :session => set_session_user
+    assert_response :success
+
+    json_playbook = JSON.parse(ansible_playbook.vars)
+    assert_equal ansible_playbook.name, json_response['name']
+    assert_equal json_playbook['dbservers']['mysqlservice'], json_response['groups']['dbservers']['mysqlservice']
+    assert_equal json_playbook['all']['repository'], json_response['groups']['all']['repository']
+  end
 end

data/test/factories/foreman_acd_factories.rb

@@ -1,17 +1,31 @@
 # frozen_string_literal: true
 
 FactoryBot.define do
+  factory :ansible_playbook, :class => 'ForemanAcd::AnsiblePlaybook' do
+    sequence(:name) { |n| "ansible_playbook#{n}" }
+    sequence(:description) { |n| "description#{n}" }
+    scm_type { 'directory' }
+    path { '/home/vagrant/acd_examples/ansible-playbook' }
+    playfile { 'site.yml' }
+    vars { '{"dbservers":{"mysqlservice":"mysqld","mysql_port":3306,"dbuser":"webapp","dbname":"ANSAP01","upassword":"Bond@007","masterpassword":"MySQL@007"},"all":{"repository":"https://github.com/bennojoy/mywebapp.git"},"webservers":{"dummy_var":0}}' }
+  end
+
   factory :app_definition, :class => 'ForemanAcd::AppDefinition' do
     sequence(:name) { |n| "app_definition#{n}" }
     sequence(:description) { |n| "description#{n}" }
-    hostgroup { FactoryBot.create(:hostgroup, :with_domain, :with_os, :with_environment) }
-    parameters { '[{"id":0,"name":"Hostname","description":"","type":"hostname","value":"mysqllinux"},{"id":1,"name":"RootPW","description":"","type":"password","value":"sesam12345"},{"id":2,"name":"ansible_root","description":"","type":"hostparam","value":"/root/ansible"}]' }
+    ansible_playbook
+    services do
+      '[{"id":1,"name":"DB","description":"","hostgroup":"1","ansibleGroup":"dbservers","minCount":"","maxCount":"","foremanParameters":[],"ansibleParameters":[{"id":0,"name":"mysqlservice","value":"mysqld"},{"id":1,"name":"mysql_port","value":"3306"},{"id":2,"name":"dbuser","value":"webapp"},{"id":3,"name":"dbname","value":"ANSAP01"},{"id":4,"name":"upassword","value":"Bond@007"},{"id":5,"name":"masterpassword","value":"MySQL@007"}]},{"id":2,"name":"Web","description":"","hostgroup":"1","ansibleGroup":"webservers","minCount":"","maxCount":"","foremanParameters":[],"ansibleParameters":[{"id":0,"name":"dummy_var","value":"0"}]}]'
+    end
+    ansible_vars_all { '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]' }
   end
 
   factory :app_instance, :class => 'ForemanAcd::AppInstance' do
     sequence(:name) { |n| "app_instance#{n}" }
-    app_definition { FactoryBot.create(:app_definition) }
     sequence(:description) { |n| "description#{n}" }
-    parameters { '[{"id":0,"name":"Hostname","description":"","type":"hostname","value":"mysqllinux"},{"id":1,"name":"RootPW","description":"","type":"password","value":"sesam12345"},{"id":2,"name":"ansible_root","description":"","type":"hostparam","value":"/root/ansible"}]' }
+    app_definition
+    location { Location.find_by(:name => 'Location 1') }
+    organization { Organization.find_by(:name => 'Organization 1') }
+    ansible_vars_all { '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]' }
   end
 end

data/test/models/acd_provider_test.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanAcd
+  # ACD Provider Test
+  class AcdProviderTest < ActiveSupport::TestCase
+    describe '.provider_names' do
+      let(:provider_names) { AcdProvider.provider_names }
+
+      it 'returns only strings' do
+        provider_names.each do |name|
+          _(name).must_be_kind_of String
+        end
+      end
+
+      context 'provider is registetered under :custom symbol' do
+        before { AcdProvider.register(:ACD, String) }
+        it { _(provider_names).must_include 'ACD' }
+      end
+    end
+
+    describe AcdProvider do
+      before { User.current = FactoryBot.build(:user, :admin) }
+      after { User.current = nil }
+
+      before do
+        Setting::RemoteExecution.load_defaults
+      end
+
+      let(:job_invocation) { FactoryBot.create(:job_invocation, :with_template) }
+      let(:template_invocation) { job_invocation.pattern_template_invocations.first }
+      let(:host) { FactoryBot.create(:host) }
+      let(:proxy_options) { AcdProvider.proxy_command_options(template_invocation, host) }
+    end
+  end
+end

data/test/models/ansible_playbook_test.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanAcd
+  # Ansible Playbook Model tests
+  class AnsiblePlaybookTest < ActiveSupport::TestCase
+    should validate_presence_of(:name)
+    should validate_uniqueness_of(:name)
+  end
+end

data/test/models/app_definition_test.rb

@@ -7,7 +7,7 @@ module ForemanAcd
   class AppDefinitionTest < ActiveSupport::TestCase
     should validate_presence_of(:name)
     should validate_uniqueness_of(:name)
-    should belong_to(:hostgroup)
+    should belong_to(:ansible_playbook)
     should have_many(:app_instances).dependent(:destroy)
   end
 end

data/test/models/app_instance_test.rb

@@ -7,5 +7,7 @@ module ForemanAcd
   class AppInstanceTest < ActiveSupport::TestCase
     should validate_presence_of(:name)
     should belong_to(:app_definition)
+    should belong_to(:location)
+    should belong_to(:organization)
   end
 end

data/test/models/concerns/host_extensions_test.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanAcd
+  # Host Extensions Test
+  class HostExtensionsTest < ActiveSupport::TestCase
+    setup do
+      User.current = users :admin
+    end
+
+    test 'host was deployed via acd?' do
+      host = FactoryBot.create :host
+      app = FactoryBot.create :app_instance
+
+      foreman_host = app.foreman_hosts.create(:hostname => host.name,
+                                              :service => 'DB',
+                                              :description => 'Description',
+                                              :foremanParameters => nil,
+                                              :ansibleParameters => nil)
+      foreman_host.host = host
+      foreman_host.save
+      assert host.deployed_via_acd?
+    end
+  end
+end

data/test/models/foreman_host_test.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'test_plugin_helper'
+
+module ForemanAcd
+  # ForemanHost Model tests
+  class ForemanHostTest < ActiveSupport::TestCase
+    should validate_presence_of(:hostname)
+    should belong_to(:app_instance)
+    should belong_to(:host)
+  end
+end

data/webpack/__mocks__/foremanReact/API.js

@@ -0,0 +1,2 @@
+const API = () => jest.fn();
+export default API;

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

@@ -0,0 +1,3 @@
+export const translate = s => s;
+export const ngettext = s => s;
+export const documentLocale = () => 'en';

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

@@ -0,0 +1,2 @@
+export const propsToSnakeCase = s => s;
+export const propsToCamelCase = s => s;

data/webpack/__mocks__/foremanReact/components/ForemanModal.js

@@ -0,0 +1,7 @@
+const ForemanModal = () => {};
+const Header = s => s;
+const Footer = s => s;
+
+ForemanModal.Header = Header;
+ForemanModal.Footer = Footer;
+export default ForemanModal;

data/webpack/__mocks__/foremanReact/components/common/forms/CommonForm.js

@@ -0,0 +1,2 @@
+const CommonForm = () => jest.fn();
+export default CommonForm;

data/webpack/__mocks__/foremanReact/components/common/forms/TextInput.js

@@ -0,0 +1,2 @@
+const TextInput = () => jest.fn();
+export default TextInput;

data/webpack/__mocks__/foremanReact/components/hosts/powerStatus.js

@@ -0,0 +1 @@
+export const PowerStatus = () => jest.fn();

data/webpack/__snapshots__/helper.test.js.snap

@@ -0,0 +1,14 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`helper creates a object from an array 1`] = `
+<TableHeading
+  align=""
+  aria-label="TheLabel"
+  className=""
+  p1="1"
+  sort={false}
+  sortDirection=""
+>
+  MyValue
+</TableHeading>
+`;

data/webpack/components/ApplicationDefinition/ApplicationDefinition.js

@@ -1,3 +1,4 @@
+import $ from 'jquery';
 import React, { useState } from 'react'
 import PropTypes from 'prop-types';
 import {
@@ -10,7 +11,10 @@ import Select from 'foremanReact/components/common/forms/Select';
 import ParameterSelection from '../ParameterSelection';
 import AddTableEntry from '../common/AddTableEntry';
 import DeleteTableEntry from '../common/DeleteTableEntry';
-import RailsData from '../common/RailsData'
+import RailsData from '../common/RailsData';
+import AnsiblePlaybookSelector from './components/AnsiblePlaybookSelector';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { EasyHeaderFormatter } from '../../helper';
 
 import {
   Table,
@@ -18,6 +22,11 @@ import {
   inlineEditFormatterFactory,
 } from 'patternfly-react';
 
+import {
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+} from '../ParameterSelection/ParameterSelectionConstants';
+
 class ApplicationDefinition extends React.Component {
 
   constructor(props) {
@@ -28,16 +37,34 @@ class ApplicationDefinition extends React.Component {
     return (rowData.backup !== undefined);
   }
 
+  createAnsibleGroupObject(ansibleGroups, withAll=false) {
+    const ansibleGroupObj = {};
+
+    const ansibleGroupArray = Object.keys(ansibleGroups);
+    ansibleGroupArray.forEach(e => (ansibleGroupObj[e] = e));
+
+    if ((withAll === false) && (ansibleGroupObj.hasOwnProperty('all'))) {
+      delete ansibleGroupObj.all;
+    }
+
+    return ansibleGroupObj;
+  }
+
+  addTableEntryAllowed() {
+    return this.props.editMode || this.props.ansiblePlaybook.id == ''
+  }
+
   componentDidMount() {
     const {
-      data: { services, hostgroups },
+      data: { mode, ansiblePlaybook, ansibleDataUrl, services, ansibleVarsAll, hostgroups },
       initApplicationDefinition,
       addApplicationDefinitionService,
       deleteApplicationDefinitionService,
       activateEditApplicationDefinitionService,
       changeEditApplicationDefinitionService,
-      openParameterSelectionModal,
-      closeParameterSelectionModal,
+      openForemanParameterSelectionModal,
+      openAnsibleParameterSelectionModal,
+      loadAnsibleData,
     } = this.props;
 
     const inlineEditButtonsFormatter = inlineEditFormatterFactory({
@@ -48,14 +75,23 @@ class ApplicationDefinition extends React.Component {
             bsStyle="default"
             onClick={() => activateEditApplicationDefinitionService(additionalData)}
           >
-            <Icon type="pf" name="edit" />
+            <Icon type="pf" name="edit" title={__("edit entry")} />
           </Button>
+          &nbsp;
           <Button
             bsStyle="default"
-            onClick={() => openParameterSelectionModal(additionalData)}
+            onClick={() => openForemanParameterSelectionModal(additionalData)}
           >
-            <Icon type="pf" name="settings" />
+            <Icon type="pf" name="settings" title={__("change parameters")} />
           </Button>
+          &nbsp;
+          <Button
+            bsStyle="default"
+            onClick={() => openAnsibleParameterSelectionModal(additionalData)}
+          >
+            <span title={__("change ansible variables")}>A</span>
+          </Button>
+          &nbsp;
           <DeleteTableEntry
             hidden={false}
             disabled={false}
@@ -67,11 +103,18 @@ class ApplicationDefinition extends React.Component {
       renderEdit: (value, additionalData) => (
         <td style={{ padding: '2px' }}>
           <Button bsStyle="default" disabled>
-            <Icon type="pf" name="edit" />
+            <Icon type="pf" name={__("edit")} />
           </Button>
+          &nbsp;
           <Button bsStyle="default" disabled>
-            <Icon type="pf" name="settings" />
+            <Icon type="pf" name={__("settings")} />
           </Button>
+          &nbsp;
+          <Button
+            bsStyle="default" disabled>
+            <span>A</span>
+          </Button>
+          &nbsp;
           <DeleteTableEntry
             hidden={false}
             disabled={true}
@@ -83,8 +126,7 @@ class ApplicationDefinition extends React.Component {
     });
     this.inlineEditButtonsFormatter = inlineEditButtonsFormatter;
 
-    const headerFormatter = value => <Table.Heading>{value}</Table.Heading>;
-    this.headerFormatter = headerFormatter;
+    this.headerFormatter = EasyHeaderFormatter;
 
     const inlineEditFormatterImpl = {
       renderValue: (value, additionalData) => (
@@ -121,6 +163,10 @@ class ApplicationDefinition extends React.Component {
         if (additionalData.property == 'hostgroup') {
           prettyValue = hostgroups[value];
         }
+        else if (additionalData.property == 'ansibleGroup') {
+          const ag = this.createAnsibleGroupObject(this.props.ansiblePlaybook.groups);
+          prettyValue = ag[value];
+        }
         return inlineEditFormatterImpl.renderValue(prettyValue, additionalData)
       },
       renderEdit: (value, additionalData) => {
@@ -130,13 +176,23 @@ class ApplicationDefinition extends React.Component {
           }
           return inlineEditFormatterImpl.renderValue(hostgroups[value], additionalData)
         }
+        else if (additionalData.property == 'ansibleGroup') {
+          const ag = this.createAnsibleGroupObject(this.props.ansiblePlaybook.groups);
+
+          if (additionalData.rowData.newEntry === true) {
+            return inlineEditFormatterImpl.renderEditSelect(value, additionalData, ag);
+          }
+          return inlineEditFormatterImpl.renderValue(ag[value], additionalData);
+        }
         return inlineEditFormatterImpl.renderEditText(value, additionalData);
       }
     });
     this.inlineEditFormatter = inlineEditFormatter;
 
     initApplicationDefinition(
+      ansiblePlaybook,
       services,
+      ansibleVarsAll,
       this.headerFormatter,
       this.inlineEditFormatter,
       this.inlineEditButtonsFormatter,
@@ -145,25 +201,42 @@ class ApplicationDefinition extends React.Component {
 
   render() {
     const {
-      data: { organization, location, loadForemanDataUrl },
+      data: { organization, location, mode, ansiblePlaybooks, foremanDataUrl, ansibleDataUrl },
+      ansiblePlaybook,
       services,
       columns,
       addApplicationDefinitionService,
       confirmEditApplicationDefinitionService,
       cancelEditApplicationDefinitionService,
-      openParameterSelectionModal,
-      closeParameterSelectionModal,
+      closeForemanParameterSelectionModal,
+      openAnsibleParameterSelectionModal,
+      closeAnsibleParameterSelectionModal,
+      changeParameterSelectionMode,
       ParameterSelectionModal,
+      loadAnsibleData,
     } = this.props;
 
+
     return (
       <span>
-        <div className="form-group">
-          <AddTableEntry
-             hidden={ false }
-             disabled={ this.props.editMode }
-             onAddTableEntry={ addApplicationDefinitionService }
+        <div>
+          <AnsiblePlaybookSelector
+            label="Ansible Playbook"
+            editable={ mode == 'newDefinition' }
+            viewText={ ansiblePlaybook.name }
+            options={ ansiblePlaybooks }
+            onChange={ loadAnsibleData }
+            selectValue={ ansiblePlaybook.id.toString() }
+            additionalData={{url: ansibleDataUrl }}
           />
+          {ansiblePlaybook.id == '' ? (
+          <p style={{ paddingTop: 25 }}>
+            <pre>{ "Ansible Playbook can't be blank" }</pre>
+          </p>
+        ) : (<div></div>)}
+
+        </div>
+        <div className="form-group">
           <Table.PfProvider
             striped
             bordered
@@ -192,33 +265,75 @@ class ApplicationDefinition extends React.Component {
             />
           </Table.PfProvider>
           <AddTableEntry
-             hidden={ false }
-             disabled={ this.props.editMode }
-             onAddTableEntry={ addApplicationDefinitionService }
+            hidden={ false }
+            disabled={ this.addTableEntryAllowed() }
+            onAddTableEntry={ addApplicationDefinitionService }
           />
+          <span style={{ marginLeft: 30 }}>
+            Ansible group vars 'all':
+            <Button
+              style={{ marginLeft: 10 }}
+              bsStyle="default"
+              disabled={ this.props.editMode }
+              onClick={() => openAnsibleParameterSelectionModal({
+                isAllGroup: true
+              })}
+            >
+              <span title={__("change ansible variables for 'all'")}>A</span>
+            </Button>
+          </span>
+        </div>
+        <div>
+          <ForemanModal
+            id="AppDefinitionForemanParamSelection"
+            dialogClassName="param_selection_modal"
+            title={__("Foreman Parameter definition for Application Definition")}
+          >
+            <ForemanModal.Header closeButton={false}>
+              Parameter definition
+            </ForemanModal.Header>
+            {this.props.parametersData ? (
+              <ParameterSelection
+                editModeCallback={ (hide) => changeParameterSelectionMode({ mode: hide })}
+                paramType={ PARAMETER_SELECTION_PARAM_TYPE_FOREMAN }
+                location={ location }
+                organization={ organization }
+                paramDataUrl= { foremanDataUrl }
+                data={ this.props.parametersData }
+              />
+            ) : (<span>Empty</span>)
+            }
+            <ForemanModal.Footer>
+              <div>
+                <Button bsStyle="primary" disabled={this.props.paramEditMode} onClick={() => closeForemanParameterSelectionModal({ mode: 'save' })}>{__("Save")}</Button>
+                <Button bsStyle="default" disabled={this.props.paramEditMode} onClick={() => closeForemanParameterSelectionModal({ mode: 'cancel' })}>{__("Cancel")}</Button>
+              </div>
+            </ForemanModal.Footer>
+          </ForemanModal>
         </div>
         <div>
           <ForemanModal
-            id="AppDefinitionParamSelection"
+            id="AppDefinitionAnsibleParamSelection"
             dialogClassName="param_selection_modal"
-            title="Parameter definition for Application Definition"
+            title={__("Ansible variables for Application Definition")}
           >
             <ForemanModal.Header closeButton={false}>
               Parameter definition
             </ForemanModal.Header>
             {this.props.parametersData ? (
               <ParameterSelection
+                editModeCallback={ (hide) => changeParameterSelectionMode({ mode: hide })}
+                paramType={ PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE }
                 location={ location }
                 organization={ organization }
-                loadForemanDataUrl= { loadForemanDataUrl }
                 data={ this.props.parametersData }
               />
             ) : (<span>Empty</span>)
             }
             <ForemanModal.Footer>
               <div>
-                <Button bsStyle="primary" onClick={() => closeParameterSelectionModal({ mode: 'save' })}>Save</Button>
-                <Button bsStyle="default" onClick={() => closeParameterSelectionModal({ mode: 'cancel' })}>Cancel</Button>
+                <Button bsStyle="primary" disabled={this.props.paramEditMode} onClick={() => closeAnsibleParameterSelectionModal({ mode: 'save' })}>{__("Save")}</Button>
+                <Button bsStyle="default" disabled={this.props.paramEditMode} onClick={() => closeAnsibleParameterSelectionModal({ mode: 'cancel' })}>{__("Cancel")}</Button>
               </div>
             </ForemanModal.Footer>
           </ForemanModal>
@@ -229,6 +344,12 @@ class ApplicationDefinition extends React.Component {
           parameter='services'
           value={JSON.stringify(this.props.services)}
         />
+        <RailsData
+          key='applications_definition'
+          view='app_definition'
+          parameter='ansible_vars_all'
+          value={JSON.stringify(this.props.ansibleVarsAll)}
+        />
       </span>
     )};
 }
@@ -236,16 +357,21 @@ class ApplicationDefinition extends React.Component {
 ApplicationDefinition.defaultProps = {
   error: {},
   editMode: false,
+  ansiblePlaybook: { "id": '', "name": '' },
   services: [],
+  ansibleVarsAll: [],
   parametersData: {},
   columns: [],
   editParamsOfRowId: null,
+  paramEditMode: false,
 }
 
 ApplicationDefinition.propTypes = {
   initApplicationDefinition: PropTypes.func,
   editMode: PropTypes.bool.isRequired,
+  ansiblePlaybook: PropTypes.object,
   services: PropTypes.array,
+  ansibleVarsAll: PropTypes.array,
   columns: PropTypes.array,
   addApplicationDefinitionService: PropTypes.func,
   deleteApplicationDefinitionService: PropTypes.func,
@@ -253,9 +379,13 @@ ApplicationDefinition.propTypes = {
   confirmEditApplicationDefinitionService: PropTypes.func,
   cancelEditApplicationDefinitionService: PropTypes.func,
   changeEditApplicationDefinitionService: PropTypes.func,
-  openParameterSelectionModal: PropTypes.func,
-  closeParameterSelectionModal: PropTypes.func,
+  openForemanParameterSelectionModal: PropTypes.func,
+  closeForemanParameterSelectionModal: PropTypes.func,
+  openAnsibleParameterSelectionModal: PropTypes.func,
+  closeAnsibleParameterSelectionModal: PropTypes.func,
+  changeParameterSelectionMode: PropTypes.func,
   parametersData: PropTypes.object,
+  paramEditMode: PropTypes.bool,
 };
 
 export default ApplicationDefinition;