foreman_acd 0.2.1 → 0.3.0

data/webpack/components/ApplicationDefinition/ApplicationDefinitionConstants.js

@@ -1,9 +1,14 @@
 export const APPLICATION_DEFINITION_INIT = 'INIT_APPLICATION_DEFINITION_INIT';
+export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST';
+export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS';
+export const APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE = 'APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE';
 export const APPLICATION_DEFINITION_SERVICE_DELETE = 'APPLICATION_DEFINITION_SERVICE_DELETE';
 export const APPLICATION_DEFINITION_SERVICE_ADD = 'APPLICATION_DEFINITION_SERVICE_ADD';
 export const APPLICATION_DEFINITION_SERVICE_EDIT_ACTIVATE = 'APPLICATION_DEFINITION_SERVICE_EDIT_ACTIVATE';
 export const APPLICATION_DEFINITION_SERVICE_EDIT_CONFIRM = 'APPLICATION_DEFINITION_SERVICE_EDIT_CONFIRM';
 export const APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE = 'APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE';
 export const APPLICATION_DEFINITION_SERVICE_EDIT_CANCEL = 'APPLICATION_DEFINITION_SERVICE_EDIT_CANCEL';
-export const APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_OPEN = 'APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_OPEN';
-export const APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE = 'APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE';
+export const APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN = 'APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN';
+export const APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE = 'APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE';
+export const APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN = 'APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN';
+export const APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE = 'APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE';

data/webpack/components/ApplicationDefinition/ApplicationDefinitionHelper.js

@@ -0,0 +1,26 @@
+export function transformAnsiblePlaybook(playbook) {
+
+  const ansiblePlaybook = new Object;
+  ansiblePlaybook.id = playbook.id;
+  ansiblePlaybook.name = playbook.name;
+  ansiblePlaybook.groups = {};
+
+  if (playbook.hasOwnProperty('groups')) {
+    Object.entries(playbook.groups).forEach(([group_name,group_vars]) => {
+      ansiblePlaybook.groups[group_name] = [];
+
+      let id=0;
+      Object.entries(group_vars).forEach(([var_name,var_value]) => {
+        let entry = {
+          id: id,
+          name: var_name,
+          value: var_value
+        }
+        ansiblePlaybook.groups[group_name].push(entry);
+        id += 1;
+      });
+    });
+  }
+
+  return ansiblePlaybook;
+}

data/webpack/components/ApplicationDefinition/ApplicationDefinitionReducer.js

