summaryrefslogtreecommitdiffstats
path: root/vid-automation/src/test
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-10-29 14:27:44 +0200
committerIttay Stern <ittay.stern@att.com>2019-10-29 17:57:50 +0200
commitbf74c24500acf037e24ff75008bbda83fe1be72b (patch)
treefd3fcbf82eeb4f38944b94152e96741cd332b4ab /vid-automation/src/test
parent8cb79d98ec8c9f2b2ec495eca11ca067dbc06acb (diff)
Test aai_get_service_instance_topology with vf-module placement data
Issue-ID: VID-603 Change-Id: I2ce89cac91417ef4b60a3943da80f0ff03f865ad Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-automation/src/test')
-rw-r--r--vid-automation/src/test/java/org/onap/vid/api/ServiceTreeApiTest.java10
-rw-r--r--vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json5
2 files changed, 11 insertions, 4 deletions
diff --git a/vid-automation/src/test/java/org/onap/vid/api/ServiceTreeApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/ServiceTreeApiTest.java
index a563bd77d..e5a2a739b 100644
--- a/vid-automation/src/test/java/org/onap/vid/api/ServiceTreeApiTest.java
+++ b/vid-automation/src/test/java/org/onap/vid/api/ServiceTreeApiTest.java
@@ -9,6 +9,7 @@ import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.ATT_AIC;
import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC;
+import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.AUK51A;
import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.hvf6;
import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.olson3;
import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIStandardQueryGet.defaultPlacement;
@@ -240,7 +241,12 @@ public class ServiceTreeApiTest extends BaseApiTest {
"\"in-maint\": true,", ImmutableMultimap.of("volume-group", volumeGroup1.getReqPath()),
new Placement(ATT_AIC, hvf6, "88a6ca3ee0394ade9403f075db23167e"));
- PresetAAIGetVfModulesByVnf vfModules2 = new PresetAAIGetVfModulesByVnf(vnfPreset2.getInstanceId());
+
+ Placement vfModule2Placement
+ = new Placement(ATT_NC, AUK51A, "73bb4c548dc048d78eccecd445ac06fc");
+
+ PresetAAIGetVfModulesByVnf twoVfModulesPreset =
+ new PresetAAIGetVfModulesByVnf(vnfPreset2.getInstanceId(), vfModule2Placement);
final PresetAAIStandardQueryGet serviceInstance =
PresetAAIStandardQueryGet.ofServiceInstance("service-instance-id", "6e59c5de-f052-46fa-aa7e-2fca9d674c44", "d27e42cf-087e-4d31-88ac-6c4b7585f800", "global-customer-id", "service-instance-type",
@@ -255,7 +261,7 @@ public class ServiceTreeApiTest extends BaseApiTest {
serviceInstance,
l3NetworkPreset3, l3NetworkPreset4, vnfPreset1, vnfPreset2, collection1,
volumeGroup1, l3NetworkPreset1, l3NetworkPreset2, instanceGroup1,
- vlanTag1, vfModules2,
+ vlanTag1, twoVfModulesPreset,
new PresetAAIModelsByInvariantIdGet(ImmutableList.of("d27e42cf-087e-4d31-88ac-6c4b7585f800")),
new PresetGetSessionSlotCheckIntervalGet(),
new PresetAAIGetSubscribersGet(),
diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json
index 50786d36b..d20760b6b 100644
--- a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json
@@ -160,9 +160,10 @@
},
"uuid": "dc229cd8-c132-4455-8517-5c1787c18b14",
"productFamilyId": null,
- "lcpCloudRegionId": null,
+ "cloudOwner": "att-nc",
+ "lcpCloudRegionId": "auk51a",
"legacyRegion": null,
- "tenantId": null,
+ "tenantId": "73bb4c548dc048d78eccecd445ac06fc",
"lineOfBusiness": null,
"platformName": null,
"isBase": true,