foreman_acd 0.2.1 → 0.7.0

data/webpack/components/ApplicationInstance/__tests__/__snapshots__/ApplicationInstanceSelectors.test.js.snap

@@ -0,0 +1,276 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`ApplicationInstanceSelectors should return ParamEditMode from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
+
+exports[`ApplicationInstanceSelectors should return ansibleVarsAll from applicationInstanceConfData_1 fixtures 1`] = `
+Array [
+  Object {
+    "id": 0,
+    "name": "repository",
+    "value": "https://github.com/bennojoy/mywebapp.git",
+  },
+]
+`;
+
+exports[`ApplicationInstanceSelectors should return appDefinition from applicationInstanceConfData_1 fixtures 1`] = `
+Object {
+  "ansible_vars_all": "[{\\"id\\":0,\\"name\\":\\"repository\\",\\"value\\":\\"https://github.com/bennojoy/mywebapp.git\\"}]",
+  "created_at": "2021-03-11 12:51:34 +0100",
+  "description": "",
+  "id": 1,
+  "location_ids": Array [
+    2,
+  ],
+  "name": "LAMP",
+  "organization_ids": Array [
+    1,
+  ],
+  "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\\"}]}]",
+  "updated_at": "2021-03-13 00:06:12 +0100",
+}
+`;
+
+exports[`ApplicationInstanceSelectors should return columns from applicationInstanceConfData_1 fixtures 1`] = `
+Array [
+  Object {
+    "cell": Object {
+      "formatters": Array [
+        null,
+      ],
+    },
+    "header": Object {
+      "formatters": Array [
+        null,
+      ],
+      "label": "Hostname",
+      "props": Object {
+        "index": 0,
+        "style": Object {
+          "width": "30%",
+        },
+      },
+    },
+    "property": "hostname",
+  },
+  Object {
+    "cell": Object {
+      "formatters": Array [
+        null,
+      ],
+    },
+    "header": Object {
+      "formatters": Array [
+        null,
+      ],
+      "label": "Description",
+      "props": Object {
+        "index": 1,
+        "style": Object {
+          "width": "30%",
+        },
+      },
+    },
+    "property": "description",
+  },
+  Object {
+    "cell": Object {
+      "formatters": Array [
+        null,
+      ],
+    },
+    "header": Object {
+      "formatters": Array [
+        null,
+      ],
+      "label": "Service",
+      "props": Object {
+        "index": 2,
+        "style": Object {
+          "width": "20%",
+        },
+      },
+    },
+    "property": "service",
+  },
+  Object {
+    "cell": Object {
+      "formatters": Array [
+        null,
+      ],
+    },
+    "header": Object {
+      "formatters": Array [
+        null,
+      ],
+      "label": "Actions",
+      "props": Object {
+        "index": 4,
+        "style": Object {
+          "width": "20%",
+        },
+      },
+    },
+    "property": "actions",
+  },
+]
+`;
+
+exports[`ApplicationInstanceSelectors should return editMode from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
+
+exports[`ApplicationInstanceSelectors should return hosts from applicationInstanceConfData_1 fixtures 1`] = `
+Array [
+  Object {
+    "ansibleParameters": Array [
+      Object {
+        "id": 0,
+        "name": "mysqlservice",
+        "value": "mysqld",
+      },
+      Object {
+        "id": 1,
+        "name": "mysql_port",
+        "value": "3306",
+      },
+      Object {
+        "id": 2,
+        "name": "dbuser",
+        "value": "webapp",
+      },
+      Object {
+        "id": 3,
+        "name": "dbname",
+        "value": "ANSAP01",
+      },
+      Object {
+        "id": 4,
+        "name": "upassword",
+        "value": "Bond@007",
+      },
+      Object {
+        "id": 5,
+        "name": "masterpassword",
+        "value": "MySQL@007",
+      },
+    ],
+    "description": "",
+    "foremanParameters": Array [],
+    "hostname": "great-web-app-db-1",
+    "id": 4,
+    "service": "2",
+  },
+  Object {
+    "ansibleParameters": Array [
+      Object {
+        "id": 0,
+        "name": "dummy_var",
+        "value": "0",
+      },
+    ],
+    "description": "",
+    "foremanParameters": Array [],
+    "hostname": "great-web-app-web-1",
+    "id": 1,
+    "service": "1",
+  },
+  Object {
+    "ansibleParameters": Array [
+      Object {
+        "id": 0,
+        "name": "dummy_var",
+        "value": "0",
+      },
+    ],
+    "description": "",
+    "foremanParameters": Array [],
+    "hostname": "great-web-app-web-2",
+    "id": 2,
+    "service": "1",
+  },
+]
+`;
+
+exports[`ApplicationInstanceSelectors should return parametersData from applicationInstanceConfData_1 fixtures 1`] = `undefined`;
+
+exports[`ApplicationInstanceSelectors should return services from applicationInstanceConfData_1 fixtures 1`] = `
+Array [
+  Object {
+    "ansibleGroup": "webservers",
+    "ansibleParameters": Array [
+      Object {
+        "id": 0,
+        "name": "dummy_var",
+        "value": "0",
+      },
+    ],
+    "currentCount": 2,
+    "description": "",
+    "foremanParameters": Array [
+      Object {
+        "description": "",
+        "id": 1,
+        "locked": false,
+        "name": "CP",
+        "type": "computeprofile",
+        "value": "1",
+      },
+      Object {
+        "description": "",
+        "id": 2,
+        "locked": true,
+        "name": "LE",
+        "type": "lifecycleenv",
+        "value": "1",
+      },
+    ],
+    "hostgroup": "1",
+    "id": 1,
+    "maxCount": "",
+    "minCount": "2",
+    "name": "web",
+  },
+  Object {
+    "ansibleGroup": "dbservers",
+    "ansibleParameters": Array [
+      Object {
+        "id": 0,
+        "name": "mysqlservice",
+        "value": "mysqld",
+      },
+      Object {
+        "id": 1,
+        "locked": true,
+        "name": "mysql_port",
+        "value": "3306",
+      },
+      Object {
+        "id": 2,
+        "name": "dbuser",
+        "value": "webapp",
+      },
+      Object {
+        "id": 3,
+        "name": "dbname",
+        "value": "ANSAP01",
+      },
+      Object {
+        "id": 4,
+        "name": "upassword",
+        "value": "Bond@007",
+      },
+      Object {
+        "id": 5,
+        "name": "masterpassword",
+        "value": "MySQL@007",
+      },
+    ],
+    "currentCount": 1,
+    "description": "",
+    "foremanParameters": Array [],
+    "hostgroup": "1",
+    "id": 2,
+    "maxCount": "",
+    "minCount": "1",
+    "name": "db",
+  },
+]
+`;

