foreman_acd 0.6.0 → 0.9.1

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/ForemanModalActions.js

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

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 formats a nice, easy header 1`] = `
+<TableHeading
+  align=""
+  aria-label="TheLabel"
+  className=""
+  p1="1"
+  sort={false}
+  sortDirection=""
+>
+  MyValue
+</TableHeading>
+`;

data/webpack/components/ApplicationDefinition/ApplicationDefinition.js

@@ -4,6 +4,7 @@ import PropTypes from 'prop-types';
 import {
   Icon,
   Button,
+  MessageDialog,
 } from 'patternfly-react';
 import * as resolve from 'table-resolver';
 import ForemanModal from 'foremanReact/components/ForemanModal';
@@ -12,9 +13,9 @@ import ParameterSelection from '../ParameterSelection';
 import AddTableEntry from '../common/AddTableEntry';
 import DeleteTableEntry from '../common/DeleteTableEntry';
 import RailsData from '../common/RailsData';
-import EasyHeaderFormatter from '../common/EasyHeaderFormatter';
 import AnsiblePlaybookSelector from './components/AnsiblePlaybookSelector';
 import { translate as __ } from 'foremanReact/common/I18n';
+import { EasyHeaderFormatter } from '../../helper';
 
 import {
   Table,
@@ -56,7 +57,7 @@ class ApplicationDefinition extends React.Component {
 
   componentDidMount() {
     const {
-      data: { mode, ansiblePlaybook, ansibleDataUrl, services, ansibleVarsAll, hostgroups },
+      data: { mode, ansiblePlaybook, ansibleDataUrl, services, ansibleVarsAll, hostgroups, supportedPlugins },
       initApplicationDefinition,
       addApplicationDefinitionService,
       deleteApplicationDefinitionService,
@@ -75,21 +76,21 @@ class ApplicationDefinition extends React.Component {
             bsStyle="default"
             onClick={() => activateEditApplicationDefinitionService(additionalData)}
           >
-            <Icon type="pf" name="edit" title={__("edit entry")} />
+            <Icon type="pf" name="edit" title={__("Edit entry")} />
           </Button>
           &nbsp;
           <Button
             bsStyle="default"
             onClick={() => openForemanParameterSelectionModal(additionalData)}
           >
-            <Icon type="pf" name="settings" title={__("change parameters")} />
+            <Icon type="pf" name="settings" title={__("Change parameters")} />
           </Button>
           &nbsp;
           <Button
             bsStyle="default"
             onClick={() => openAnsibleParameterSelectionModal(additionalData)}
           >
-            <span title={__("change ansible variables")}>A</span>
+            <span title={__("Change ansible variables")}>A</span>
           </Button>
           &nbsp;
           <DeleteTableEntry
@@ -193,6 +194,7 @@ class ApplicationDefinition extends React.Component {
       ansiblePlaybook,
       services,
       ansibleVarsAll,
+      supportedPlugins,
       this.headerFormatter,
       this.inlineEditFormatter,
       this.inlineEditButtonsFormatter,
@@ -202,9 +204,11 @@ class ApplicationDefinition extends React.Component {
   render() {
     const {
       data: { organization, location, mode, ansiblePlaybooks, foremanDataUrl, ansibleDataUrl },
+      showAlertModal, alertModalText, alertModalTitle, closeAlertModal,
       ansiblePlaybook,
       services,
       columns,
+      hiddenForemanParameterTypes,
       addApplicationDefinitionService,
       confirmEditApplicationDefinitionService,
       cancelEditApplicationDefinitionService,
@@ -216,12 +220,22 @@ class ApplicationDefinition extends React.Component {
       loadAnsibleData,
     } = this.props;
 
-
     return (
       <span>
+        <MessageDialog
+          show={showAlertModal}
+          onHide={closeAlertModal}
+          primaryAction={closeAlertModal}
+          primaryActionButtonContent={__('OK')}
+          primaryActionButtonBsStyle={"danger"}
+          icon={<Icon type="pf" name="error-circle-o" />}
+          title={alertModalTitle}
+          primaryContent={alertModalText}
+        />
         <div>
           <AnsiblePlaybookSelector
             label="Ansible Playbook"
+            hidden={ false }
             editable={ mode == 'newDefinition' }
             viewText={ ansiblePlaybook.name }
             options={ ansiblePlaybooks }
@@ -230,9 +244,9 @@ class ApplicationDefinition extends React.Component {
             additionalData={{url: ansibleDataUrl }}
           />
           {ansiblePlaybook.id == '' ? (
-          <p style={{ paddingTop: 25 }}>
+          <div style={{ paddingTop: 25 }}>
             <pre>{ "Ansible Playbook can't be blank" }</pre>
-          </p>
+          </div>
         ) : (<div></div>)}
 
         </div>
@@ -279,7 +293,7 @@ class ApplicationDefinition extends React.Component {
                 isAllGroup: true
               })}
             >
-              <span title={__("change ansible variables for 'all'")}>A</span>
+              <span title={__("Change ansible variables for 'all'")}>A</span>
             </Button>
           </span>
         </div>
@@ -296,6 +310,7 @@ class ApplicationDefinition extends React.Component {
               <ParameterSelection
                 editModeCallback={ (hide) => changeParameterSelectionMode({ mode: hide })}
                 paramType={ PARAMETER_SELECTION_PARAM_TYPE_FOREMAN }
+                hiddenParameterTypes={ hiddenForemanParameterTypes }
                 location={ location }
                 organization={ organization }
                 paramDataUrl= { foremanDataUrl }
@@ -339,13 +354,13 @@ class ApplicationDefinition extends React.Component {
           </ForemanModal>
         </div>
         <RailsData
-          key='applications_definition'
+          key='application_definition_services_data'
           view='app_definition'
           parameter='services'
           value={JSON.stringify(this.props.services)}
         />
         <RailsData
-          key='applications_definition'
+          key='application_definition_ansible_data'
           view='app_definition'
           parameter='ansible_vars_all'
           value={JSON.stringify(this.props.ansibleVarsAll)}
@@ -356,23 +371,32 @@ class ApplicationDefinition extends React.Component {
 
 ApplicationDefinition.defaultProps = {
   error: {},
+  showAlertModal: false,
+  alertModalText: '',
+  alertModalTitle: '',
   editMode: false,
   ansiblePlaybook: { "id": '', "name": '' },
   services: [],
   ansibleVarsAll: [],
   parametersData: {},
   columns: [],
+  hiddenForemanParameterTypes: [],
   editParamsOfRowId: null,
   paramEditMode: false,
 }
 
 ApplicationDefinition.propTypes = {
   initApplicationDefinition: PropTypes.func,
+  showAlertModal: PropTypes.bool,
+  alertModalText: PropTypes.string,
+  alertModalTitle: PropTypes.string,
   editMode: PropTypes.bool.isRequired,
   ansiblePlaybook: PropTypes.object,
   services: PropTypes.array,
   ansibleVarsAll: PropTypes.array,
   columns: PropTypes.array,
+  hiddenForemanParameterTypes: PropTypes.array,
+  closeAlertModal: PropTypes.func,
   addApplicationDefinitionService: PropTypes.func,
   deleteApplicationDefinitionService: PropTypes.func,
   activateEditApplicationDefinitionService: PropTypes.func,

data/webpack/components/ApplicationDefinition/ApplicationDefinitionActions.js

@@ -17,6 +17,7 @@ import {
 
 import {
   APPLICATION_DEFINITION_INIT,
+  APPLICATION_DEFINITION_CLOSE_ALERT_MODAL,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE,
@@ -33,6 +34,10 @@ import {
   APPLICATION_DEFINITION_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationDefinitionConstants';
 
+import {
+  supportedPluginsToHiddenParameterTypes,
+} from '../../helper';
+
 import {
   transformAnsiblePlaybook,
 } from './ApplicationDefinitionHelper';
@@ -41,6 +46,7 @@ export const initApplicationDefinition = (
   ansiblePlaybook,
   services,
   ansibleVarsAll,
+  supportedPlugins,
   headerFormatter,
   inlineEditFormatter,
   inlineEditButtonsFormatter,
@@ -167,6 +173,7 @@ export const initApplicationDefinition = (
   }
   initialState.services = services;
   initialState.ansibleVarsAll = ansibleVarsAll;
+  initialState.hiddenForemanParameterTypes = supportedPluginsToHiddenParameterTypes(supportedPlugins);
 
   dispatch({
     type: APPLICATION_DEFINITION_INIT,
@@ -182,6 +189,11 @@ const errorHandler = (msg, err) => {
   return { type: msg, payload: { error } };
 };
 
+export const closeAlertModal = () => ({
+  type: APPLICATION_DEFINITION_CLOSE_ALERT_MODAL,
+  payload: {}
+});
+
 export const loadAnsibleData = (
   ansiblePlaybookId,
   additionalData

data/webpack/components/ApplicationDefinition/ApplicationDefinitionConstants.js

@@ -1,4 +1,5 @@
 export const APPLICATION_DEFINITION_INIT = 'INIT_APPLICATION_DEFINITION_INIT';
+export const APPLICATION_DEFINITION_CLOSE_ALERT_MODAL = 'APPLICATION_DEFINITION_CLOSE_ALERT_MODAL';
 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';

data/webpack/components/ApplicationDefinition/ApplicationDefinitionReducer.js

@@ -1,4 +1,5 @@
 import Immutable from 'seamless-immutable';
+import { translate as __ } from 'foremanReact/common/I18n';
 
 import {
   cloneDeep,
@@ -8,6 +9,7 @@ import {
 
 import {
   APPLICATION_DEFINITION_INIT,
+  APPLICATION_DEFINITION_CLOSE_ALERT_MODAL,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_SUCCESS,
   APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE,
@@ -45,8 +47,15 @@ const applicationDefinitionConf = (state = initialState, action) => {
     case APPLICATION_DEFINITION_INIT: {
       return state.merge(payload);
     }
-
+    case APPLICATION_DEFINITION_CLOSE_ALERT_MODAL: {
+      return state.merge({
+        showAlertModal: false,
+        alertModalTitle: '',
+        alertModalText: '',
+      });
+    }
    case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_FAILURE: {
+      console.log("Error while loading ansible data: "+ payload.error);
       return state.merge({ error: payload.error, loading: false });
     }
     case APPLICATION_DEFINITION_LOAD_ANSIBLE_DATA_REQUEST: {
@@ -113,23 +122,35 @@ const applicationDefinitionConf = (state = initialState, action) => {
       const thisService = services[index];
 
       if (thisService.name == '') {
-        window.alert("Every service needs to have a valid name.");
-        return state;
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Every service needs to have a valid name."),
+        });
       }
 
       if (thisService.hostgroup == '') {
-        window.alert("Every service needs to be assigned to a hostgroup.");
-        return state;
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Every service needs to be assigned to a hostgroup."),
+        });
       }
 
       if (thisService.ansibleGroup == '') {
-        window.alert("Every service needs to be assigned to a ansible group.");
-        return state;
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Every service needs to be assigned to an ansible group."),
+        });
       }
 
       if (state.services.filter(v => v.name === thisService.name && v.id != thisService.id).length > 0) {
-        window.alert("Service name already used in this Application Definition. Please make sure that every service name is unique.");
-        return state;
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Service name already used in this Application Definition. Please make sure that every service name is unique."),
+        });
       }
 
       delete services[index].backup;

data/webpack/components/ApplicationDefinition/ApplicationDefinitionSelectors.js

@@ -1,9 +1,13 @@
 const applicationDefinitionConf = state => state.foremanAcd.applicationDefinitionConf;
 
+export const selectShowAlertModal = state => applicationDefinitionConf(state).showAlertModal;
+export const selectAlertModalText = state => applicationDefinitionConf(state).alertModalText;
+export const selectAlertModalTitle = state => applicationDefinitionConf(state).alertModalTitle;
 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 selectHiddenForemanParameterTypes = state => applicationDefinitionConf(state).hiddenForemanParameterTypes;
 export const selectParametersData = state => applicationDefinitionConf(state).parametersData;
 export const selectAnsibleVarsAll = state => applicationDefinitionConf(state).ansibleVarsAll;
 export const selectParamEditMode = state => applicationDefinitionConf(state).paramEditMode;

data/webpack/components/ApplicationDefinition/__fixtures__/applicationDefinitionConfData_1.fixtures.js

@@ -0,0 +1,288 @@
+export const applicationDefinitionConfData_1 = {
+  name: false,
+  error: {
+    errorMsg: '',
+    status: '',
+    statusText: ''
+  },
+  columns: [
+    {
+      property: 'name',
+      header: {
+        label: 'Name',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 0,
+          style: {
+            width: '15%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    },
+    {
+      property: 'description',
+      header: {
+        label: 'Description',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 1,
+          style: {
+            width: '10%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    },
+    {
+      property: 'hostgroup',
+      header: {
+        label: 'Hostgroup',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 2,
+          style: {
+            width: '20%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    },
+    {
+      property: 'ansibleGroup',
+      header: {
+        label: 'Ansible Group',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 3,
+          style: {
+            width: '20%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    },
+    {
+      property: 'minCount',
+      header: {
+        label: 'min count',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 4,
+          style: {
+            width: '10%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    },
+    {
+      property: 'maxCount',
+      header: {
+        label: 'max count',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 5,
+          style: {
+            width: '10%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    },
+    {
+      property: 'actions',
+      header: {
+        label: 'Actions',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 6,
+          style: {
+            width: '15%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    }
+  ],
+  ansiblePlaybook: {
+    id: 2,
+    name: 'LAMP',
+    groups: {
+      webservers: [
+        {
+          id: 0,
+          name: 'dummy_var',
+          value: '0'
+        }
+      ],
+      dbservers: [
+        {
+          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'
+        }
+      ],
+      all: [
+        {
+          id: 0,
+          name: 'repository',
+          value: 'https://github.com/bennojoy/mywebapp.git'
+        }
+      ]
+    }
+  },
+  services: [
+    {
+      id: 1,
+      name: 'web',
+      description: '',
+      hostgroup: '1',
+      ansibleGroup: 'webservers',
+      minCount: '2',
+      maxCount: '',
+      foremanParameters: [
+        {
+          id: 1,
+          locked: false,
+          name: 'CP',
+          description: '',
+          type: 'computeprofile',
+          value: '1'
+        },
+        {
+          id: 2,
+          locked: true,
+          name: 'LE',
+          description: '',
+          type: 'lifecycleenv',
+          value: '1'
+        }
+      ],
+      ansibleParameters: [
+        {
+          id: 0,
+          name: 'dummy_var',
+          value: '0'
+        }
+      ]
+    },
+    {
+      id: 2,
+      name: 'db',
+      description: '',
+      hostgroup: '1',
+      ansibleGroup: 'dbservers',
+      minCount: '1',
+      maxCount: '',
+      foremanParameters: [],
+      ansibleParameters: [
+        {
+          id: 0,
+          name: 'mysqlservice',
+          value: 'mysqld'
+        },
+        {
+          id: 1,
+          name: 'mysql_port',
+          value: '3306',
+          locked: true
+        },
+        {
+          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'
+        }
+      ]
+    }
+  ],
+  ansibleVarsAll: [
+    {
+      id: 0,
+      name: 'repository',
+      value: 'https://github.com/bennojoy/mywebapp.git'
+    }
+  ]
+}