summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2019-08-28 14:22:10 +0300
committerIttay Stern <ittay.stern@att.com>2019-08-28 11:23:56 +0000
commitf4958cdfb3a2f50b3f59cff99582493d35187659 (patch)
treec15a044f45fbfa61ec5cd2dc5e5c06d57c040511
parent1b4bba330dcd11cf34d86f4e25c7e3a4082ea343 (diff)
Fix resume vfModule
Get from AAI lcpCloudRegion and tenantList even when there is homing data for vfModule, for make resume popup compatible with creationService Issue-ID: VID-378 Signed-off-by: Eylon Malin <eylon.malin@intl.att.com> Change-Id: Ia57e8e020d2f5373c2b3239b6020a12030deef07
-rw-r--r--vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js4
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModule.java2
-rw-r--r--vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java6
3 files changed, 5 insertions, 7 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js
index 51feb89ae..ac6d84faf 100644
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/vf-module-homing-data-action/vf-module-homing-data-action.controller.js
@@ -65,9 +65,7 @@ var vfModuleActionModalController = function(COMPONENT, FIELD, $scope, $uibModal
$scope.isHomingData = $scope.isHomingData && (($scope.megaRegion).indexOf(res.data[COMPONENT.CLOUD_REGION_ID]) === -1);
}
- if (!$scope.isHomingData) {
- getLcpCloudRegionTenantList();
- }
+ getLcpCloudRegionTenantList();
})
.catch(function (error) {
getLcpCloudRegionTenantList();
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModule.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModule.java
index 72538fc11..1b1a31127 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModule.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModule.java
@@ -54,7 +54,7 @@ public class PresetMSOCreateVfModule extends PresetMSOBaseCreateInstancePost {
"\"usePreload\":false" +
"}," +
"\"cloudConfiguration\":{" +
- "\"lcpCloudRegionId\":\"mdt1\"," +
+ "\"lcpCloudRegionId\":\"hvf6\"," +
addCloudOwnerIfNeeded() +
"\"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"" +
"}," +
diff --git a/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java b/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java
index 2d04af9cb..30473888b 100644
--- a/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java
+++ b/vid-automation/src/main/java/vid/automation/test/services/BulkRegistration.java
@@ -13,6 +13,7 @@ import org.onap.simulator.presetGenerator.presets.sdc.PresetSDCGetServiceToscaMo
import vid.automation.test.Constants;
import vid.automation.test.Constants.ViewEdit;
+import static org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset.DEFAULT_CLOUD_OWNER;
import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC;
import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOOrchestrationRequestGet.COMPLETE;
import static vid.automation.test.infra.ModelInfo.serviceFabricSriovService;
@@ -401,10 +402,9 @@ public class BulkRegistration {
SimulatorApi.registerExpectationFromPresets(
ImmutableList.of (
- PresetAAIGetCloudOwnersByCloudRegionId.PRESET_MDT1_TO_ATT_NC,
- new PresetAAIGetHomingForVfModule("c015cc0f-0f37-4488-aabf-53795fd93cd3", "a231a99c-7e75-4d6d-a0fb-5c7d26f30f77", "092eb9e8e4b7412e8787dd091bc58e86", "mdt1"),
+ new PresetAAIGetHomingForVfModule("c015cc0f-0f37-4488-aabf-53795fd93cd3", "a231a99c-7e75-4d6d-a0fb-5c7d26f30f77", "092eb9e8e4b7412e8787dd091bc58e86", "hvf6"),
new PresetMSOCreateVfModule("3f93c7cb-2fd0-4557-9514-e189b7b04f9d",
- "c015cc0f-0f37-4488-aabf-53795fd93cd3", ATT_NC, vfModuleName,
+ "c015cc0f-0f37-4488-aabf-53795fd93cd3", DEFAULT_CLOUD_OWNER, vfModuleName,
"7a6ee536-f052-46fa-aa7e-2fca9d674c44", "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "ComplexService"),
new PresetMSOOrchestrationRequestGet(
COMPLETE,