foreman_acd 0.4.0 → 0.9.0

data/webpack/components/ApplicationInstance/ApplicationInstanceReducer.js

@@ -1,4 +1,6 @@
 import Immutable from 'seamless-immutable';
+import { translate as __ } from 'foremanReact/common/I18n';
+import { calculateServiceUsage } from './ApplicationInstanceHelper';
 
 import {
   cloneDeep,
@@ -8,6 +10,7 @@ import {
 
 import {
   APPLICATION_INSTANCE_INIT,
+  APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST,
   APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
@@ -17,10 +20,14 @@ import {
   APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
   APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
   APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
+  APPLICATION_INSTANCE_HOST_EDIT_ERROR,
   APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
   APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
   APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN,
+  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE,
+  APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
 } from './ApplicationInstanceConstants';
 
 import {
@@ -40,7 +47,15 @@ const applicationInstanceConf = (state = initialState, action) => {
     case APPLICATION_INSTANCE_INIT: {
       return state.merge(payload);
     }
+    case APPLICATION_INSTANCE_CLOSE_ALERT_MODAL: {
+      return state.merge({
+        showAlertModal: false,
+        alertModalTitle: '',
+        alertModalText: '',
+      });
+    }
    case APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE: {
+      console.log("Error while loading application definition data: "+ payload.error);
       return state.merge({ error: payload.error, loading: false });
     }
     case APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST: {
@@ -86,7 +101,7 @@ const applicationInstanceConf = (state = initialState, action) => {
         index = Math.max(...hosts.map(e => e.id)) + 1;
       }
 
-      const newRow = {id: index, hostname: "", description: '', service: '', foremanParameters: [], ansibleParameters: [], newEntry: true };
+      const newRow = {id: index, hostname: "", description: '', service: '', isExistingHost: false, foremanParameters: [], ansibleParameters: [], newEntry: true };
       newRow.backup = cloneDeep(newRow)
       hosts.push(newRow);
 
@@ -124,38 +139,28 @@ const applicationInstanceConf = (state = initialState, action) => {
     case APPLICATION_INSTANCE_HOST_EDIT_CONFIRM: {
       const hosts = cloneDeep(state.hosts);
       const index = findIndex(hosts, { id: payload.rowData.id });
-      const services = cloneDeep(state.services);
+      let services = cloneDeep(state.services);
 
       const thisHost = hosts[index];
 
-      if (thisHost.hostname == '') {
-        window.alert("Every host needs to have a valid name");
-        return state;
-      }
-
-      if (thisHost.service == '') {
-        window.alert("Every host needs to be assigned to a service");
-        return state;
-      }
+      // hostnames are lower case
+      thisHost.hostname = thisHost.hostname.toLowerCase();
 
       if (state.hosts.filter(v => v.hostname === thisHost.hostname && v.id != thisHost.id).length > 0) {
-        window.alert("Host name already used for this Application Instance. Please make sure that every host name is unique");
-        return state;
+        return state.merge({
+          showAlertModal: true,
+          alertModalTitle: __("Error"),
+          alertModalText: __("Host name already used in this Application Instance. Please make sure that every host name is unique."),
+        });
       }
 
       // Initialize the new Instance with the parameters of the Application Definition.
       if (thisHost.newEntry === true) {
-          const selectedService = state.services.filter(entry => entry.id == payload.rowData.service)[0];
+          const hostServiceId = Number(thisHost.service);
+          const selectedService = services.filter(entry => entry.id == hostServiceId)[0];
           hosts[index].foremanParameters = selectedService.foremanParameters;
           hosts[index].ansibleParameters = selectedService.ansibleParameters;
-
-          const hostServiceId = Number(thisHost.service);
-          const service = services.find(serv => serv['id'] == hostServiceId);
-          if ('currentCount' in service) {
-            service['currentCount'] += 1;
-          } else {
-            service['currentCount'] = 1;
-          }
+          services = calculateServiceUsage(hostServiceId, services);
       }
 
       delete hosts[index].backup;
@@ -191,6 +196,13 @@ const applicationInstanceConf = (state = initialState, action) => {
         hosts: hosts
       });
     }
+    case APPLICATION_INSTANCE_HOST_EDIT_ERROR: {
+      return state.merge({
+        showAlertModal: true,
+        alertModalTitle: __("Error"),
+        alertModalText: payload,
+      });
+    }
     case APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN: {
       let parametersData = {};
 
@@ -287,6 +299,49 @@ const applicationInstanceConf = (state = initialState, action) => {
       }
       return state.merge(newState);
     }
+    case APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN: {
+    }
+    case APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE: {
+      if (payload.mode == 'save') {
+        let newState;
+        let hosts = [];
+        let index = 1;
+        let services = cloneDeep(state.services);
+
+        if ('hosts' in state && state.hosts !== undefined && state.hosts.length > 0) {
+          hosts = cloneDeep(state.hosts);
+          index = Math.max(...hosts.map(e => e.id));
+        }
+
+        payload.selectedHosts.forEach(host => {
+          if ((state.hosts == undefined) || (state.hosts.find(h => h.hostname == host.hostname) == undefined)) {
+            index += 1;
+            const selectedService = services.filter(entry => entry.id == host.serviceId)[0];
+            const newRow = {
+              id: index,
+              hostname: host.hostname,
+              description: '',
+              service: host.serviceId,
+              isExistingHost: true,
+              foremanParameters: [], // we will never set this because we don't want to change a already existing host.
+              ansibleParameters: selectedService.ansibleParameters,
+            }
+            hosts.push(newRow);
+            services = calculateServiceUsage(host.serviceId, services);
+          }
+        });
+
+        return state.merge({
+          hosts: hosts,
+          services, services
+        });
+      } else {
+        return state;
+      }
+    }
+    case APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE: {
+      return state.merge({ paramEditMode: payload.mode });
+    }
     default:
       return state;
   }

data/webpack/components/ApplicationInstance/ApplicationInstanceSelectors.js

@@ -1,5 +1,8 @@
 const applicationInstanceConf = state => state.foremanAcd.applicationInstanceConf;
 
+export const selectShowAlertModal = state => applicationInstanceConf(state).showAlertModal;
+export const selectAlertModalText = state => applicationInstanceConf(state).alertModalText;
+export const selectAlertModalTitle = state => applicationInstanceConf(state).alertModalTitle;
 export const selectEditMode = state => applicationInstanceConf(state).editMode;
 export const selectAppDefinition = state => applicationInstanceConf(state).appDefinition;
 export const selectHosts = state => applicationInstanceConf(state).hosts;
@@ -7,3 +10,4 @@ export const selectColumns = state => applicationInstanceConf(state).columns;
 export const selectServices = state => applicationInstanceConf(state).services;
 export const selectParametersData = state => applicationInstanceConf(state).parametersData;
 export const selectAnsibleVarsAll = state => applicationInstanceConf(state).ansibleVarsAll;
+export const selectParamEditMode = state => applicationInstanceConf(state).paramEditMode;

data/webpack/components/ApplicationInstance/__fixtures__/applicationInstanceConfData_1.fixtures.js

@@ -0,0 +1,263 @@
+export const applicationInstanceConfData_1 = {
+  name: false,
+  error: {
+    errorMsg: '',
+    status: '',
+    statusText: ''
+  },
+  loading: false,
+  columns: [
+    {
+      property: 'hostname',
+      header: {
+        label: 'Hostname',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 0,
+          style: {
+            width: '30%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    },
+    {
+      property: 'description',
+      header: {
+        label: 'Description',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 1,
+          style: {
+            width: '30%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    },
+    {
+      property: 'service',
+      header: {
+        label: 'Service',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 2,
+          style: {
+            width: '20%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    },
+    {
+      property: 'actions',
+      header: {
+        label: 'Actions',
+        formatters: [
+          null
+        ],
+        props: {
+          index: 4,
+          style: {
+            width: '20%'
+          }
+        }
+      },
+      cell: {
+        formatters: [
+          null
+        ]
+      }
+    }
+  ],
+  appDefinition: {
+    id: 1,
+    name: 'LAMP',
+    description: '',
+    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"}]}]',
+    ansible_vars_all: '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]',
+    location_ids: [
+      2
+    ],
+    organization_ids: [
+      1
+    ],
+    created_at: '2021-03-11 12:51:34 +0100',
+    updated_at: '2021-03-13 00:06:12 +0100'
+  },
+  hosts: [
+    {
+      id: 4,
+      hostname: 'great-web-app-db-1',
+      service: '2',
+      description: '',
+      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: 1,
+      hostname: 'great-web-app-web-1',
+      service: '1',
+      description: '',
+      foremanParameters: [],
+      ansibleParameters: [
+        {
+          id: 0,
+          name: 'dummy_var',
+          value: '0'
+        }
+      ]
+    },
+    {
+      id: 2,
+      hostname: 'great-web-app-web-2',
+      service: '1',
+      description: '',
+      foremanParameters: [],
+      ansibleParameters: [
+        {
+          id: 0,
+          name: 'dummy_var',
+          value: '0'
+        }
+      ]
+    }
+  ],
+  ansibleVarsAll: [
+    {
+      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'
+        }
+      ],
+      currentCount: 2
+    },
+    {
+      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'
+        }
+      ],
+      currentCount: 1
+    }
+  ]
+}

data/webpack/components/ApplicationInstance/__fixtures__/applicationInstanceReducer.fixtures.js

@@ -0,0 +1,80 @@
+import Immutable from 'seamless-immutable';
+import {
+   cloneDeep,
+   findIndex,
+   findLastIndex,
+} from 'lodash';
+
+import {
+  applicationInstanceConfData_1,
+} from '../__fixtures__/applicationInstanceConfData_1.fixtures';
+
+export const successState = Immutable(applicationInstanceConfData_1);
+
+const EDIT_ROW_ID = 2;
+
+const editClone = applicationInstanceConfData_1;
+const editIndex = findIndex(editClone.hosts, { id: EDIT_ROW_ID })
+editClone["hosts"][editIndex].backup = cloneDeep(editClone["hosts"][editIndex]);
+export const editState = Immutable(editClone);
+
+// Payload Data
+export const initApplicationInstancePayload = applicationInstanceConfData_1;
+
+export const closeAlertModalPayload = { };
+export const addHostPayload = { };
+export const deleteHostPayload = {
+  rowData: {
+    id: EDIT_ROW_ID,
+  },
+};
+export const activateEditHostPayload = {
+  rowData: {
+    id: EDIT_ROW_ID,
+  },
+};
+export const confirmEditHostPayload = {
+  rowData: {
+    id: EDIT_ROW_ID,
+  },
+};
+export const cancelEditHostPayload = {
+  rowData: {
+    id: EDIT_ROW_ID,
+  },
+};
+export const changeEditHostPayload = {
+  value: "helloworld",
+  property: "name",
+  rowData: {
+    id: EDIT_ROW_ID,
+  }
+};
+
+export const loadApplicationDefinitionRequestPayload = {
+  clearRows: false,
+};
+
+export const loadApplicationDefinitionSuccessPayload = {
+  app_definition: {
+    id: 1,
+    name: "LAMP",
+    description: "",
+    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\"}]}]",
+    "ansible_vars_all": "[{\"id\":0,\"name\":\"repository\",\"value\":\"https://github.com/bennojoy/mywebapp.git\"}]",
+    location_ids: [
+      2
+    ],
+    organization_ids: [
+      1
+    ],
+    created_at: "2021-03-11 12:51:34 +0100",
+    updated_at: "2021-03-13 00:06:12 +0100"
+  },
+  foreman_data: null,
+  ansible_data: null
+};
+
+export const loadApplicationDefinitionFailurePayload = {
+  error: "Something really bad happend",
+};

data/webpack/components/ApplicationInstance/__tests__/ApplicationInstance.test.js

@@ -0,0 +1,24 @@
+import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
+
+import ApplicationInstance from '../ApplicationInstance';
+
+const noop = () => {};
+
+const fixtures = {
+  'should render application instance': {
+    data: {
+      location: "Default Location",
+      organization: "Default Organization",
+      appDefinition: {},
+      hosts: [],
+      ansibleVarsAll: [],
+    },
+    closeAlertModal: noop,
+    loadApplicationDefinition: noop,
+    initApplicationInstance: noop,
+    addApplicationInstanceHost: noop,
+  },
+};
+
+describe('ApplicationInstance', () =>
+  testComponentSnapshotsWithFixtures(ApplicationInstance, fixtures));

data/webpack/components/ApplicationInstance/__tests__/ApplicationInstanceReducer.test.js

@@ -0,0 +1,131 @@
+import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import reducer, { initialState } from '../ApplicationInstanceReducer';
+
+import {
+  successState,
+  editState,
+  initApplicationInstancePayload,
+  closeAlertModalPayload,
+  addHostPayload,
+  deleteHostPayload,
+  activateEditHostPayload,
+  confirmEditHostPayload,
+  cancelEditHostPayload,
+  changeEditHostPayload,
+  loadApplicationDefinitionRequestPayload,
+  loadApplicationDefinitionSuccessPayload,
+  loadApplicationDefinitionFailurePayload,
+} from '../__fixtures__/applicationInstanceReducer.fixtures';
+
+import {
+  APPLICATION_INSTANCE_INIT,
+  APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
+  APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST,
+  APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
+  APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
+  APPLICATION_INSTANCE_HOST_DELETE,
+  APPLICATION_INSTANCE_HOST_ADD,
+  APPLICATION_INSTANCE_HOST_EDIT_ACTIVATE,
+  APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
+  APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
+  APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
+  APPLICATION_INSTANCE_HOST_EDIT_ERROR,
+  APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
+  APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
+  APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
+  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN,
+  APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE,
+  APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
+} from '../ApplicationInstanceConstants';
+
+const fixtures = {
+  'should return initial state': {
+    state: initialState,
+    action: {
+      type: undefined,
+      payload: {},
+    },
+  },
+
+  'should initialize component': {
+    state: initialState,
+    action: {
+      type: APPLICATION_INSTANCE_INIT,
+      payload: initApplicationInstancePayload,
+    },
+  },
+  'should close alert modal': {
+    state: successState,
+    action: {
+      type: APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
+      payload: closeAlertModalPayload,
+    },
+  },
+  'should add a host': {
+    state: successState,
+    action: {
+      type: APPLICATION_INSTANCE_HOST_ADD,
+      payload: addHostPayload,
+    },
+  },
+  'should delete a host': {
+    state: successState,
+    action: {
+      type: APPLICATION_INSTANCE_HOST_DELETE,
+      payload: deleteHostPayload,
+    },
+  },
+  'should activate edit host': {
+    state: successState,
+    action: {
+      type: APPLICATION_INSTANCE_HOST_EDIT_ACTIVATE,
+      payload: activateEditHostPayload,
+    },
+  },
+  'should change edit host': {
+    state: editState,
+    action: {
+      type: APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
+      payload: changeEditHostPayload,
+    },
+  },
+  'should confirm edit host': {
+    state: editState,
+    action: {
+      type: APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
+      payload: confirmEditHostPayload,
+    },
+  },
+  'should cancel edit host': {
+    state: editState,
+    action: {
+      type: APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
+      payload: cancelEditHostPayload,
+    },
+  },
+  'should request load param data': {
+    state: successState,
+    action: {
+      type: APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST,
+      payload: loadApplicationDefinitionRequestPayload,
+    },
+  },
+  'should load param data be successful': {
+    state: successState,
+    action: {
+      type: APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
+      payload: loadApplicationDefinitionSuccessPayload,
+    },
+  },
+  'should load param data be erroneous': {
+    state: successState,
+    action: {
+      type: APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
+      payload: loadApplicationDefinitionFailurePayload,
+    },
+  },
+};
+
+describe('ApplicationInstanceReducer', () =>
+  testReducerSnapshotWithFixtures(reducer, fixtures));