summaryrefslogtreecommitdiffstats
path: root/vid-automation/src/test
diff options
context:
space:
mode:
authorEinat Vinouze <einat.vinouze@intl.att.com>2019-08-27 16:01:01 +0300
committerIttay Stern <ittay.stern@att.com>2019-09-09 07:01:36 +0000
commite1f7974f0badbd4440d5b7ea5f1b1cb2d4973818 (patch)
tree46be9cdc44cbb475527bc3c43df23d16f7579d29 /vid-automation/src/test
parente25b88b5a7a0f3bf63ca7160a441b53145484bcc (diff)
Adding feature: Replace vfmodule
Issue-ID: VID-603 Change-Id: I59068a0979d6fb733e4243c8f78921f396dc9d17 Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com> Signed-off-by: Amichai Hemli <amichai.hemli@intl.att.com> 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/AaiApiTest.java28
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json1
-rw-r--r--vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json226
3 files changed, 255 insertions, 0 deletions
diff --git a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java
index b7c6e0e46..6b5b08e2b 100644
--- a/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java
+++ b/vid-automation/src/test/java/org/onap/vid/api/AaiApiTest.java
@@ -43,6 +43,7 @@ import static org.onap.simulator.presetGenerator.presets.ecompportal_att.EcompPo
import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNull;
import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.APPEND;
import static vid.automation.test.services.SimulatorApi.RegistrationStrategy.CLEAR_THEN_SET;
import static vid.automation.test.utils.TestHelper.GET_SERVICE_MODELS_BY_DISTRIBUTION_STATUS;
@@ -771,6 +772,33 @@ public class AaiApiTest extends BaseApiAaiTest {
response.getBody());
}
+ @Test
+ public void getNewestModelVersionByInvariant() throws JsonProcessingException {
+ String invariantId = "f6342be5-d66b-4d03-a1aa-c82c3094c4ea";
+
+ SimulatorApi.registerExpectationFromPreset(new PresetAAIModelVersionsByInvariantId(), CLEAR_THEN_SET );
+
+ String url = uri +
+ "/aai_get_newest_model_version_by_invariant/" + invariantId;
+ ResponseEntity<String> response = restTemplate.getForEntity(url, String.class);
+
+ assertTrue(response.toString().contains("the-newest-version"));
+ }
+
+ @Test
+ public void getNewestModelVersionByInvariant_modelNotExist_thenEmptyResponse() {
+ String invariantId = "f6342be5-d66b-4d03-a1aa-c82c3094c4ea";
+
+ SimulatorApi.registerExpectationFromPreset(new PresetAAIModelVersionsByInvariantId(), CLEAR_THEN_SET );
+
+ String url = uri +
+ "/aai_get_newest_model_version_by_invariant/" + "model-not-exist";
+ ResponseEntity<String> response = restTemplate.getForEntity(url, String.class);
+
+ assertTrue(response.getStatusCode().is2xxSuccessful());
+ assertNull(response.getBody());
+ }
+
private void assertResponse(Object expected, String response) {
assertResponse(Configuration.empty(), expected, response);
}
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
index f54419169..2846baa54 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
@@ -213,6 +213,7 @@
"isMissingData": false,
"trackById": "wk10c4hh1oj",
"vfModules": {},
+ "upgradedVFMSonsCounter": 0,
"vnfStoreKey": "2017-388_PASQUALE-vPE 0_1",
"instanceName": "2017388_PASQUALEvPEmCaNkinstanceName",
"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
diff --git a/vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json b/vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json
new file mode 100644
index 000000000..cf805b7ba
--- /dev/null
+++ b/vid-automation/src/test/resources/viewEdit/ServiceTreeWithMultipleChildren_serviceInstance_withUpdatedLatestVersion.json
@@ -0,0 +1,226 @@
+{
+ "instanceName":"SERVICE_INSTANCE_NAME",
+ "action": "None",
+ "instanceId":"service-instance-id",
+ "orchStatus":"GARBAGE DATA",
+ "globalSubscriberId":"global-customer-id",
+ "subscriptionServiceType":"service-instance-type",
+ "owningEntityId":null,
+ "owningEntityName":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "tenantName":null,
+ "aicZoneId":null,
+ "aicZoneName":null,
+ "projectName":null,
+ "rollbackOnFailure":null,
+ "isALaCarte":false,
+ "modelInfo":{
+ "modelInvariantId":"d27e42cf-087e-4d31-88ac-6c4b7585f800",
+ "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+ "modelName":"vf_vEPDG",
+ "modelType":"service",
+ "modelVersion":"1.0"
+ },
+ "vnfs": {
+ "VNF1_INSTANCE_ID": {
+ "originalName": null,
+ "trackById": "VNF1_INSTANCE_ID",
+ "instanceName": "VNF1_INSTANCE_NAME",
+ "action": "None",
+ "instanceId": "VNF1_INSTANCE_ID",
+ "instanceType": "VNF1_INSTANCE_TYPE",
+ "orchStatus": null,
+ "provStatus": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelVersionId": "vnf-instance-model-version-id",
+ "modelCustomizationId": "vnf-instance-model-customization-id",
+ "modelType": "vnf"
+ },
+ "uuid": "vnf-instance-model-version-id",
+ "productFamilyId": null,
+ "lcpCloudRegionId": "olson3",
+ "cloudOwner": "att-nc",
+ "legacyRegion": null,
+ "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
+ "lineOfBusiness": null,
+ "platformName": null,
+ "vfModules": {},
+ "networks": {
+ "NETWORK1_INSTANCE_ID": {
+ "trackById": "NETWORK1_INSTANCE_ID",
+ "instanceName": "NETWORK1_INSTANCE_NAME",
+ "action": "None",
+ "instanceId": "NETWORK1_INSTANCE_ID",
+ "instanceType": "CONTRAIL30_BASIC",
+ "orchStatus": "Assigned",
+ "provStatus": "prov",
+ "inMaint": false,
+ "modelInfo": {
+ "modelInvariantId": "network-instance-model-invariant-id",
+ "modelVersionId": "network-instance-model-version-id",
+ "modelCustomizationId": "network-instance-model-customization-id",
+ "modelType": "network"
+ },
+ "uuid": "network-instance-model-version-id"
+ },
+ "NETWORK2_INSTANCE_ID": {
+ "trackById": "NETWORK2_INSTANCE_ID",
+ "instanceName": "NETWORK2_INSTANCE_NAME",
+ "action": "None",
+ "instanceId": "NETWORK2_INSTANCE_ID",
+ "instanceType": "CONTRAIL30_BASIC",
+ "orchStatus": "Created",
+ "provStatus": "prov",
+ "inMaint": false,
+ "modelInfo": {
+ "modelInvariantId": "network-instance-model-invariant-id",
+ "modelVersionId": "network-instance-model-version-id",
+ "modelCustomizationId": "network-instance-model-customization-id",
+ "modelType": "network"
+ },
+ "uuid": "network-instance-model-version-id"
+ }
+ }
+ },
+ "VNF2_INSTANCE_ID": {
+ "originalName": "VF_vGeraldine 0",
+ "trackById": "VNF2_INSTANCE_ID",
+ "instanceName": "VNF2_INSTANCE_NAME",
+ "action": "None",
+ "instanceId": "VNF2_INSTANCE_ID",
+ "instanceType": "VNF2_INSTANCE_TYPE",
+ "orchStatus": null,
+ "provStatus": null,
+ "inMaint": true,
+ "modelInfo": {
+ "modelCustomizationName": "VF_vGeraldine 0",
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9",
+ "modelType": "vnf"
+ },
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "productFamilyId": null,
+ "lcpCloudRegionId": "hvf6",
+ "cloudOwner": "irma-aic",
+ "legacyRegion": null,
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "lineOfBusiness": null,
+ "platformName": null,
+ "vfModules": {
+ "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+ "2c1ca484-cbc2-408b-ab86-25a2c15ce280": {
+ "originalName": "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1",
+ "trackById": "2c1ca484-cbc2-408b-ab86-25a2c15ce280",
+ "instanceName": "ss820f_0918_db",
+ "action": "None",
+ "instanceId": "2c1ca484-cbc2-408b-ab86-25a2c15ce280",
+ "instanceType": null,
+ "orchStatus": "deleted",
+ "provStatus": null,
+ "inMaint": true,
+ "modelInfo": {
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+ "modelCustomizationId": "55b1be94-671a-403e-a26c-667e9c47d091",
+ "modelInvariantId": "09edc9ef-85d0-4b26-80de-1f569d49e750",
+ "modelVersionId": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+ "modelType": "vfModule"
+ },
+ "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "tenantId": null,
+ "lineOfBusiness": null,
+ "platformName": null,
+ "isBase": false,
+ "volumeGroupName": null
+ }
+ },
+ "dc229cd8-c132-4455-8517-5c1787c18b14": {
+ "3ef042c4-259f-45e0-9aba-0989bd8d1cc5": {
+ "originalName": null,
+ "trackById": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5",
+ "instanceName": "ss820f_0918_base",
+ "action": "None",
+ "instanceId": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5",
+ "instanceType": null,
+ "orchStatus": "Assigned",
+ "provStatus": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelCustomizationId": "8ad8670b-0541-4499-8101-275bbd0e8b6a",
+ "modelInvariantId": "1e463c9c-404d-4056-ba56-28fd102608de",
+ "modelVersionId": "dc229cd8-c132-4455-8517-5c1787c18b14",
+ "modelType": "vfModule"
+ },
+ "uuid": "dc229cd8-c132-4455-8517-5c1787c18b14",
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "tenantId": null,
+ "lineOfBusiness": null,
+ "platformName": null,
+ "isBase": true,
+ "volumeGroupName": null
+ }
+ }
+ },
+ "networks": {}
+ }
+ },
+ "networks": {
+ "NETWORK3_INSTANCE_ID": {
+ "originalName": "ExtVL 0",
+ "trackById": "NETWORK3_INSTANCE_ID",
+ "instanceName": "NETWORK3_INSTANCE_NAME",
+ "action": "None",
+ "instanceId": "NETWORK3_INSTANCE_ID",
+ "instanceType": "CONTRAIL30_BASIC",
+ "orchStatus": "Assigned",
+ "provStatus": "nvtprov",
+ "inMaint": false,
+ "modelInfo": {
+ "modelCustomizationName": "ExtVL 0",
+ "modelInvariantId": "network-instance-model-invariant-id",
+ "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "modelType": "network"
+ },
+ "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
+ },
+ "NETWORK4_INSTANCE_ID": {
+ "originalName": "ExtVL 0",
+ "trackById": "NETWORK4_INSTANCE_ID",
+ "instanceName": "NETWORK4_INSTANCE_NAME",
+ "action": "None",
+ "instanceId": "NETWORK4_INSTANCE_ID",
+ "instanceType": "CONTRAIL30_HIMELGUARD",
+ "orchStatus": "Created",
+ "provStatus": "preprov",
+ "inMaint": false,
+ "modelInfo": {
+ "modelCustomizationName": "ExtVL 0",
+ "modelInvariantId": "network-instance-model-invariant-id",
+ "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "modelType": "network"
+ },
+ "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
+ }
+ },
+ "validationCounter": 0,
+ "vnfGroups": {},
+ "existingVNFCounterMap": {
+ "91415b44-753d-494c-926a-456a9172bbb9": 1,
+ "vnf-instance-model-customization-id": 1
+ },
+ "existingNetworksCounterMap": {
+ "94fdd893-4a36-4d70-b16a-ec29c54c184f": 2
+ },
+ "existingVnfGroupCounterMap": {}
+} \ No newline at end of file