foreman_acd 0.6.0 → 0.9.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (197) hide show
  1. checksums.yaml +4 -4
  2. data/README.md +5 -5
  3. data/app/controllers/foreman_acd/ansible_playbooks_controller.rb +90 -0
  4. data/app/controllers/foreman_acd/app_definitions_controller.rb +104 -7
  5. data/app/controllers/foreman_acd/app_instances_controller.rb +34 -32
  6. data/app/controllers/foreman_acd/concerns/ansible_playbook_parameters.rb +1 -1
  7. data/app/controllers/foreman_acd/concerns/app_instance_mixins.rb +36 -0
  8. data/app/controllers/foreman_acd/remote_execution_controller.rb +37 -21
  9. data/app/controllers/ui_acd_controller.rb +42 -3
  10. data/app/lib/actions/foreman_acd/deploy_all_hosts.rb +12 -7
  11. data/app/lib/actions/foreman_acd/run_configurator.rb +11 -7
  12. data/app/models/concerns/foreman_acd/host_managed_extensions.rb +41 -28
  13. data/app/models/foreman_acd/acd_provider.rb +7 -1
  14. data/app/models/foreman_acd/ansible_playbook.rb +2 -1
  15. data/app/models/foreman_acd/app_instance.rb +48 -3
  16. data/app/models/foreman_acd/foreman_host.rb +8 -0
  17. data/app/services/foreman_acd/acd_proxy_proxy_selector.rb +17 -0
  18. data/app/services/foreman_acd/app_configurator.rb +59 -15
  19. data/app/services/foreman_acd/app_deployer.rb +27 -4
  20. data/app/services/foreman_acd/inventory_creator.rb +25 -1
  21. data/app/views/foreman_acd/ansible_playbooks/_form.html.erb +41 -7
  22. data/app/views/foreman_acd/app_definitions/_form.html.erb +5 -1
  23. data/app/views/foreman_acd/app_definitions/import.html.erb +20 -1
  24. data/app/views/foreman_acd/app_definitions/index.html.erb +3 -6
  25. data/app/views/foreman_acd/app_instances/_form.html.erb +5 -1
  26. data/app/views/foreman_acd/app_instances/index.html.erb +18 -12
  27. data/app/views/foreman_acd/app_instances/report.html.erb +8 -3
  28. data/app/views/templates/job/run_acd_ansible_playbook.erb +1 -1
  29. data/app/views/ui_acd/host_report.json.rabl +4 -0
  30. data/app/views/ui_acd/report_data.json.rabl +10 -0
  31. data/app/views/ui_acd/validate_hostname.json.rabl +6 -0
  32. data/config/routes.rb +6 -0
  33. data/db/migrate/20210316151145_add_git_commit_to_ansible_playbooks.rb +8 -0
  34. data/db/migrate/20210503122809_add_git_url_to_ansible_playbooks.rb +8 -0
  35. data/db/migrate/20210818125913_add_is_existing_host_to_foreman_host.rb +8 -0
  36. data/db/migrate/20210902110645_add_initial_configure_task.rb +8 -0
  37. data/db/seeds.d/75-job_templates.rb +1 -1
  38. data/lib/foreman_acd/engine.rb +26 -4
  39. data/lib/foreman_acd/plugin.rb +9 -18
  40. data/lib/foreman_acd/version.rb +1 -1
  41. data/lib/foreman_acd.rb +30 -0
  42. data/lib/tasks/foreman_acd_tasks.rake +0 -12
  43. data/package.json +8 -22
  44. data/test/controllers/ansible_playbooks_controller_test.rb +1 -1
  45. data/test/controllers/app_instances_controller_test.rb +8 -3
  46. data/test/controllers/ui_acd_controller_test.rb +25 -6
  47. data/test/factories/foreman_acd_factories.rb +18 -4
  48. data/test/models/acd_provider_test.rb +37 -0
  49. data/test/models/ansible_playbook_test.rb +11 -0
  50. data/test/models/app_definition_test.rb +1 -1
  51. data/test/models/app_instance_test.rb +2 -0
  52. data/test/models/concerns/host_extensions_test.rb +26 -0
  53. data/test/models/foreman_host_test.rb +12 -0
  54. data/webpack/__mocks__/foremanReact/API.js +2 -0
  55. data/webpack/__mocks__/foremanReact/common/I18n.js +3 -0
  56. data/webpack/__mocks__/foremanReact/common/helpers.js +2 -0
  57. data/webpack/__mocks__/foremanReact/components/ForemanModal/ForemanModalActions.js +2 -0
  58. data/webpack/__mocks__/foremanReact/components/ForemanModal.js +7 -0
  59. data/webpack/__mocks__/foremanReact/components/common/forms/CommonForm.js +2 -0
  60. data/webpack/__mocks__/foremanReact/components/common/forms/TextInput.js +2 -0
  61. data/webpack/__mocks__/foremanReact/components/hosts/powerStatus.js +1 -0
  62. data/webpack/__snapshots__/helper.test.js.snap +14 -0
  63. data/webpack/components/ApplicationDefinition/ApplicationDefinition.js +35 -11
  64. data/webpack/components/ApplicationDefinition/ApplicationDefinitionActions.js +12 -0
  65. data/webpack/components/ApplicationDefinition/ApplicationDefinitionConstants.js +1 -0
  66. data/webpack/components/ApplicationDefinition/ApplicationDefinitionReducer.js +30 -9
  67. data/webpack/components/ApplicationDefinition/ApplicationDefinitionSelectors.js +4 -0
  68. data/webpack/components/ApplicationDefinition/__fixtures__/applicationDefinitionConfData_1.fixtures.js +288 -0
  69. data/webpack/components/ApplicationDefinition/__fixtures__/applicationDefinitionReducer.fixtures.js +79 -0
  70. data/webpack/components/ApplicationDefinition/__tests__/ApplicationDefinition.test.js +26 -0
  71. data/webpack/components/ApplicationDefinition/__tests__/ApplicationDefinitionReducer.test.js +119 -0
  72. data/webpack/components/ApplicationDefinition/__tests__/ApplicationDefinitionSelectors.test.js +53 -0
  73. data/webpack/components/ApplicationDefinition/__tests__/__snapshots__/ApplicationDefinition.test.js.snap +226 -0
  74. data/webpack/components/ApplicationDefinition/__tests__/__snapshots__/ApplicationDefinitionReducer.test.js.snap +3033 -0
  75. data/webpack/components/ApplicationDefinition/__tests__/__snapshots__/ApplicationDefinitionSelectors.test.js.snap +307 -0
  76. data/webpack/components/ApplicationDefinition/components/AnsiblePlaybookSelector.js +2 -1
  77. data/webpack/components/ApplicationDefinition/components/__tests__/AnsiblePlaybookSelector.test.js +41 -0
  78. data/webpack/components/ApplicationDefinition/components/__tests__/__snapshots__/AnsiblePlaybookSelector.test.js.snap +121 -0
  79. data/webpack/components/ApplicationDefinition/index.js +8 -0
  80. data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImport.js +214 -0
  81. data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImport.scss +1 -0
  82. data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImportActions.js +161 -0
  83. data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImportConstants.js +6 -0
  84. data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImportReducer.js +79 -0
  85. data/webpack/components/ApplicationDefinitionImport/ApplicationDefinitionImportSelectors.js +8 -0
  86. data/webpack/components/ApplicationDefinitionImport/__fixtures__/applicationDefinitionImportConfData_1.fixtures.js +129 -0
  87. data/webpack/components/ApplicationDefinitionImport/__fixtures__/applicationDefinitionImportReducer.fixtures.js +29 -0
  88. data/webpack/components/ApplicationDefinitionImport/__tests__/ApplicationDefinitionImport.test.js +20 -0
  89. data/webpack/components/ApplicationDefinitionImport/__tests__/ApplicationDefinitionImportReducer.test.js +43 -0
  90. data/webpack/components/ApplicationDefinitionImport/__tests__/ApplicationDefinitionImportSelectors.test.js +29 -0
  91. data/webpack/components/ApplicationDefinitionImport/__tests__/__snapshots__/ApplicationDefinitionImport.test.js.snap +62 -0
  92. data/webpack/components/ApplicationDefinitionImport/__tests__/__snapshots__/ApplicationDefinitionImportReducer.test.js.snap +362 -0
  93. data/webpack/components/ApplicationDefinitionImport/__tests__/__snapshots__/ApplicationDefinitionImportSelectors.test.js.snap +130 -0
  94. data/webpack/components/ApplicationDefinitionImport/index.js +32 -0
  95. data/webpack/components/ApplicationInstance/ApplicationInstance.js +105 -31
  96. data/webpack/components/ApplicationInstance/ApplicationInstanceActions.js +118 -6
  97. data/webpack/components/ApplicationInstance/ApplicationInstanceConstants.js +4 -0
  98. data/webpack/components/ApplicationInstance/ApplicationInstanceHelper.js +15 -0
  99. data/webpack/components/ApplicationInstance/ApplicationInstanceReducer.js +71 -30
  100. data/webpack/components/ApplicationInstance/ApplicationInstanceSelectors.js +4 -0
  101. data/webpack/components/ApplicationInstance/__fixtures__/applicationInstanceConfData_1.fixtures.js +263 -0
  102. data/webpack/components/ApplicationInstance/__fixtures__/applicationInstanceReducer.fixtures.js +80 -0
  103. data/webpack/components/ApplicationInstance/__tests__/ApplicationInstance.test.js +24 -0
  104. data/webpack/components/ApplicationInstance/__tests__/ApplicationInstanceReducer.test.js +131 -0
  105. data/webpack/components/ApplicationInstance/__tests__/ApplicationInstanceSelectors.test.js +56 -0
  106. data/webpack/components/ApplicationInstance/__tests__/__snapshots__/ApplicationInstance.test.js.snap +300 -0
  107. data/webpack/components/ApplicationInstance/__tests__/__snapshots__/ApplicationInstanceReducer.test.js.snap +2990 -0
  108. data/webpack/components/ApplicationInstance/__tests__/__snapshots__/ApplicationInstanceSelectors.test.js.snap +284 -0
  109. data/webpack/components/ApplicationInstance/components/AppDefinitionSelector.js +1 -0
  110. data/webpack/components/ApplicationInstance/components/ServiceCounter.js +1 -1
  111. data/webpack/components/ApplicationInstance/helper.js +0 -0
  112. data/webpack/components/ApplicationInstance/index.js +8 -0
  113. data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReport.js +81 -6
  114. data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportActions.js +35 -1
  115. data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportConstants.js +3 -0
  116. data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportReducer.js +19 -0
  117. data/webpack/components/ApplicationInstanceReport/ApplicationInstanceReportSelectors.js +4 -0
  118. data/webpack/components/ApplicationInstanceReport/__fixtures__/applicationInstanceReportData_1.fixtures.js +349 -0
  119. data/webpack/components/ApplicationInstanceReport/__fixtures__/applicationInstanceReportReducer.fixtures.js +20 -0
  120. data/webpack/components/ApplicationInstanceReport/__tests__/ApplicationInstanceReport.test.js +47 -0
  121. data/webpack/components/ApplicationInstanceReport/__tests__/ApplicationInstanceReportReducer.test.js +41 -0
  122. data/webpack/components/ApplicationInstanceReport/__tests__/ApplicationInstanceReportSelectors.test.js +26 -0
  123. data/webpack/components/ApplicationInstanceReport/__tests__/__snapshots__/ApplicationInstanceReport.test.js.snap +7 -0
  124. data/webpack/components/ApplicationInstanceReport/__tests__/__snapshots__/ApplicationInstanceReportReducer.test.js.snap +718 -0
  125. data/webpack/components/ApplicationInstanceReport/__tests__/__snapshots__/ApplicationInstanceReportSelectors.test.js.snap +347 -0
  126. data/webpack/components/ApplicationInstanceReport/components/__tests__/ReportViewer.test.js +24 -0
  127. data/webpack/components/ApplicationInstanceReport/components/__tests__/__snapshots__/ReportViewer.test.js.snap +24 -0
  128. data/webpack/components/ApplicationInstanceReport/index.js +8 -1
  129. data/webpack/components/ExistingHostSelection/ExistingHostSelection.js +104 -0
  130. data/webpack/components/ExistingHostSelection/ExistingHostSelection.scss +15 -0
  131. data/webpack/components/ExistingHostSelection/ExistingHostSelectionActions.js +71 -0
  132. data/webpack/components/ExistingHostSelection/ExistingHostSelectionConstants.js +4 -0
  133. data/webpack/components/ExistingHostSelection/ExistingHostSelectionHelper.js +0 -0
  134. data/webpack/components/ExistingHostSelection/ExistingHostSelectionReducer.js +90 -0
  135. data/webpack/components/ExistingHostSelection/ExistingHostSelectionSelectors.js +8 -0
  136. data/webpack/components/ExistingHostSelection/__fixtures__/existingHostSelectionConfData_1.fixtures.js +191 -0
  137. data/webpack/components/ExistingHostSelection/__fixtures__/existingHostSelectionReducer.fixtures.js +203 -0
  138. data/webpack/components/ExistingHostSelection/__tests__/ExistingHostSelection.test.js +19 -0
  139. data/webpack/components/ExistingHostSelection/__tests__/ExistingHostSelectionReducer.test.js +59 -0
  140. data/webpack/components/ExistingHostSelection/__tests__/ExistingHostSelectionSelectors.test.js +36 -0
  141. data/webpack/components/ExistingHostSelection/__tests__/__snapshots__/ExistingHostSelection.test.js.snap +35 -0
  142. data/webpack/components/ExistingHostSelection/__tests__/__snapshots__/ExistingHostSelectionReducer.test.js.snap +614 -0
  143. data/webpack/components/ExistingHostSelection/__tests__/__snapshots__/ExistingHostSelectionSelectors.test.js.snap +27 -0
  144. data/webpack/components/ExistingHostSelection/components/ServiceSelector.js +48 -0
  145. data/webpack/components/ExistingHostSelection/components/__tests__/ServiceSelector.test.js +35 -0
  146. data/webpack/components/ExistingHostSelection/components/__tests__/__snapshots__/ServiceSelector.test.js.snap +77 -0
  147. data/webpack/components/ExistingHostSelection/index.js +26 -0
  148. data/webpack/components/ParameterSelection/ParameterSelection.js +103 -1
  149. data/webpack/components/ParameterSelection/ParameterSelection.scss +7 -0
  150. data/webpack/components/ParameterSelection/ParameterSelectionActions.js +46 -4
  151. data/webpack/components/ParameterSelection/ParameterSelectionConstants.js +2 -0
  152. data/webpack/components/ParameterSelection/ParameterSelectionHelper.js +5 -1
  153. data/webpack/components/ParameterSelection/ParameterSelectionReducer.js +51 -29
  154. data/webpack/components/ParameterSelection/ParameterSelectionSelectors.js +2 -0
  155. data/webpack/components/ParameterSelection/__fixtures__/parameterSelectionData_1.fixtures.js +124 -84
  156. data/webpack/components/ParameterSelection/__fixtures__/parameterSelectionReducer.fixtures.js +10 -4
  157. data/webpack/components/ParameterSelection/__tests__/ParameterSelection.test.js +36 -46
  158. data/webpack/components/ParameterSelection/__tests__/ParameterSelectionReducer.test.js +33 -25
  159. data/webpack/components/ParameterSelection/__tests__/ParameterSelectionSelectors.test.js +12 -6
  160. data/webpack/components/ParameterSelection/__tests__/__snapshots__/ParameterSelection.test.js.snap +84 -112
  161. data/webpack/components/ParameterSelection/__tests__/__snapshots__/ParameterSelectionReducer.test.js.snap +1589 -878
  162. data/webpack/components/ParameterSelection/__tests__/__snapshots__/ParameterSelectionSelectors.test.js.snap +130 -79
  163. data/webpack/components/ParameterSelection/index.js +4 -1
  164. data/webpack/components/SyncGitRepo/SyncGitRepo.js +202 -0
  165. data/webpack/components/SyncGitRepo/SyncGitRepo.scss +1 -0
  166. data/webpack/components/SyncGitRepo/SyncGitRepoActions.js +123 -0
  167. data/webpack/components/SyncGitRepo/SyncGitRepoConstants.js +8 -0
  168. data/webpack/components/SyncGitRepo/SyncGitRepoReducer.js +80 -0
  169. data/webpack/components/SyncGitRepo/SyncGitRepoSelectors.js +6 -0
  170. data/webpack/components/SyncGitRepo/__fixtures__/syncGitRepoConfData_1.fixtures.js +7 -0
  171. data/webpack/components/SyncGitRepo/__fixtures__/syncGitRepoReducer.fixtures.js +44 -0
  172. data/webpack/components/SyncGitRepo/__tests__/SyncGitRepo.test.js +27 -0
  173. data/webpack/components/SyncGitRepo/__tests__/SyncGitRepoReducer.test.js +95 -0
  174. data/webpack/components/SyncGitRepo/__tests__/SyncGitRepoSelectors.test.js +32 -0
  175. data/webpack/components/SyncGitRepo/__tests__/__snapshots__/SyncGitRepo.test.js.snap +31 -0
  176. data/webpack/components/SyncGitRepo/__tests__/__snapshots__/SyncGitRepoReducer.test.js.snap +137 -0
  177. data/webpack/components/SyncGitRepo/__tests__/__snapshots__/SyncGitRepoSelectors.test.js.snap +13 -0
  178. data/webpack/components/SyncGitRepo/components/FormTextInput.js +42 -0
  179. data/webpack/components/SyncGitRepo/components/ScmTypeSelector.js +47 -0
  180. data/webpack/components/SyncGitRepo/index.js +28 -0
  181. data/webpack/components/common/DeleteTableEntry.js +16 -2
  182. data/webpack/components/common/ExtTextInput.js +43 -0
  183. data/webpack/components/common/__tests__/EditTableEntry.test.js +53 -0
  184. data/webpack/components/common/__tests__/LockTableEntry.test.js +35 -0
  185. data/webpack/components/common/__tests__/__snapshots__/DeleteTableEntry.test.js.snap +40 -2
  186. data/webpack/components/common/__tests__/__snapshots__/EditTableEntry.test.js.snap +81 -0
  187. data/webpack/components/common/__tests__/__snapshots__/LockTableEntry.test.js.snap +60 -0
  188. data/webpack/helper.js +35 -1
  189. data/webpack/helper.test.js +56 -0
  190. data/webpack/index.js +7 -0
  191. data/webpack/js-yaml.js +3874 -0
  192. data/webpack/reducer.js +16 -1
  193. data/webpack/test_setup.js +0 -2
  194. metadata +136 -11
  195. data/webpack/components/common/EasyHeaderFormatter.js +0 -18
  196. data/webpack/components/common/__tests__/__snapshots__/AddParameter.test.js.snap +0 -35
  197. data/webpack/components/common/__tests__/__snapshots__/DeleteParameter.test.js.snap +0 -41
