From f4dff328c0386c8901b5841943b11f0c13b3169f Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 8 Jul 2019 15:46:44 +0300 Subject: Merge from ecomp 718fd196 - Integration Tests Issue-ID: VID-378 Change-Id: Icc0bdb9ef37b1d429d47c2070f76d1ee63ad7489 Signed-off-by: Ittay Stern --- ...ceTreeWithMultipleChildren_serviceInstance.json | 70 ++---------- ...rviceTreeWithMultipleChildren_serviceModel.json | 5 +- .../getServiceInstanceTopologyResult.json | 60 +++++----- .../serviceWithVrfTopology.json | 125 +++++++++++++++++++++ 4 files changed, 169 insertions(+), 91 deletions(-) create mode 100644 vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json (limited to 'vid-automation/src/test/resources/aaiGetInstanceTopology') diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json index a95573558..50786d36b 100644 --- a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json @@ -42,15 +42,15 @@ }, "uuid": "vnf-instance-model-version-id", "productFamilyId": null, - "lcpCloudRegionId": null, + "lcpCloudRegionId": "olson3", + "cloudOwner": "att-nc", "legacyRegion": null, - "tenantId": null, + "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", "lineOfBusiness": null, "platformName": null, "vfModules": {}, "networks": { "NETWORK1_INSTANCE_ID": { - "originalName": null, "trackById": "NETWORK1_INSTANCE_ID", "instanceName": "NETWORK1_INSTANCE_NAME", "action": "None", @@ -65,16 +65,9 @@ "modelCustomizationId": "network-instance-model-customization-id", "modelType": "network" }, - "uuid": "network-instance-model-version-id", - "productFamilyId": null, - "lcpCloudRegionId": null, - "legacyRegion": null, - "tenantId": null, - "lineOfBusiness": null, - "platformName": null + "uuid": "network-instance-model-version-id" }, "NETWORK2_INSTANCE_ID": { - "originalName": null, "trackById": "NETWORK2_INSTANCE_ID", "instanceName": "NETWORK2_INSTANCE_NAME", "action": "None", @@ -89,13 +82,7 @@ "modelCustomizationId": "network-instance-model-customization-id", "modelType": "network" }, - "uuid": "network-instance-model-version-id", - "productFamilyId": null, - "lcpCloudRegionId": null, - "legacyRegion": null, - "tenantId": null, - "lineOfBusiness": null, - "platformName": null + "uuid": "network-instance-model-version-id" } } }, @@ -118,15 +105,16 @@ }, "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60", "productFamilyId": null, - "lcpCloudRegionId": null, + "lcpCloudRegionId": "hvf6", + "cloudOwner": "irma-aic", "legacyRegion": null, - "tenantId": null, + "tenantId": "88a6ca3ee0394ade9403f075db23167e", "lineOfBusiness": null, "platformName": null, "vfModules": { "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": { "2c1ca484-cbc2-408b-ab86-25a2c15ce280": { - "originalName": "VfVgeraldine..vflorence_vlc..module-1", + "originalName": "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1", "trackById": "2c1ca484-cbc2-408b-ab86-25a2c15ce280", "instanceName": "ss820f_0918_db", "action": "None", @@ -203,13 +191,7 @@ "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986", "modelType": "network" }, - "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986", - "productFamilyId": null, - "lcpCloudRegionId": null, - "legacyRegion": null, - "tenantId": null, - "lineOfBusiness": null, - "platformName": null + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" }, "NETWORK4_INSTANCE_ID": { "originalName": "ExtVL 0", @@ -228,39 +210,9 @@ "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986", "modelType": "network" }, - "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986", - "productFamilyId": null, - "lcpCloudRegionId": null, - "legacyRegion": null, - "tenantId": null, - "lineOfBusiness": null, - "platformName": null + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986" } }, - "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": "5.0" - }, "validationCounter": 0, "vnfGroups": {}, "existingVNFCounterMap": { diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json index 0fbf83070..013745c90 100644 --- a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json @@ -15,7 +15,8 @@ "vidNotions": { "instantiationUI": "legacy", "modelCategory": "other", - "viewEditUI": "legacy" + "viewEditUI": "legacy", + "instantiationType": "Macro" } }, "vnfs": { @@ -292,7 +293,7 @@ "modelCustomizationName": "ExtVL 0" } }, - "collectionResource": {}, + "collectionResources": {}, "configurations": { "Port Mirroring Configuration By Policy 0": { "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50", diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json index b2ba2c7e9..7cf11c824 100644 --- a/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json @@ -32,7 +32,7 @@ "vfModules": {}, "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -51,44 +51,44 @@ }, "2017-488_PASQUALE-vPE 0": { "vfModules": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { "instanceName": "VFinstancenameZERO", "action": "None", "modelInfo": { "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", - "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" }, "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", "provStatus": "Prov Status", "orchStatus": "Active", "inMaint": true, - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86" } }, - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { "instanceName": "VFinstancename", "action": "None", "volumeGroupName": "VFinstancename_vol_abc", "orchStatus": "Create", "provStatus": "Prov Status", "inMaint": false, - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "modelInfo": { "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", - "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -97,7 +97,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -118,8 +118,8 @@ }, "2017-488_PASQUALE-vPE 0:0001": { "vfModules": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { "instanceName": "VFinstancenameZERO_001", "action": "None", "provStatus": "Prov Status", @@ -127,27 +127,27 @@ "modelInfo": { "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", - "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" }, "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" } }, - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { "instanceName": "VFinstancename_001", "action": "None", "volumeGroupName": "VFinstancename_vol_abc_001", "modelInfo": { "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", - "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -157,7 +157,7 @@ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", @@ -176,34 +176,34 @@ }, "2017-488_PASQUALE-vPE 0:0002": { "vfModules": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": { "instanceName": "VFinstancenameZERO_002", "action": "None", "modelInfo": { "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091", "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db", - "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "modelVersion": "5", "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0", "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" }, "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db" } }, - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": { - "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": { + "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": { "instanceName": "VFinstancename_002", "action": "None", "volumeGroupName": "VFinstancename_vol_abc_002", "modelInfo": { "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5", - "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "modelVersion": "6", "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", - "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1", + "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1", "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" }, "uuid": "25284168-24bb-4698-8cb4-3f509146eca5" @@ -212,7 +212,7 @@ }, "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89", - "lcpCloudRegionId": "JANET25", + "lcpCloudRegionId": "AAIAIC25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "lineOfBusiness": "ONAP", "platformName": "platform", diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json new file mode 100644 index 000000000..fda51c25a --- /dev/null +++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json @@ -0,0 +1,125 @@ +{ + "instanceName": "SERVICE_INSTANCE_NAME", + "action": "None", + "globalSubscriberId": "global-customer-id", + "subscriptionServiceType": "service-instance-type", + "owningEntityId": null, + "productFamilyId": null, + "lcpCloudRegionId": null, + "tenantId": null, + "aicZoneId": null, + "projectName": null, + "rollbackOnFailure": null, + "aicZoneName": null, + "cloudOwner": null, + "owningEntityName": null, + "tenantName": null, + "instanceId": "service-instance-id", + "modelInfo": { + "modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb", + "modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8", + "modelName": "Service with VRF", + "modelVersion": "5.0", + "modelType": "service" + }, + "isALaCarte": true, + "orchStatus": "GARBAGE DATA", + "collectionResources": { + }, + "networks": {}, + "vnfs": {}, + "vnfGroups": {}, + "vrfs": { + "VRF_INSTANCE_ID": { + "action": "None", + "cloudOwner": null, + "inMaint": false, + "instanceId": "VRF_INSTANCE_ID", + "instanceName": "VRF_INSTANCE_NAME", + "instanceType": null, + "lcpCloudRegionId": null, + "legacyRegion": null, + "lineOfBusiness": null, + "modelInfo": { + "modelVersionId": "9cac02be-2489-4374-888d-2863b4511a59", + "modelInvariantId": "b67a289b-1688-496d-86e8-1583c828be0a", + "modelCustomizationId":"dd024d73-9bd1-425d-9db5-476338d53433", + "modelName": "VRF Entry Configuration", + "modelVersion": "5.0", + "modelType": "configuration" + }, + "vpns": { + "VPN_INSTANCE_ID": { + "action": "None", + "instanceId": "VPN_INSTANCE_ID", + "trackById": "VPN_INSTANCE_ID", + "instanceName": "VPN_INSTANCE_NAME", + "instanceType": "SERVICE-INFRASTRUCTURE", + "orchStatus": "Active", + "provStatus": "prov", + "inMaint": false, + "region": "USA,EMEA", + "customerId": "VPN1260", + "modelInfo": { + "modelVersionId": "vpn-model-version-id", + "modelInvariantId": "vpn-model-invariant-id", + "modelCustomizationId": "vpn-model-customization-id", + "modelName": "vf_vEPDG", + "modelVersion": "6.0", + "modelType": "vpnBinding" + }, + "routeTargets": [ + { + "globalRouteTarget": "mock-global-1", + "routeTargetRole": "mock-role-x" + } + ], + "uuid": "vpn-model-version-id" + } + }, + "networks": { + "NETWORK_INSTANCE_ID": { + "action": "None", + "boundToVpn": true, + "inMaint": false, + "instanceId": "NETWORK_INSTANCE_ID", + "instanceName": "NETWORK_INSTANCE_NAME", + "instanceType": "SR-IOV-PROVIDER2-2", + "modelInfo": { + "modelVersionId": "network-instance-model-version-id", + "modelInvariantId": "network-instance-model-invariant-id", + "modelCustomizationId": "network-instance-model-customization-id", + "modelType": "network", + "modelVersion": "6.0", + "modelName": "Network Entry" + }, + "orchStatus": "Assigned", + "provStatus": "prov", + "role": "NETWORK_INSTANCE_ROLE", + "trackById": "NETWORK_INSTANCE_ID", + "uuid": "network-instance-model-version-id", + "routeTarget": + { + "globalRouteTarget": "mock-global-1", + "routeTargetRole": "mock-role-x" + } + } + }, + "orchStatus": "Create", + "originalName": "VRF Entry Configuration 0", + "platformName": null, + "productFamilyId": null, + "provStatus": null, + "tenantId": null, + "trackById": "VRF_INSTANCE_ID", + "uuid": "9cac02be-2489-4374-888d-2863b4511a59" + } + }, + "validationCounter": 0, + "existingVNFCounterMap": {}, + "existingVRFCounterMap": { + "dd024d73-9bd1-425d-9db5-476338d53433": 1 + }, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {} +} \ No newline at end of file -- cgit 1.2.3-korg