@@ -8,16 +8,30 @@ import {
 
 import {
   APPLICATION_DEFINITION_INIT,
+  APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST,
+  APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS,
+  APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE,
   APPLICATION_DEFINITION_SERVICE_DELETE,
   APPLICATION_DEFINITION_SERVICE_ADD,
   APPLICATION_DEFINITION_SERVICE_EDIT_ACTIVATE,
   APPLICATION_DEFINITION_SERVICE_EDIT_CONFIRM,
   APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE,
   APPLICATION_DEFINITION_SERVICE_EDIT_CANCEL,
-  APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_OPEN,
-  APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
+  APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
+  APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
 } from './ApplicationDefinitionConstants';
 
+import {
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+} from '../ParameterSelection/ParameterSelectionConstants';
+
+import {
+  transformAnsiblePlaybook,
+} from './ApplicationDefinitionHelper';
+
 export const initialState = Immutable({
   name: false,
   error: { errorMsg: '', status: '', statusText: '' },
@@ -30,6 +44,30 @@ const applicationDefinitionConf = (state = initialState, action) => {
     case APPLICATION_DEFINITION_INIT: {
       return state.merge(payload);
     }
+
+   case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE: {
+      return state.merge({ error: payload.error, loading: false });
+    }
+    case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST: {
+      return state.set('loading', true);
+    }
+    case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS: {
+      let newState = {};
+      let allVars = [];
+
+      const ansiblePlaybook = transformAnsiblePlaybook(payload);
+
+      if (ansiblePlaybook.hasOwnProperty('groups')) {
+        allVars = ansiblePlaybook.groups['all']
+      }
+
+      newState = {
+        ansiblePlaybook: ansiblePlaybook,
+        ansibleVarsAll: allVars
+      }
+
+      return state.merge(newState);
+    }
     case APPLICATION_DEFINITION_SERVICE_ADD: {
       let services = [];
       let index = 1;
@@ -39,7 +77,9 @@ const applicationDefinitionConf = (state = initialState, action) => {
         index = Math.max(...services.map(e => e.id)) + 1;
       }
 
-      const newRow = {id: index, name: "", description: '', hostgroup: '', minCount: '', maxCount: '', parameters: [], newEntry: true };
+      const newRow = { id: index, name: "", description: '', hostgroup: '',
+                       ansibleGroup: '', minCount: '', maxCount: '',
+                       foremanParameters: [], ansibleParameters: [], newEntry: true };
       newRow.backup = cloneDeep(newRow)
       services.push(newRow);
 
@@ -72,9 +112,16 @@ const applicationDefinitionConf = (state = initialState, action) => {
       delete services[index].backup;
       delete services[index].newEntry;
 
+      let ansibleParameters = [];
+      const selectedGroup = services[index].ansibleGroup;
+
+      if (selectedGroup) {
+        services[index].ansibleParameters = state.ansiblePlaybook.groups[selectedGroup];
+      }
+
       return state.merge({
         editMode: false,
-        services: services
+        services: services,
       });
     }
     case APPLICATION_DEFINITION_SERVICE_EDIT_CHANGE: {
@@ -101,33 +148,31 @@ const applicationDefinitionConf = (state = initialState, action) => {
         services: services
       });
     }
-    case APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_OPEN: {
+    case APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN: {
       let parametersData = {};
 
-      if (payload && payload.rowData) {
-        parametersData.serviceDefinition = {
-          id: payload.rowData.id,
-          name: payload.rowData.name,
-          hostgroup_id: payload.rowData.hostgroup
-        }
-        parametersData.parameters = payload.rowData.parameters;
-
-        if (parametersData.parameters.length > 0) {
-          parametersData.mode = 'editDefinition';
-        } else {
-          parametersData.mode = 'newDefinition';
-        }
+      parametersData.paramDefinition = {
+        id: payload.rowData.id,
+        name: payload.rowData.name,
+        dataId: payload.rowData.hostgroup
       }
 
+      parametersData.type = PARAMETER_SELECTION_PARAM_TYPE_FOREMAN;
+      parametersData.parameters = payload.rowData.foremanParameters;
+      parametersData.useDefaultValue = true;
+      parametersData.allowRowAdjustment = true;
+      parametersData.allowNameAdjustment = true;
+      parametersData.allowDescriptionAdjustment = true;
+
       return state.merge({
         parametersData: parametersData,
       });
     }
-    case APPLICATION_DEFINITION_PARAMETER_SELECTION_MODAL_CLOSE: {
+    case APPLICATION_DEFINITION_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE: {
       if (payload.mode == 'save') {
         const services = cloneDeep(state.services);
-        const index = findIndex(services, { id: state.parametersData.serviceDefinition.id });
-        services[index].parameters = cloneDeep(payload.serviceParameterSelection);
+        const index = findIndex(services, { id: state.parametersData.paramDefinition.id });
+        services[index].foremanParameters = cloneDeep(payload.parameterSelection);
 
         return state.merge({
           parametersData: null,
@@ -139,6 +184,57 @@ const applicationDefinitionConf = (state = initialState, action) => {
         });
       }
     }
+    case APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN: {
+      let parametersData = {};
+
+      if ((payload.hasOwnProperty('isAllGroup')) && (payload.isAllGroup == true)) {
+        parametersData.parameters = state.ansibleVarsAll;
+        parametersData.paramDefinition = {
+          isAllGroup: true,
+        }
+      } else  {
+        parametersData.parameters = payload.rowData.ansibleParameters;
+        parametersData.paramDefinition = {
+          id: payload.rowData.id,
+          name: payload.rowData.name,
+        }
+      }
+
+      parametersData.type = PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE;
+      parametersData.useDefaultValue = false;
+      parametersData.allowRowAdjustment = true;
+      parametersData.allowNameAdjustment = true;
+      parametersData.allowDescriptionAdjustment = true;
+
+      return state.merge({
+        parametersData: parametersData,
+      });
+    }
+    case APPLICATION_DEFINITION_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE: {
+      let newState = {};
+      if (payload.mode == 'save') {
+        if ((state.parametersData.paramDefinition.hasOwnProperty('isAllGroup')) && (state.parametersData.paramDefinition.isAllGroup == true)) {
+          newState = {
+            parametersData: null,
+            ansibleVarsAll: cloneDeep(payload.parameterSelection),
+          };
+        } else {
+          const services = cloneDeep(state.services);
+          const index = findIndex(services, { id: state.parametersData.paramDefinition.id });
+          services[index].ansibleParameters = cloneDeep(payload.parameterSelection);
+
+          newState = {
+            parametersData: null,
+            services: services,
+          };
+        }
+      } else {
+        newState = {
+          parametersData: null,
+        };
+      }
+      return state.merge(newState);
+    }
     default:
       return state;
   }

data/webpack/components/ApplicationDefinition/ApplicationDefinitionSelectors.js

@@ -1,6 +1,8 @@
 const applicationDefinitionConf = state => state.foremanAcd.applicationDefinitionConf;
 
 export const selectEditMode = state => applicationDefinitionConf(state).editMode;
+export const selectAnsiblePlaybook = state => applicationDefinitionConf(state).ansiblePlaybook;
 export const selectServices = state => applicationDefinitionConf(state).services;
 export const selectColumns = state => applicationDefinitionConf(state).columns;
 export const selectParametersData = state => applicationDefinitionConf(state).parametersData;
+export const selectAnsibleVarsAll = state => applicationDefinitionConf(state).ansibleVarsAll;

data/webpack/components/ApplicationDefinition/components/AnsiblePlaybookSelector.js

@@ -0,0 +1,49 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import ExtSelect from '../../common/ExtSelect';
+import RailsData from '../../common/RailsData'
+
+const AnsiblePlaybookSelector= ({
+  label,
+  hidden,
+  editable,
+  viewText,
+  selectValue,
+  onChange,
+  options,
+  additionalData,
+}) =>{
+  return (
+    <div className="form-group">
+      <label className="col-md-2 control-label">{label}</label>
+      <div className="col-md-4">
+        <ExtSelect
+          editable={editable}
+          viewText={viewText}
+          selectValue={selectValue}
+          onChange={onChange}
+          options={options}
+          additionalData={additionalData}
+        />
+        <RailsData
+          key='ansible_playbook_id'
+          view='app_definition'
+          parameter='acd_ansible_playbook_id'
+          value={selectValue}
+        />
+      </div>
+    </div>
+  );
+};
+
+AnsiblePlaybookSelector.propTypes = {
+  label: PropTypes.string.isRequired,
+  editable: PropTypes.bool.isRequired,
+  viewText: PropTypes.string,
+  selectValue: PropTypes.string,
+  onChange: PropTypes.func.isRequired,
+  options: PropTypes.object,
+  additionalData: PropTypes.object,
+};
+
+export default AnsiblePlaybookSelector;

data/webpack/components/ApplicationDefinition/index.js

@@ -7,16 +7,20 @@ import * as ApplicationDefinitionActions from './ApplicationDefinitionActions';
 
 import {
   selectEditMode,
+  selectAnsiblePlaybook,
   selectServices,
   selectColumns,
   selectParametersData,
+  selectAnsibleVarsAll,
 } from './ApplicationDefinitionSelectors';
 
 const mapStateToProps = state => ({
   editMode: selectEditMode(state),
+  ansiblePlaybook: selectAnsiblePlaybook(state),
   services: selectServices(state),
   columns: selectColumns(state),
   parametersData: selectParametersData(state),
+  ansibleVarsAll: selectAnsibleVarsAll(state),
 });
 
 const mapDispatchToProps = dispatch =>

data/webpack/components/ApplicationInstance/ApplicationInstance.js

@@ -21,6 +21,11 @@ import {
   inlineEditFormatterFactory,
 } from 'patternfly-react';
 
+import {
+  PARAMETER_SELECTION_PARAM_TYPE_FOREMAN,
+  PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE,
+} from '../ParameterSelection/ParameterSelectionConstants';
+
 class ApplicationInstance extends React.Component {
 
   constructor(props) {
@@ -69,19 +74,19 @@ class ApplicationInstance extends React.Component {
 
   componentDidMount() {
     const {
-      data: { mode, appDefinition, hosts, loadAppDefinitionUrl },
+      data: { mode, appDefinition, hosts, ansibleVarsAll, appDefinitionUrl },
       initApplicationInstance,
       addApplicationInstanceHost,
       deleteApplicationInstanceHost,
       activateEditApplicationInstanceHost,
       changeEditApplicationInstanceHost,
-      openParameterSelectionModal,
-      closeParameterSelectionModal,
+      openForemanParameterSelectionModal,
+      openAnsibleParameterSelectionModal,
       loadApplicationDefinition,
     } = this.props;
 
     if (mode === 'editInstance') {
-      loadApplicationDefinition(appDefinition.id, { url: loadAppDefinitionUrl });
+      loadApplicationDefinition(appDefinition.id, { url: appDefinitionUrl });
     }
 
     const inlineEditButtonsFormatter = inlineEditFormatterFactory({
@@ -92,13 +97,21 @@ class ApplicationInstance extends React.Component {
             bsStyle="default"
             onClick={() => activateEditApplicationInstanceHost(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>
           <DeleteTableEntry
             hidden={false}
@@ -113,9 +126,14 @@ class ApplicationInstance extends React.Component {
           <Button bsStyle="default" disabled>
             <Icon type="pf" name="edit" />
           </Button>
+          &nbsp;
           <Button bsStyle="default" disabled>
             <Icon type="pf" name="settings" />
           </Button>
+          &nbsp;
+          <Button bsStyle="default" disabled>
+            <span>A</span>
+          </Button>
           <DeleteTableEntry
             hidden={false}
             disabled={true}
@@ -188,6 +206,7 @@ class ApplicationInstance extends React.Component {
     initApplicationInstance(
       appDefinition,
       hosts,
+      ansibleVarsAll,
       this.headerFormatter,
       this.inlineEditFormatter,
       this.inlineEditButtonsFormatter,
@@ -196,7 +215,7 @@ class ApplicationInstance extends React.Component {
 
   render() {
     const {
-      data: { mode, applications, organization, location, loadForemanDataUrl, loadAppDefinitionUrl },
+      data: { mode, applications, organization, location, foremanDataUrl, appDefinitionUrl },
       appDefinition,
       services,
       hosts,
@@ -204,9 +223,9 @@ class ApplicationInstance extends React.Component {
       addApplicationInstanceHost,
       confirmEditApplicationInstanceHost,
       cancelEditApplicationInstanceHost,
-      openParameterSelectionModal,
-      closeParameterSelectionModal,
-      ParameterSelectionModal,
+      closeForemanParameterSelectionModal,
+      openAnsibleParameterSelectionModal,
+      closeAnsibleParameterSelectionModal,
       loadApplicationDefinition,
     } = this.props;
 
@@ -232,7 +251,7 @@ class ApplicationInstance extends React.Component {
             options={ applications }
             onChange={ loadApplicationDefinition }
             selectValue={ appDefinition.id.toString() }
-            additionalData={{url: loadAppDefinitionUrl}}
+            additionalData={{url: appDefinitionUrl}}
           />
         </div>
         <div className="form-group">
@@ -269,33 +288,73 @@ class ApplicationInstance extends React.Component {
             />
           </Table.PfProvider>
           <AddTableEntry
-             hidden={ false }
-             disabled={ this.props.editMode }
-             onAddTableEntry={ addApplicationInstanceHost }
+            hidden={ false }
+            disabled={ this.props.editMode }
+            onAddTableEntry={ addApplicationInstanceHost }
           />
+          <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="AppInstanceParamSelection"
+            id="AppInstanceForemanParamSelection"
             dialogClassName="param_selection_modal"
-            title="Parameter specification for Application Instance"
+            title="Foreman Parameter specification for Application Instance"
           >
             <ForemanModal.Header closeButton={false}>
               Parameter specification
             </ForemanModal.Header>
             {this.props.parametersData ? (
               <ParameterSelection
+                paramType={ PARAMETER_SELECTION_PARAM_TYPE_FOREMAN }
                 location={ location }
                 organization={ organization }
-                loadForemanDataUrl= { loadForemanDataUrl }
+                paramDataUrl= { foremanDataUrl }
                 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" onClick={() => closeForemanParameterSelectionModal({ mode: 'save' })}>Save</Button>
+                <Button bsStyle="default" onClick={() => closeForemanParameterSelectionModal({ mode: 'cancel' })}>Cancel</Button>
+              </div>
+            </ForemanModal.Footer>
+          </ForemanModal>
+        </div>
+        <div>
+          <ForemanModal
+            id="AppInstanceAnsibleParamSelection"
+            dialogClassName="param_selection_modal"
+            title="Ansible group variables for Application Instance"
+          >
+            <ForemanModal.Header closeButton={false}>
+              Parameter specification
+            </ForemanModal.Header>
+            {this.props.parametersData ? (
+              <ParameterSelection
+                paramType={ PARAMETER_SELECTION_PARAM_TYPE_ANSIBLE }
+                location={ location }
+                organization={ organization }
+                data={ this.props.parametersData }
+              />
+            ) : (<span>Empty</span>)
+            }
+            <ForemanModal.Footer>
+              <div>
+                <Button bsStyle="primary" onClick={() => closeAnsibleParameterSelectionModal({ mode: 'save' })}>Save</Button>
+                <Button bsStyle="default" onClick={() => closeAnsibleParameterSelectionModal({ mode: 'cancel' })}>Cancel</Button>
               </div>
             </ForemanModal.Footer>
           </ForemanModal>
@@ -306,6 +365,12 @@ class ApplicationInstance extends React.Component {
           parameter='hosts'
           value={JSON.stringify(this.props.hosts)}
         />
+        <RailsData
+          key='applications_instance'
+          view='app_instance'
+          parameter='ansible_vars_all'
+          value={JSON.stringify(this.props.ansibleVarsAll)}
+        />
       </span>
     )};
 }
@@ -316,6 +381,7 @@ ApplicationInstance.defaultProps = {
   editMode: false,
   services: [],
   hosts: [],
+  ansibleVarsAll: [],
   parametersData: {},
   columns: [],
   editParamsOfRowId: null,
@@ -327,6 +393,8 @@ ApplicationInstance.propTypes = {
   services: PropTypes.array,
   appDefinition: PropTypes.object,
   columns: PropTypes.array,
+  hosts: PropTypes.array,
+  ansibleVarsAll: PropTypes.array,
   loadApplicationDefinition: PropTypes.func,
   addApplicationInstanceHost: PropTypes.func,
   deleteApplicationInstanceHost: PropTypes.func,
@@ -334,8 +402,10 @@ ApplicationInstance.propTypes = {
   confirmEditApplicationInstanceHost: PropTypes.func,
   cancelEditApplicationInstanceHost: PropTypes.func,
   changeEditApplicationInstanceHost: PropTypes.func,
-  openParameterSelectionModal: PropTypes.func,
-  closeParameterSelectionModal: PropTypes.func,
+  openForemanParameterSelectionModal: PropTypes.func,
+  closeForemanParameterSelectionModal: PropTypes.func,
+  openAnsibleParameterSelectionModal: PropTypes.func,
+  closeAnsibleParameterSelectionModal: PropTypes.func,
   parametersData: PropTypes.object,
 };