@@ -1,4 +1,6 @@
1
1
  import Immutable from 'seamless-immutable';
2
+ import { translate as __ } from 'foremanReact/common/I18n';
3
+ import { calculateServiceUsage } from './ApplicationInstanceHelper';
2
4
 
3
5
  import {
4
6
  cloneDeep,
@@ -8,6 +10,7 @@ import {
8
10
 
9
11
  import {
10
12
  APPLICATION_INSTANCE_INIT,
13
+ APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
11
14
  APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
12
15
  APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST,
13
16
  APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
@@ -17,10 +20,13 @@ import {
17
20
  APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
18
21
  APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
19
22
  APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
23
+ APPLICATION_INSTANCE_HOST_EDIT_ERROR,
20
24
  APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
21
25
  APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
22
26
  APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
23
27
  APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
28
+ APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN,
29
+ APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE,
24
30
  APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
25
31
  } from './ApplicationInstanceConstants';
26
32
 
@@ -41,7 +47,15 @@ const applicationInstanceConf = (state = initialState, action) => {
41
47
  case APPLICATION_INSTANCE_INIT: {
42
48
  return state.merge(payload);
43
49
  }
50
+ case APPLICATION_INSTANCE_CLOSE_ALERT_MODAL: {
51
+ return state.merge({
52
+ showAlertModal: false,
53
+ alertModalTitle: '',
54
+ alertModalText: '',
55
+ });
56
+ }
44
57
  case APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE: {
58
+ console.log("Error while loading application definition data: "+ payload.error);
45
59
  return state.merge({ error: payload.error, loading: false });
46
60
  }
47
61
  case APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST: {
@@ -87,7 +101,7 @@ const applicationInstanceConf = (state = initialState, action) => {
87
101
  index = Math.max(...hosts.map(e => e.id)) + 1;
88
102
  }
89
103
 
90
- const newRow = {id: index, hostname: "", description: '', service: '', foremanParameters: [], ansibleParameters: [], newEntry: true };
104
+ const newRow = {id: index, hostname: "", description: '', service: '', isExistingHost: false, foremanParameters: [], ansibleParameters: [], newEntry: true };
91
105
  newRow.backup = cloneDeep(newRow)
92
106
  hosts.push(newRow);
93
107
 
@@ -125,48 +139,28 @@ const applicationInstanceConf = (state = initialState, action) => {
125
139
  case APPLICATION_INSTANCE_HOST_EDIT_CONFIRM: {
126
140
  const hosts = cloneDeep(state.hosts);
127
141
  const index = findIndex(hosts, { id: payload.rowData.id });
128
- const services = cloneDeep(state.services);
142
+ let services = cloneDeep(state.services);
129
143
 
130
144
  const thisHost = hosts[index];
131
145
 
132
- if (thisHost.hostname == '') {
133
- window.alert("Every host needs to have a valid name");
134
- return state;
135
- }
136
-
137
146
  // hostnames are lower case
138
147
  thisHost.hostname = thisHost.hostname.toLowerCase();
139
148
 
140
- const hostnameRegex = /^[0-9a-z]([0-9a-z\-]{0,61}[0-9a-z])$/;
141
-
142
- if (thisHost.hostname.match(hostnameRegex) == undefined) {
143
- window.alert("The hostname uses not allowed characters. See https://en.wikipedia.org/wiki/Hostname#Syntax for more details.")
144
- return state;
145
- }
146
-
147
- if (thisHost.service == '') {
148
- window.alert("Every host needs to be assigned to a service.");
149
- return state;
150
- }
151
-
152
149
  if (state.hosts.filter(v => v.hostname === thisHost.hostname && v.id != thisHost.id).length > 0) {
153
- window.alert("Host name already used in this Application Instance. Please make sure that every host name is unique.");
154
- return state;
150
+ return state.merge({
151
+ showAlertModal: true,
152
+ alertModalTitle: __("Error"),
153
+ alertModalText: __("Host name already used in this Application Instance. Please make sure that every host name is unique."),
154
+ });
155
155
  }
156
156
 
157
157
  // Initialize the new Instance with the parameters of the Application Definition.
158
158
  if (thisHost.newEntry === true) {
159
- const selectedService = state.services.filter(entry => entry.id == payload.rowData.service)[0];
159
+ const hostServiceId = Number(thisHost.service);
160
+ const selectedService = services.filter(entry => entry.id == hostServiceId)[0];
160
161
  hosts[index].foremanParameters = selectedService.foremanParameters;
161
162
  hosts[index].ansibleParameters = selectedService.ansibleParameters;
162
-
163
- const hostServiceId = Number(thisHost.service);
164
- const service = services.find(serv => serv['id'] == hostServiceId);
165
- if ('currentCount' in service) {
166
- service['currentCount'] += 1;
167
- } else {
168
- service['currentCount'] = 1;
169
- }
163
+ services = calculateServiceUsage(hostServiceId, services);
170
164
  }
171
165
 
172
166
  delete hosts[index].backup;
@@ -202,6 +196,13 @@ const applicationInstanceConf = (state = initialState, action) => {
202
196
  hosts: hosts
203
197
  });
204
198
  }
199
+ case APPLICATION_INSTANCE_HOST_EDIT_ERROR: {
200
+ return state.merge({
201
+ showAlertModal: true,
202
+ alertModalTitle: __("Error"),
203
+ alertModalText: payload,
204
+ });
205
+ }
205
206
  case APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN: {
206
207
  let parametersData = {};
207
208
 
@@ -298,6 +299,46 @@ const applicationInstanceConf = (state = initialState, action) => {
298
299
  }
299
300
  return state.merge(newState);
300
301
  }
302
+ case APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN: {
303
+ }
304
+ case APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE: {
305
+ if (payload.mode == 'save') {
306
+ let newState;
307
+ let hosts = [];
308
+ let index = 1;
309
+ let services = cloneDeep(state.services);
310
+
311
+ if ('hosts' in state && state.hosts !== undefined && state.hosts.length > 0) {
312
+ hosts = cloneDeep(state.hosts);
313
+ index = Math.max(...hosts.map(e => e.id));
314
+ }
315
+
316
+ payload.selectedHosts.forEach(host => {
317
+ if ((state.hosts == undefined) || (state.hosts.find(h => h.hostname == host.hostname) == undefined)) {
318
+ index += 1;
319
+ const selectedService = services.filter(entry => entry.id == host.serviceId)[0];
320
+ const newRow = {
321
+ id: index,
322
+ hostname: host.hostname,
323
+ description: '',
324
+ service: host.serviceId,
325
+ isExistingHost: true,
326
+ foremanParameters: [], // we will never set this because we don't want to change a already existing host.
327
+ ansibleParameters: selectedService.ansibleParameters,
328
+ }
329
+ hosts.push(newRow);
330
+ services = calculateServiceUsage(host.serviceId, services);
331
+ }
332
+ });
333
+
334
+ return state.merge({
335
+ hosts: hosts,
336
+ services, services
337
+ });
338
+ } else {
339
+ return state;
340
+ }
341
+ }
301
342
  case APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE: {
302
343
  return state.merge({ paramEditMode: payload.mode });
303
344
  }
@@ -1,9 +1,13 @@
1
1
  const applicationInstanceConf = state => state.foremanAcd.applicationInstanceConf;
2
2
 
3
+ export const selectShowAlertModal = state => applicationInstanceConf(state).showAlertModal;
4
+ export const selectAlertModalText = state => applicationInstanceConf(state).alertModalText;
5
+ export const selectAlertModalTitle = state => applicationInstanceConf(state).alertModalTitle;
3
6
  export const selectEditMode = state => applicationInstanceConf(state).editMode;
4
7
  export const selectAppDefinition = state => applicationInstanceConf(state).appDefinition;
5
8
  export const selectHosts = state => applicationInstanceConf(state).hosts;
6
9
  export const selectColumns = state => applicationInstanceConf(state).columns;
10
+ export const selectHiddenForemanParameterTypes = state => applicationInstanceConf(state).hiddenForemanParameterTypes;
7
11
  export const selectServices = state => applicationInstanceConf(state).services;
8
12
  export const selectParametersData = state => applicationInstanceConf(state).parametersData;
9
13
  export const selectAnsibleVarsAll = state => applicationInstanceConf(state).ansibleVarsAll;
@@ -0,0 +1,263 @@
1
+ export const applicationInstanceConfData_1 = {
2
+ name: false,
3
+ error: {
4
+ errorMsg: '',
5
+ status: '',
6
+ statusText: ''
7
+ },
8
+ loading: false,
9
+ columns: [
10
+ {
11
+ property: 'hostname',
12
+ header: {
13
+ label: 'Hostname',
14
+ formatters: [
15
+ null
16
+ ],
17
+ props: {
18
+ index: 0,
19
+ style: {
20
+ width: '30%'
21
+ }
22
+ }
23
+ },
24
+ cell: {
25
+ formatters: [
26
+ null
27
+ ]
28
+ }
29
+ },
30
+ {
31
+ property: 'description',
32
+ header: {
33
+ label: 'Description',
34
+ formatters: [
35
+ null
36
+ ],
37
+ props: {
38
+ index: 1,
39
+ style: {
40
+ width: '30%'
41
+ }
42
+ }
43
+ },
44
+ cell: {
45
+ formatters: [
46
+ null
47
+ ]
48
+ }
49
+ },
50
+ {
51
+ property: 'service',
52
+ header: {
53
+ label: 'Service',
54
+ formatters: [
55
+ null
56
+ ],
57
+ props: {
58
+ index: 2,
59
+ style: {
60
+ width: '20%'
61
+ }
62
+ }
63
+ },
64
+ cell: {
65
+ formatters: [
66
+ null
67
+ ]
68
+ }
69
+ },
70
+ {
71
+ property: 'actions',
72
+ header: {
73
+ label: 'Actions',
74
+ formatters: [
75
+ null
76
+ ],
77
+ props: {
78
+ index: 4,
79
+ style: {
80
+ width: '20%'
81
+ }
82
+ }
83
+ },
84
+ cell: {
85
+ formatters: [
86
+ null
87
+ ]
88
+ }
89
+ }
90
+ ],
91
+ appDefinition: {
92
+ id: 1,
93
+ name: 'LAMP',
94
+ description: '',
95
+ 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"}]}]',
96
+ ansible_vars_all: '[{"id":0,"name":"repository","value":"https://github.com/bennojoy/mywebapp.git"}]',
97
+ location_ids: [
98
+ 2
99
+ ],
100
+ organization_ids: [
101
+ 1
102
+ ],
103
+ created_at: '2021-03-11 12:51:34 +0100',
104
+ updated_at: '2021-03-13 00:06:12 +0100'
105
+ },
106
+ hosts: [
107
+ {
108
+ id: 4,
109
+ hostname: 'great-web-app-db-1',
110
+ service: '2',
111
+ description: '',
112
+ foremanParameters: [],
113
+ ansibleParameters: [
114
+ {
115
+ id: 0,
116
+ name: 'mysqlservice',
117
+ value: 'mysqld'
118
+ },
119
+ {
120
+ id: 1,
121
+ name: 'mysql_port',
122
+ value: '3306'
123
+ },
124
+ {
125
+ id: 2,
126
+ name: 'dbuser',
127
+ value: 'webapp'
128
+ },
129
+ {
130
+ id: 3,
131
+ name: 'dbname',
132
+ value: 'ANSAP01'
133
+ },
134
+ {
135
+ id: 4,
136
+ name: 'upassword',
137
+ value: 'Bond@007'
138
+ },
139
+ {
140
+ id: 5,
141
+ name: 'masterpassword',
142
+ value: 'MySQL@007'
143
+ }
144
+ ]
145
+ },
146
+ {
147
+ id: 1,
148
+ hostname: 'great-web-app-web-1',
149
+ service: '1',
150
+ description: '',
151
+ foremanParameters: [],
152
+ ansibleParameters: [
153
+ {
154
+ id: 0,
155
+ name: 'dummy_var',
156
+ value: '0'
157
+ }
158
+ ]
159
+ },
160
+ {
161
+ id: 2,
162
+ hostname: 'great-web-app-web-2',
163
+ service: '1',
164
+ description: '',
165
+ foremanParameters: [],
166
+ ansibleParameters: [
167
+ {
168
+ id: 0,
169
+ name: 'dummy_var',
170
+ value: '0'
171
+ }
172
+ ]
173
+ }
174
+ ],
175
+ ansibleVarsAll: [
176
+ {
177
+ id: 0,
178
+ name: 'repository',
179
+ value: 'https://github.com/bennojoy/mywebapp.git'
180
+ }
181
+ ],
182
+ services: [
183
+ {
184
+ id: 1,
185
+ name: 'web',
186
+ description: '',
187
+ hostgroup: '1',
188
+ ansibleGroup: 'webservers',
189
+ minCount: '2',
190
+ maxCount: '',
191
+ foremanParameters: [
192
+ {
193
+ id: 1,
194
+ locked: false,
195
+ name: 'CP',
196
+ description: '',
197
+ type: 'computeprofile',
198
+ value: '1'
199
+ },
200
+ {
201
+ id: 2,
202
+ locked: true,
203
+ name: 'LE',
204
+ description: '',
205
+ type: 'lifecycleenv',
206
+ value: '1'
207
+ }
208
+ ],
209
+ ansibleParameters: [
210
+ {
211
+ id: 0,
212
+ name: 'dummy_var',
213
+ value: '0'
214
+ }
215
+ ],
216
+ currentCount: 2
217
+ },
218
+ {
219
+ id: 2,
220
+ name: 'db',
221
+ description: '',
222
+ hostgroup: '1',
223
+ ansibleGroup: 'dbservers',
224
+ minCount: '1',
225
+ maxCount: '',
226
+ foremanParameters: [],
227
+ ansibleParameters: [
228
+ {
229
+ id: 0,
230
+ name: 'mysqlservice',
231
+ value: 'mysqld'
232
+ },
233
+ {
234
+ id: 1,
235
+ name: 'mysql_port',
236
+ value: '3306',
237
+ locked: true
238
+ },
239
+ {
240
+ id: 2,
241
+ name: 'dbuser',
242
+ value: 'webapp'
243
+ },
244
+ {
245
+ id: 3,
246
+ name: 'dbname',
247
+ value: 'ANSAP01'
248
+ },
249
+ {
250
+ id: 4,
251
+ name: 'upassword',
252
+ value: 'Bond@007'
253
+ },
254
+ {
255
+ id: 5,
256
+ name: 'masterpassword',
257
+ value: 'MySQL@007'
258
+ }
259
+ ],
260
+ currentCount: 1
261
+ }
262
+ ]
263
+ }
@@ -0,0 +1,80 @@
1
+ import Immutable from 'seamless-immutable';
2
+ import {
3
+ cloneDeep,
4
+ findIndex,
5
+ findLastIndex,
6
+ } from 'lodash';
7
+
8
+ import {
9
+ applicationInstanceConfData_1,
10
+ } from '../__fixtures__/applicationInstanceConfData_1.fixtures';
11
+
12
+ export const successState = Immutable(applicationInstanceConfData_1);
13
+
14
+ const EDIT_ROW_ID = 2;
15
+
16
+ const editClone = applicationInstanceConfData_1;
17
+ const editIndex = findIndex(editClone.hosts, { id: EDIT_ROW_ID })
18
+ editClone["hosts"][editIndex].backup = cloneDeep(editClone["hosts"][editIndex]);
19
+ export const editState = Immutable(editClone);
20
+
21
+ // Payload Data
22
+ export const initApplicationInstancePayload = applicationInstanceConfData_1;
23
+
24
+ export const closeAlertModalPayload = { };
25
+ export const addHostPayload = { };
26
+ export const deleteHostPayload = {
27
+ rowData: {
28
+ id: EDIT_ROW_ID,
29
+ },
30
+ };
31
+ export const activateEditHostPayload = {
32
+ rowData: {
33
+ id: EDIT_ROW_ID,
34
+ },
35
+ };
36
+ export const confirmEditHostPayload = {
37
+ rowData: {
38
+ id: EDIT_ROW_ID,
39
+ },
40
+ };
41
+ export const cancelEditHostPayload = {
42
+ rowData: {
43
+ id: EDIT_ROW_ID,
44
+ },
45
+ };
46
+ export const changeEditHostPayload = {
47
+ value: "helloworld",
48
+ property: "name",
49
+ rowData: {
50
+ id: EDIT_ROW_ID,
51
+ }
52
+ };
53
+
54
+ export const loadApplicationDefinitionRequestPayload = {
55
+ clearRows: false,
56
+ };
57
+
58
+ export const loadApplicationDefinitionSuccessPayload = {
59
+ app_definition: {
60
+ id: 1,
61
+ name: "LAMP",
62
+ description: "",
63
+ 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\"}]}]",
64
+ "ansible_vars_all": "[{\"id\":0,\"name\":\"repository\",\"value\":\"https://github.com/bennojoy/mywebapp.git\"}]",
65
+ location_ids: [
66
+ 2
67
+ ],
68
+ organization_ids: [
69
+ 1
70
+ ],
71
+ created_at: "2021-03-11 12:51:34 +0100",
72
+ updated_at: "2021-03-13 00:06:12 +0100"
73
+ },
74
+ foreman_data: null,
75
+ ansible_data: null
76
+ };
77
+
78
+ export const loadApplicationDefinitionFailurePayload = {
79
+ error: "Something really bad happend",
80
+ };
@@ -0,0 +1,24 @@
1
+ import { testComponentSnapshotsWithFixtures } from 'react-redux-test-utils';
2
+
3
+ import ApplicationInstance from '../ApplicationInstance';
4
+
5
+ const noop = () => {};
6
+
7
+ const fixtures = {
8
+ 'should render application instance': {
9
+ data: {
10
+ location: "Default Location",
11
+ organization: "Default Organization",
12
+ appDefinition: {},
13
+ hosts: [],
14
+ ansibleVarsAll: [],
15
+ },
16
+ closeAlertModal: noop,
17
+ loadApplicationDefinition: noop,
18
+ initApplicationInstance: noop,
19
+ addApplicationInstanceHost: noop,
20
+ },
21
+ };
22
+
23
+ describe('ApplicationInstance', () =>
24
+ testComponentSnapshotsWithFixtures(ApplicationInstance, fixtures));
@@ -0,0 +1,131 @@
1
+ import { testReducerSnapshotWithFixtures } from 'react-redux-test-utils';
2
+ import reducer, { initialState } from '../ApplicationInstanceReducer';
3
+
4
+ import {
5
+ successState,
6
+ editState,
7
+ initApplicationInstancePayload,
8
+ closeAlertModalPayload,
9
+ addHostPayload,
10
+ deleteHostPayload,
11
+ activateEditHostPayload,
12
+ confirmEditHostPayload,
13
+ cancelEditHostPayload,
14
+ changeEditHostPayload,
15
+ loadApplicationDefinitionRequestPayload,
16
+ loadApplicationDefinitionSuccessPayload,
17
+ loadApplicationDefinitionFailurePayload,
18
+ } from '../__fixtures__/applicationInstanceReducer.fixtures';
19
+
20
+ import {
21
+ APPLICATION_INSTANCE_INIT,
22
+ APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
23
+ APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST,
24
+ APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
25
+ APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
26
+ APPLICATION_INSTANCE_HOST_DELETE,
27
+ APPLICATION_INSTANCE_HOST_ADD,
28
+ APPLICATION_INSTANCE_HOST_EDIT_ACTIVATE,
29
+ APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
30
+ APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
31
+ APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
32
+ APPLICATION_INSTANCE_HOST_EDIT_ERROR,
33
+ APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_OPEN,
34
+ APPLICATION_INSTANCE_FOREMAN_PARAMETER_SELECTION_MODAL_CLOSE,
35
+ APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_OPEN,
36
+ APPLICATION_INSTANCE_ANSIBLE_PARAMETER_SELECTION_MODAL_CLOSE,
37
+ APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_OPEN,
38
+ APPLICATION_INSTANCE_ADD_EXISTING_HOSTS_MODAL_CLOSE,
39
+ APPLICATION_INSTANCE_CHANGE_PARAMETER_SELECTION_MODE,
40
+ } from '../ApplicationInstanceConstants';
41
+
42
+ const fixtures = {
43
+ 'should return initial state': {
44
+ state: initialState,
45
+ action: {
46
+ type: undefined,
47
+ payload: {},
48
+ },
49
+ },
50
+
51
+ 'should initialize component': {
52
+ state: initialState,
53
+ action: {
54
+ type: APPLICATION_INSTANCE_INIT,
55
+ payload: initApplicationInstancePayload,
56
+ },
57
+ },
58
+ 'should close alert modal': {
59
+ state: successState,
60
+ action: {
61
+ type: APPLICATION_INSTANCE_CLOSE_ALERT_MODAL,
62
+ payload: closeAlertModalPayload,
63
+ },
64
+ },
65
+ 'should add a host': {
66
+ state: successState,
67
+ action: {
68
+ type: APPLICATION_INSTANCE_HOST_ADD,
69
+ payload: addHostPayload,
70
+ },
71
+ },
72
+ 'should delete a host': {
73
+ state: successState,
74
+ action: {
75
+ type: APPLICATION_INSTANCE_HOST_DELETE,
76
+ payload: deleteHostPayload,
77
+ },
78
+ },
79
+ 'should activate edit host': {
80
+ state: successState,
81
+ action: {
82
+ type: APPLICATION_INSTANCE_HOST_EDIT_ACTIVATE,
83
+ payload: activateEditHostPayload,
84
+ },
85
+ },
86
+ 'should change edit host': {
87
+ state: editState,
88
+ action: {
89
+ type: APPLICATION_INSTANCE_HOST_EDIT_CHANGE,
90
+ payload: changeEditHostPayload,
91
+ },
92
+ },
93
+ 'should confirm edit host': {
94
+ state: editState,
95
+ action: {
96
+ type: APPLICATION_INSTANCE_HOST_EDIT_CONFIRM,
97
+ payload: confirmEditHostPayload,
98
+ },
99
+ },
100
+ 'should cancel edit host': {
101
+ state: editState,
102
+ action: {
103
+ type: APPLICATION_INSTANCE_HOST_EDIT_CANCEL,
104
+ payload: cancelEditHostPayload,
105
+ },
106
+ },
107
+ 'should request load param data': {
108
+ state: successState,
109
+ action: {
110
+ type: APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_REQUEST,
111
+ payload: loadApplicationDefinitionRequestPayload,
112
+ },
113
+ },
114
+ 'should load param data be successful': {
115
+ state: successState,
116
+ action: {
117
+ type: APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_SUCCESS,
118
+ payload: loadApplicationDefinitionSuccessPayload,
119
+ },
120
+ },
121
+ 'should load param data be erroneous': {
122
+ state: successState,
123
+ action: {
124
+ type: APPLICATION_INSTANCE_LOAD_APPLICATION_DEFINITION_FAILURE,
125
+ payload: loadApplicationDefinitionFailurePayload,
126
+ },
127
+ },
128
+ };
129
+
130
+ describe('ApplicationInstanceReducer', () =>
131
+ testReducerSnapshotWithFixtures(reducer, fixtures));