aboutsummaryrefslogtreecommitdiffstats
path: root/vid-automation/src
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-08-28 11:49:18 +0000
committerGerrit Code Review <gerrit@onap.org>2019-08-28 11:49:18 +0000
commit7648b9f8c631b346d30132c2b0fa29b14365b83c (patch)
tree8c3842fa023063d2738f363b73122aa6fe8d9c74 /vid-automation/src
parente7021a29f0df8b40d64c8e7054c103f0d1369fa2 (diff)
parentf4958cdfb3a2f50b3f59cff99582493d35187659 (diff)
Merge "Fix resume vfModule"
Diffstat (limited to 'vid-automation/src')
-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
2 files changed, 4 insertions, 4 deletions
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,