data/webpack/components/ApplicationInstance/components/Service.js

@@ -9,7 +9,7 @@ const Service= ({
 }) =>{
   return (
     <div>
-      <label>{name}:</label> {currentCount} (Min/Max: {minCount}/{maxCount})
+      <label>{name}:</label> {currentCount} ({__("Min/Max")}: {minCount}/{maxCount})
     </div>
   );
 };

data/webpack/components/ApplicationInstance/index.js

@@ -12,6 +12,8 @@ import {
   selectServices,
   selectColumns,
   selectParametersData,
+  selectAnsibleVarsAll,
+  selectParamEditMode,
 } from './ApplicationInstanceSelectors';
 
 const mapStateToProps = state => ({
@@ -21,6 +23,8 @@ const mapStateToProps = state => ({
   services: selectServices(state),
   columns: selectColumns(state),
   parametersData: selectParametersData(state),
+  ansibleVarsAll: selectAnsibleVarsAll(state),
+  paramEditMode: selectParamEditMode(state),
 });
 
 const mapDispatchToProps = dispatch =>

data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReport.js

@@ -5,6 +5,10 @@ import {
   VerticalTabs,
 } from 'patternfly-react-extensions';
 
+import {
+  translate as __
+} from 'foremanReact/common/I18n';
+
 import PowerStatus from 'foremanReact/components/hosts/powerStatus';
 import ReportViewer from './components/ReportViewer';
 
@@ -18,54 +22,20 @@ class ApplicationInstanceReport extends React.Component {
     const {
       data: { hosts, mode },
       initApplicationInstanceReport,
-      setActiveAndLoadLiveReport,
+      setActiveHost,
     } = this.props;
 
     initApplicationInstanceReport(hosts);
-
-    if (mode == 'liveReport') {
-      if (hosts.length > 0) {
-        const index = 0;
-        const url = `/api/v2/orchestration/${hosts[index].progress_report_id}/tasks`;
-        setActiveAndLoadLiveReport(index, url);
-      }
-    }
   };
 
   isActive(id) {
     return (this.props.activeHostId === id);
   }
 
-  collectLiveData(hosts) {
-    const {
-      setActiveAndLoadLiveReport,
-    } = this.props;
-    const tabs = []
-
-    for (const [index, value] of hosts.entries()) {
-      const url = `/api/v2/orchestration/${hosts[index].progress_report_id}/tasks`
-
-      tabs.push(
-        <VerticalTabs.Tab
-          id={index}
-          key={"vt_tab_"+index}
-          title={ value.name }
-          wrapStyle='nowrap'
-          onActivate={() => setActiveAndLoadLiveReport(index, url)}
-          active={this.isActive(index)}
-        />
-      );
-    }
-
-    return tabs;
-  }
-
   collectLastReportData(hosts) {
     const {
-      setActiveAndLoadLastReport,
+      setActiveHost,
     } = this.props;
-    // FIXME
-    const url = undefined;
 
     const tabs = []
     for (const [index, value] of hosts.entries()) {
@@ -75,7 +45,7 @@ class ApplicationInstanceReport extends React.Component {
           key={"vt_tab_"+index}
           title={ value.name }
           wrapStyle='nowrap'
-          onActivate={() => setActiveAndLoadLastReport(index, url)}
+          onActivate={() => setActiveHost(index)}
           active={this.isActive(index)}
         />
       );
@@ -84,43 +54,61 @@ class ApplicationInstanceReport extends React.Component {
     return tabs;
   }
 
-  liveReportStatus(host) {
-    return (
-      <span>Host: <a href={ host['hostUrl'] }>{ host['hostname'] }</a></span>
-    );
-  }
-
   lastReportStatus(host) {
-    return (
-      <div>
-        <span>Host: <a href={ host['hostUrl'] }>{ host['hostname'] }</a></span>
-        <span>&nbsp;|&nbsp;</span>
-        <span>Power Status: <PowerStatus data={{ id: host['id'], url: host['powerStatusUrl'] }} /></span>
-      </div>
-    )
+    if (!host['id']) {
+      return (
+        <div>
+          <span>Host: { host['name'] }</span>
+          <span>&nbsp;|&nbsp;</span>
+          <span>State: { __('not build') }</span>
+          <span>&nbsp;|&nbsp;</span>
+          <span>Power Status: { __('unknown') }</span>
+        </div>
+      )
+    } else {
+      return (
+        <div>
+          <span>Host: <a href={ host['hostUrl'] }>{ host['name'] }</a></span>
+          <span>&nbsp;|&nbsp;</span>
+          <span>State: { host['build'] == true ? "in Build" : "Deployed" }</span>
+          <span>&nbsp;|&nbsp;</span>
+          <span>Power Status: <PowerStatus key={ "power_status_"+ host['id'] } data={{ id: host['id'], url: host['powerStatusUrl'] }} /></span>
+        </div>
+      )
+    }
   }
 
   render() {
     const {
-      data: { hosts, mode },
-      report,
+      data: { hosts, mode, appInstanceName, deployTaskUrl, configureJobUrl },
       activeHostId,
     } = this.props;
 
     let tabs = [];
     let reportStatus = undefined;
+    let report = undefined;
 
-    if (mode == 'liveReport') {
-      tabs = this.collectLiveData(hosts);
-      reportStatus = this.liveReportStatus(hosts[activeHostId])
-    } else if (mode == 'lastReport') {
-      tabs = this.collectLastReportData(hosts);
-      reportStatus = this.lastReportStatus(hosts[activeHostId])
+    tabs = this.collectLastReportData(hosts);
+    reportStatus = this.lastReportStatus(hosts[activeHostId]);
+
+    if (hosts[activeHostId]['progress_report']) {
+      report = hosts[activeHostId]['progress_report'];
     }
 
     return (
       <span>
+        <div className="deploy_status">
+          <div>
+            <div className="deploy_status_head">Deployment task</div>
+            <div className="deploy_status_content"><a href={ deployTaskUrl } >Last deployment task</a></div>
+          </div>
+          <div>
+            <div className="deploy_status_head">Configuration job</div>
+            <div className="deploy_status_content"><a href={ configureJobUrl }>Configuration jobs</a></div>
+          </div>
+        </div>
         <div className="deploy_report_hosts">
+          Hosts
           <VerticalTabs id="vertical_tabs">
             {tabs}
           </VerticalTabs>
@@ -137,6 +125,9 @@ class ApplicationInstanceReport extends React.Component {
 
 ApplicationInstanceReport.defaultProps = {
   error: {},
+  appInstanceName: '',
+  deployTaskUrl: '',
+  configureJobUrl: '',
   hosts: [],
   report: [],
   activeHostId: 0,
@@ -144,10 +135,12 @@ ApplicationInstanceReport.defaultProps = {
 
 ApplicationInstanceReport.propTypes = {
   initApplicationInstanceReport: PropTypes.func,
+  appInstanceName: PropTypes.string,
+  deployTaskUrl: PropTypes.string,
+  configureJobUrl: PropTypes.string,
   hosts: PropTypes.array,
   report: PropTypes.array,
-  setActiveAndLoadLiveReport: PropTypes.func,
-  setActiveAndLoadLastReport: PropTypes.func,
+  setActiveHost: PropTypes.func,
   activeHostId: PropTypes.number,
 
 };