foreman_acd 0.6.0 → 0.7.0

data/webpack/components/ApplicationInstance/ApplicationInstance.js

@@ -15,10 +15,10 @@ 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 AppDefinitionSelector from './components/AppDefinitionSelector';
 import ServiceCounter from './components/ServiceCounter';
 import { arrayToObject } from '../../helper';
+import { EasyHeaderFormatter } from '../../helper';
 
 import {
   Table,
@@ -63,8 +63,6 @@ class ApplicationInstance extends React.Component {
     const invalidMinServices = this.props.services.filter(s => (Number(s.minCount) != 0) && (s.currentCount < s.minCount));
     const invalidMaxServices = this.props.services.filter(s => (Number(s.maxCount) != 0) && (s.currentCount > s.maxCount));
 
-    console.log(invalidMinServices);
-
     if (invalidMinServices.length > 0 || invalidMaxServices.length > 0) {
       result = false;
 
@@ -217,8 +215,8 @@ class ApplicationInstance extends React.Component {
           prettyValue = serviceList[value];
           return inlineEditFormatterImpl.renderValue(prettyValue, additionalData)
         }
-	if (additionalData.property == 'hostname') {
-	  if (additionalData.rowData.newEntry === true) {
+        if (additionalData.property == 'hostname') {
+          if (additionalData.rowData.newEntry === true) {
             return inlineEditFormatterImpl.renderEditText(value, additionalData);
           }
           return inlineEditFormatterImpl.renderValue(prettyValue, additionalData)

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,78 @@
+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 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,23 @@
+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: [],
+    },
+    loadApplicationDefinition: noop,
+    initApplicationInstance: noop,
+    addApplicationInstanceHost: noop,
+  },
+};
+
+describe('ApplicationInstance', () =>
+  testComponentSnapshotsWithFixtures(ApplicationInstance, fixtures));

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

@@ -0,0 +1,119 @@
+import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
+import reducer, { initialState } from '../ApplicationInstanceReducer';
+
+import {
+  successState,
+  editState,
+  initApplicationInstancePayload,
+  addHostPayload,
+  deleteHostPayload,
+  activateEditHostPayload,
+  confirmEditHostPayload,
+  cancelEditHostPayload,
+  changeEditHostPayload,
+  loadApplicationDefinitionRequestPayload,
+  loadApplicationDefinitionSuccessPayload,
+  loadApplicationDefinitionFailurePayload,
+} from '../__fixtures__/applicationInstanceReducer.fixtures';
+
+import {
+  APPLICATION_INSTANCE_INIT,
+  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_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_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 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));