summaryrefslogtreecommitdiffstats
path: root/vid-automation/src/test/resources
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-03-11 09:34:34 +0200
committerIttay Stern <ittay.stern@att.com>2019-03-17 17:02:43 +0200
commit66af8b9b391879be78660d6ccb0a1f1f9340b423 (patch)
treefc0d510f7ea28a437bcb1e3b950d1281ac88a4e4 /vid-automation/src/test/resources
parent37ad0cc1d36ec6ff68ec39fcaaf2617eef7d08fe (diff)
Merge automation from ECOMP's repository
Reference commit in ECOMP: 8e92a8c6 Issue-ID: VID-378 Change-Id: Ia32f4813378ef95097f788246aa5b1172e20ca48 Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-automation/src/test/resources')
-rw-r--r--vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json40
-rw-r--r--vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json204
-rw-r--r--vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json178
-rw-r--r--vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json139
-rw-r--r--vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json178
-rw-r--r--vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json114
-rw-r--r--vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json30
-rw-r--r--vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json65
-rw-r--r--vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json171
-rw-r--r--vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json123
-rw-r--r--vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json209
-rw-r--r--vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarte.json18
-rw-r--r--vid-automation/src/test/resources/a-la-carte/redux-a-la-carte-no-testapi.json194
-rw-r--r--vid-automation/src/test/resources/a-la-carte/redux-a-la-carte.json195
-rw-r--r--vid-automation/src/test/resources/a-la-carte/redux-multiple-vnf-network.json118
-rw-r--r--vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json274
-rw-r--r--vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json392
-rw-r--r--vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json263
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json62
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json67
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/auditModalFailedServiceInstance.json12
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json26
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json44
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateBulkOfMacro.json4
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json117
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json286
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json86
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json71
-rw-r--r--vid-automation/src/test/resources/changeManagement/reduced_vnf_data_by_globalid_and_service_type.json539
-rw-r--r--vid-automation/src/test/resources/changeManagement/vnfInPlaceSoftwareUpdate.json26
-rw-r--r--vid-automation/src/test/resources/changeManagement/vnfReplaceRequest.json40
-rw-r--r--vid-automation/src/test/resources/changeManagement/vnfUpdateRequest.json45
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/aai_get_full_subscribers.json107
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration.json (renamed from vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations.json)4
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration_error.json10
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json34
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json22
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json68
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json5
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json22
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json (renamed from vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VmmeRvpmsFeAic3011217Svc.json)4
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/mso_activate_configurations.json21
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations_error.json10
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json2
-rw-r--r--vid-automation/src/test/resources/registration_to_simulator/portal_remote_users.json18
-rw-r--r--vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json54
-rw-r--r--vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json54
-rw-r--r--vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json54
-rw-r--r--vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json454
-rw-r--r--vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json363
-rw-r--r--vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json31
-rw-r--r--vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json58
-rw-r--r--vid-automation/src/test/resources/test_config.properties5
-rw-r--r--vid-automation/src/test/resources/viewEdit/aaiHomingDataResponse.json8
76 files changed, 5574 insertions, 208 deletions
diff --git a/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
new file mode 100644
index 000000000..08534ce49
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
@@ -0,0 +1,40 @@
+{
+ "isDirty":true,
+ "vnfs": {},
+ "instanceParams": [],
+ "validationCounter": 0,
+ "existingNames": {
+ "wowservicewithvnfgroping": ""
+ },
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {},
+ "existingNetworksCounterMap": {},
+ "networks": {},
+ "vnfGroups": {},
+ "bulkSize": 1,
+ "instanceName": "wowServiceWithVnfGroping",
+ "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
+ "orchStatus": "ACTIVE",
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "owningEntityId": null,
+ "owningEntityName": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "tenantName": null,
+ "aicZoneId": null,
+ "aicZoneName": null,
+ "projectName": null,
+ "rollbackOnFailure": false,
+ "isALaCarte": true,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0"
+ },
+ "testApi": "VNF_API",
+ "action": "Delete"
+}
diff --git a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
new file mode 100644
index 000000000..f1bbf1712
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
@@ -0,0 +1,204 @@
+{
+ "action": "None",
+ "isDirty": true,
+ "vnfs": {},
+ "instanceParams": [],
+ "validationCounter": 0,
+ "existingNames": {
+ "service_instance_name": "",
+ "vnf_group3_instance_name": ""
+ },
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 3
+ },
+ "existingNetworksCounterMap": {},
+ "networks": {},
+ "vnfGroups": {
+ "VNF_GROUP1_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP1_INSTANCE_ID",
+ "instanceName": "VNF_GROUP1_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None_Delete",
+ "instanceId": "VNF_GROUP1_INSTANCE_ID",
+ "instanceType": "VNF_GROUP1_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs":{
+ "RELATED_VNF1_INSTANCE_ID":{
+ "action":"None_Delete",
+ "instanceName":"RELATED_VNF1_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF1_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "modelType":"vnf",
+ "modelName":"vf_vEPDG",
+ "modelVersion":"2.0"
+ },
+ "instanceType":"RELATED_VNF1_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF1_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF2_INSTANCE_ID":{
+ "action":"None_Delete",
+ "instanceName":"RELATED_VNF2_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF2_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF2_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF2_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF3_INSTANCE_ID":{
+ "action":"None_Delete",
+ "instanceName":"RELATED_VNF3_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF3_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF3_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF3_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ }
+ }
+ },
+ "VNF_GROUP2_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP2_INSTANCE_ID",
+ "instanceName": "VNF_GROUP2_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None",
+ "instanceId": "VNF_GROUP2_INSTANCE_ID",
+ "instanceType": "VNF_GROUP2_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "tenantId": null,
+ "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs": {}
+ },
+ "groupingservicefortest..ResourceInstanceGroup..0": {
+ "action": "Create",
+ "inMaint": false,
+ "rollbackOnFailure": "true",
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "isMissingData": false,
+ "trackById": "ag5aav86u4j",
+ "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceName": "VNF_GROUP3_INSTANCE_NAME",
+ "modelInfo": {
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "modelName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelVersion": "1",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelUniqueId": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "instanceParams": [{}
+ ],
+ "vnfs":{}
+ }
+ },
+ "bulkSize": 1,
+ "instanceName": "SERVICE_INSTANCE_NAME",
+
+ "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": false,
+ "isALaCarte": true,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0"
+ },
+
+ "testApi": "VNF_API"
+}
diff --git a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
new file mode 100644
index 000000000..f43a1dd12
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
@@ -0,0 +1,178 @@
+{
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 2
+ },
+ "existingNetworksCounterMap": {},
+ "vnfs": {},
+ "vnfGroups": {
+ "VNF_GROUP1_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP1_INSTANCE_ID",
+ "instanceName": "VNF_GROUP1_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None_Delete",
+ "instanceId": "VNF_GROUP1_INSTANCE_ID",
+ "instanceType": "VNF_GROUP1_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs": {
+ "RELATED_VNF1_INSTANCE_ID": {
+ "action": "None_Delete",
+ "instanceName": "RELATED_VNF1_INSTANCE_NAME",
+ "instanceId": "RELATED_VNF1_INSTANCE_ID",
+ "orchStatus": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelVersionId": "7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "modelType": "vnf",
+ "modelName": "vf_vEPDG",
+ "modelVersion": "2.0"
+ },
+ "instanceType": "RELATED_VNF1_INSTANCE_TYPE",
+ "provStatus": null,
+ "inMaint": false,
+ "uuid": "7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "originalName": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "platformName": null,
+ "trackById": "RELATED_VNF1_INSTANCE_ID",
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantName": null
+ },
+ "RELATED_VNF2_INSTANCE_ID": {
+ "action": "None_Delete",
+ "instanceName": "RELATED_VNF2_INSTANCE_NAME",
+ "instanceId": "RELATED_VNF2_INSTANCE_ID",
+ "orchStatus": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType": "vnf"
+ },
+ "instanceType": "RELATED_VNF2_INSTANCE_TYPE",
+ "provStatus": null,
+ "inMaint": false,
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "platformName": null,
+ "trackById": "RELATED_VNF2_INSTANCE_ID",
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantName": null
+ },
+ "RELATED_VNF3_INSTANCE_ID": {
+ "action": "None_Delete",
+ "instanceName": "RELATED_VNF3_INSTANCE_NAME",
+ "instanceId": "RELATED_VNF3_INSTANCE_ID",
+ "orchStatus": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType": "vnf"
+ },
+ "instanceType": "RELATED_VNF3_INSTANCE_TYPE",
+ "provStatus": null,
+ "inMaint": false,
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "platformName": null,
+ "trackById": "RELATED_VNF3_INSTANCE_ID",
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantName": null
+ }
+ }
+ },
+ "VNF_GROUP2_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP2_INSTANCE_ID",
+ "instanceName": "VNF_GROUP2_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None_Delete",
+ "instanceId": "VNF_GROUP2_INSTANCE_ID",
+ "instanceType": "VNF_GROUP2_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "tenantId": null,
+ "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs": {}
+ }
+ },
+ "instanceParams": [],
+ "globalSubscriberId": "global-customer-id",
+ "subscriptionServiceType": "service-instance-type",
+ "projectName": null,
+ "owningEntityId": null,
+ "bulkSize": 1,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0"
+ },
+ "existingNames": {
+ "service_instance_name": ""
+ },
+ "instanceName": "SERVICE_INSTANCE_NAME",
+ "owningEntityName": null,
+ "rollbackOnFailure": false,
+ "testApi": "VNF_API",
+ "isALaCarte": true,
+ "action": "Delete",
+ "isDirty": true,
+ "instanceId": "service-instance-id",
+ "orchStatus": "GARBAGE DATA",
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "tenantName": null,
+ "aicZoneId": null,
+ "aicZoneName": null,
+ "networks": {},
+ "validationCounter": 0
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json
new file mode 100644
index 000000000..f83799308
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json
@@ -0,0 +1,139 @@
+{
+ "service": {
+ "vidNotions": {
+ "instantiationUI": "serviceWithVnfGrouping",
+ "modelCategory": "other",
+ "viewEditUI": "serviceWithVnfGrouping"
+ },
+ "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "invariantUuid": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "name": "Grouping Service for Test",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L4+",
+ "serviceType": "INFRASTRUCTURE",
+ "serviceRole": "GROUPING",
+ "description": "xxx",
+ "serviceEcompNaming": "true",
+ "instantiationType": "A-La-Carte",
+ "inputs": {}
+ },
+ "vnfs": {},
+ "networks": {},
+ "collectionResource": {},
+ "configurations": {},
+ "fabricConfigurations": {},
+ "serviceProxies": {
+ "vDOROTHEA_svc_vprs_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
+ "name": "vDOROTHEA_Svc_vPRS Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274",
+ "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14",
+ "sourceModelName": "vDOROTHEA_Svc_vPRS"
+ },
+ "tsbc0001vm001_svc_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service tsbc0001vm001_Svc",
+ "name": "tsbc0001vm001_Svc Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "3d814462-30fb-4c62-b997-9aa360d27ead",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "28aeb8f6-5620-4148-8bfb-a5fb406f0309",
+ "sourceModelInvariant": "c989ab9a-33c7-46ec-b521-1b2daef5f047",
+ "sourceModelName": "tsbc0001vm001_Svc"
+ }
+ },
+ "vfModules": {},
+ "volumeGroups": {},
+ "pnfs": {},
+ "vnfGroups": {
+ "groupingservicefortest..ResourceInstanceGroup..0": {
+ "type": "VnfGroup",
+ "invariantUuid": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "version": "1",
+ "name": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "properties": {
+ "contained_resource_type": "VF",
+ "role": "SERVICE-ACCESS",
+ "function": "DATA",
+ "description": "DDD0",
+ "type": "LOAD-GROUP",
+ "ecomp_generated_naming": "true",
+ "quantity": 4
+ },
+ "members": {
+ "vDOROTHEA_svc_vprs_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
+ "name": "vDOROTHEA_Svc_vPRS Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274",
+ "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14",
+ "sourceModelName": "vDOROTHEA_Svc_vPRS"
+ }
+ }
+ },
+ "groupingservicefortest..ResourceInstanceGroup..1": {
+ "type": "VnfGroup",
+ "invariantUuid": "a704112d-dbc6-4e56-8d4e-aec57e95ef9a",
+ "uuid": "c2b300e6-45de-4e5e-abda-3032bee2de56",
+ "version": "1",
+ "name": "groupingservicefortest..ResourceInstanceGroup..1",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..1",
+ "properties": {
+ "contained_resource_type": "VF",
+ "role": "SERVICE-ACCESS",
+ "function": "SIGNALING",
+ "description": "DDD1",
+ "type": "LOAD-GROUP",
+ "ecomp_generated_naming": "true",
+ "quantity": 3
+ },
+ "members": {
+ "tsbc0001vm001_svc_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service tsbc0001vm001_Svc",
+ "name": "tsbc0001vm001_Svc Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "3d814462-30fb-4c62-b997-9aa360d27ead",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "28aeb8f6-5620-4148-8bfb-a5fb406f0309",
+ "sourceModelInvariant": "c989ab9a-33c7-46ec-b521-1b2daef5f047",
+ "sourceModelName": "tsbc0001vm001_Svc"
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
new file mode 100644
index 000000000..734c13306
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
@@ -0,0 +1,178 @@
+{
+ "action": "None",
+ "isDirty": true,
+ "vnfs": {},
+ "instanceParams": [],
+ "validationCounter": 0,
+ "existingNames": {
+ "service_instance_name": ""
+ },
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 2
+ },
+ "existingNetworksCounterMap": {},
+ "networks": {},
+ "vnfGroups": {
+ "VNF_GROUP1_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP1_INSTANCE_ID",
+ "instanceName": "VNF_GROUP1_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "VNF_GROUP1_ACTION",
+ "instanceId": "VNF_GROUP1_INSTANCE_ID",
+ "instanceType": "VNF_GROUP1_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs": {
+ "RELATED_VNF1_INSTANCE_ID":{
+ "action":"RELATED_VNF1_ACTION",
+ "instanceName":"RELATED_VNF1_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF1_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "modelType":"vnf",
+ "modelName":"vf_vEPDG",
+ "modelVersion":"2.0"
+ },
+ "instanceType":"RELATED_VNF1_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF1_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF2_INSTANCE_ID":{
+ "action":"RELATED_VNF2_ACTION",
+ "instanceName":"RELATED_VNF2_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF2_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF2_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF2_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF3_INSTANCE_ID":{
+ "action":"None",
+ "instanceName":"RELATED_VNF3_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF3_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF3_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF3_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ }
+ }
+ },
+ "VNF_GROUP2_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP2_INSTANCE_ID",
+ "instanceName": "VNF_GROUP2_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None",
+ "instanceId": "VNF_GROUP2_INSTANCE_ID",
+ "instanceType": "VNF_GROUP2_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "tenantId": null,
+ "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs": {}
+ }
+ },
+ "bulkSize": 1,
+ "instanceName": "SERVICE_INSTANCE_NAME",
+ "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": false,
+ "isALaCarte": true,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0"
+ },
+ "testApi": "VNF_API"
+}
diff --git a/vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json b/vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json
new file mode 100644
index 000000000..e48e41c57
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json
@@ -0,0 +1,114 @@
+[
+ {
+ "action":"None",
+ "instanceName":"VNF1_INSTANCE_NAME",
+ "instanceId":"VNF1_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":"hvf23b",
+ "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenantName":"APPC-24595-T-IST-02C",
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "modelVersion":"2.0",
+ "modelName":"vf_vEPDG",
+ "modelType":"vnf"
+ },
+ "instanceType":"VNF1_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"VNF1_INSTANCE_ID",
+ "serviceInstanceId":"service-instance-id1",
+ "serviceInstanceName":"service-instance-name"
+ },
+ {
+ "action":"None",
+ "instanceName":"VNF2_INSTANCE_NAME",
+ "instanceId":"VNF2_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":"hvf23b",
+ "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenantName":"APPC-24595-T-IST-02C",
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"eb5f56bf-5855-4e61-bd00-3e19a953bf02",
+ "modelVersion":"1.0",
+ "modelName":"vf_vEPDG",
+ "modelType":"vnf"
+ },
+ "instanceType":"VNF2_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":true,
+ "uuid":"eb5f56bf-5855-4e61-bd00-3e19a953bf02",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"VNF2_INSTANCE_ID",
+ "serviceInstanceId":"service-instance-id2",
+ "serviceInstanceName":"service-instance-name"
+ },
+ {
+ "action":"None",
+ "instanceName":"VNF3_INSTANCE_NAME",
+ "instanceId":"VNF3_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":"hvf23b",
+ "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenantName":"APPC-24595-T-IST-02C",
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelVersion":"1.0",
+ "modelName":"Grouping Service for Test",
+ "modelType":"vnf"
+ },
+ "instanceType":"VNF3_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"VNF3_INSTANCE_ID",
+ "serviceInstanceId":"service-instance-id1",
+ "serviceInstanceName":"service-instance-name"
+ },
+ {
+ "action":"None",
+ "instanceName":"VNF4_INSTANCE_NAME",
+ "instanceId":"VNF4_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":"hvf23b",
+ "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenantName":"APPC-24595-T-IST-02C",
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"b7f2e8fb-ac71-4ea0-a801-06ef1479ea84",
+ "modelVersion":"4.0",
+ "modelName":"vf_vEPDG",
+ "modelType":"vnf"
+ },
+ "instanceType":"VNF4_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":true,
+ "uuid":"b7f2e8fb-ac71-4ea0-a801-06ef1479ea84",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"VNF4_INSTANCE_ID",
+ "serviceInstanceId":"service-instance-id2",
+ "serviceInstanceName":"service-instance-name"
+ }
+] \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json
new file mode 100644
index 000000000..be4bfe428
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json
@@ -0,0 +1,30 @@
+{
+ "instanceName":"wowServiceWithVnfGroping",
+ "instanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
+ "orchStatus":"ACTIVE",
+ "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType":"TYLER SILVIA",
+ "owningEntityId":null,
+ "owningEntityName":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "tenantName":null,
+ "aicZoneId":null,
+ "aicZoneName":null,
+ "projectName":null,
+ "rollbackOnFailure":null,
+ "isALaCarte":true,
+ "modelInfo":{
+ "modelInvariantId":"7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName":"Grouping Service for Test",
+ "modelType":"service",
+ "modelVersion":"1.0"
+ },
+ "vnfs":{},
+ "networks":{},
+ "validationCounter":0,
+ "existingVNFCounterMap":{},
+ "existingNetworksCounterMap":{}
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
new file mode 100644
index 000000000..0f4bc3fa3
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
@@ -0,0 +1,65 @@
+{
+ "existingVNFCounterMap": {
+ },
+ "existingVnfGroupCounterMap": {
+ "c2b300e6-45de-4e5e-abda-3032bee2de56": 1
+ },
+ "existingNetworksCounterMap": {
+ },
+ "vnfs":{},
+ "vnfGroups": {
+ "groupingservicefortest..ResourceInstanceGroup..1": {
+ "action": "Create",
+ "inMaint": false,
+ "rollbackOnFailure": "true",
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..1",
+ "isMissingData": false,
+ "trackById": "tv2mmg4erg",
+ "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..1",
+ "instanceName": "ABC",
+ "instanceParams": [
+ {
+ }
+ ],
+ "modelInfo": {
+ "modelInvariantId": "a704112d-dbc6-4e56-8d4e-aec57e95ef9a",
+ "modelVersionId": "c2b300e6-45de-4e5e-abda-3032bee2de56",
+ "modelName": "groupingservicefortest..ResourceInstanceGroup..1",
+ "modelVersion": "1",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..1",
+ "modelUniqueId" : "c2b300e6-45de-4e5e-abda-3032bee2de56",
+ "uuid": "c2b300e6-45de-4e5e-abda-3032bee2de56"
+ },
+ "uuid": "c2b300e6-45de-4e5e-abda-3032bee2de56",
+ "vnfs":{}
+ }
+ },
+ "instanceParams": [
+ {
+ "2017488_PASQUALEvpe0_ASN": "AV_vPE"
+ }
+ ],
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "projectName": "WATKINS",
+ "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+ "bulkSize": 1,
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelVersion": "1.0"
+ },
+ "existingNames": {
+ "abc": ""
+ },
+ "instanceName": "Grouping_Service_Instance",
+ "subscriberName": "SILVIA ROBBINS",
+ "owningEntityName": "WayneHolland",
+ "rollbackOnFailure": true,
+ "testApi": "VNF_API",
+ "isALaCarte": true,
+ "isDirty":true,
+ "action": "Create"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json
new file mode 100644
index 000000000..42af8a789
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json
@@ -0,0 +1,171 @@
+{
+ "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":true,
+ "modelInfo":{
+ "modelInvariantId":"7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName":"Grouping Service for Test",
+ "modelType":"service",
+ "modelVersion":"1.0"
+ },
+ "vnfs":{},
+ "networks":{},
+ "vnfGroups":{
+ "VNF_GROUP1_INSTANCE_ID":{
+ "originalName":"groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById":"VNF_GROUP1_INSTANCE_ID",
+ "instanceName":"VNF_GROUP1_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None",
+ "instanceId":"VNF_GROUP1_INSTANCE_ID",
+ "instanceType":"VNF_GROUP1_INSTANCE_TYPE",
+ "orchStatus":null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "inMaint":false,
+ "modelInfo":{
+ "modelType":"instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId":"4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceGroupRole":"VNF_GROUP1_INSTANCE_ROLE",
+ "instanceGroupFunction":"vTSBC Customer Landing Network Collection",
+ "vnfs":{
+ "RELATED_VNF1_INSTANCE_ID":{
+ "action":"None",
+ "instanceName":"RELATED_VNF1_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF1_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "modelType":"vnf",
+ "modelName":"vf_vEPDG",
+ "modelVersion":"2.0"
+ },
+ "instanceType":"RELATED_VNF1_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF1_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF2_INSTANCE_ID":{
+ "action":"None",
+ "instanceName":"RELATED_VNF2_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF2_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF2_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF2_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF3_INSTANCE_ID":{
+ "action":"None",
+ "instanceName":"RELATED_VNF3_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF3_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF3_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF3_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ }
+ }
+ },
+ "VNF_GROUP2_INSTANCE_ID":{
+ "originalName":"groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById":"VNF_GROUP2_INSTANCE_ID",
+ "instanceName":"VNF_GROUP2_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None",
+ "instanceId":"VNF_GROUP2_INSTANCE_ID",
+ "instanceType":"VNF_GROUP2_INSTANCE_TYPE",
+ "orchStatus":null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "inMaint":false,
+ "modelInfo":{
+ "modelType":"instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId":"4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "tenantId": null,
+ "instanceGroupRole":"VNF_GROUP2_INSTANCE_ROLE",
+ "instanceGroupFunction":"vTSBC Customer Landing Network Collection",
+ "vnfs": {}
+ }
+ },
+ "validationCounter":0,
+ "existingVNFCounterMap":{},
+ "existingVnfGroupCounterMap":{
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 2
+ },
+ "existingNetworksCounterMap":{}
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json
new file mode 100644
index 000000000..2e0f85ee4
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json
@@ -0,0 +1,123 @@
+{
+ "action": "None",
+ "isDirty": true,
+ "vnfs": {},
+ "instanceParams": [],
+ "validationCounter": 0,
+ "existingNames": {
+ "service_instance_name": "",
+ "vnf_group3_instance_name": ""
+ },
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 3
+ },
+ "existingNetworksCounterMap": {},
+ "networks": {},
+ "vnfGroups": {
+ "groupingservicefortest..ResourceInstanceGroup..0:001": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "groupingservicefortest..ResourceInstanceGroup..0:001",
+ "instanceName": "VNF_GROUP1_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "rollbackOnFailure": "false",
+ "action": "None_Delete",
+ "instanceId": "VNF_GROUP1_INSTANCE_ID",
+ "instanceType": "VNF_GROUP1_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection"
+ },
+ "groupingservicefortest..ResourceInstanceGroup..0:002": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "groupingservicefortest..ResourceInstanceGroup..0:002",
+ "instanceName": "VNF_GROUP2_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None_Delete",
+ "instanceId": "VNF_GROUP2_INSTANCE_ID",
+ "instanceType": "VNF_GROUP2_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "tenantId": null,
+ "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection"
+ },
+ "groupingservicefortest..ResourceInstanceGroup..0": {
+ "action": "Create",
+ "inMaint": false,
+ "rollbackOnFailure": "true",
+
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "isMissingData": false,
+ "trackById": "ag5aav86u4j",
+ "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceName": "VNF_GROUP3_INSTANCE_NAME",
+
+
+ "modelInfo": {
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "modelName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelVersion": "1",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "instanceParams": [{}
+ ]
+ }
+ },
+ "bulkSize": 1,
+ "instanceName": "SERVICE_INSTANCE_NAME",
+
+ "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": false,
+ "isALaCarte": true,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0"
+ },
+
+ "testApi": "VNF_API"
+}
diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
new file mode 100644
index 000000000..da9727e89
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
@@ -0,0 +1,209 @@
+{
+ "action": "None",
+ "aicZoneId": null,
+ "aicZoneName": null,
+ "bulkSize": 1,
+ "existingNames": {
+ "service_instance_name": ""
+ },
+ "existingNetworksCounterMap": {},
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 2,
+ "c2b300e6-45de-4e5e-abda-3032bee2de56": 0
+ },
+ "globalSubscriberId": "global-customer-id",
+ "instanceId": "service-instance-id",
+ "instanceName": "SERVICE_INSTANCE_NAME",
+ "instanceParams": [],
+ "isALaCarte": true,
+ "isDirty": true,
+ "lcpCloudRegionId": null,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc"
+ },
+ "networks": {},
+ "orchStatus": "GARBAGE DATA",
+ "owningEntityId": null,
+ "owningEntityName": null,
+ "productFamilyId": null,
+ "projectName": null,
+ "rollbackOnFailure": false,
+ "subscriptionServiceType": "service-instance-type",
+ "tenantId": null,
+ "tenantName": null,
+ "testApi": "VNF_API",
+ "validationCounter": 0,
+ "vnfGroups": {
+ "VNF_GROUP1_INSTANCE_ID": {
+ "action": "None",
+ "inMaint": false,
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE",
+ "instanceId": "VNF_GROUP1_INSTANCE_ID",
+ "instanceName": "VNF_GROUP1_INSTANCE_NAME",
+ "instanceType": "VNF_GROUP1_INSTANCE_TYPE",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelType": "instanceGroup",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "orchStatus": null,
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "trackById": "VNF_GROUP1_INSTANCE_ID",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "vnfs": {
+ "RELATED_VNF1_INSTANCE_ID": {
+ "action": "None",
+ "inMaint": false,
+ "instanceId": "RELATED_VNF1_INSTANCE_ID",
+ "instanceName": "RELATED_VNF1_INSTANCE_NAME",
+ "instanceType": "RELATED_VNF1_INSTANCE_TYPE",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelName": "vf_vEPDG",
+ "modelType": "vnf",
+ "modelVersion": "2.0",
+ "modelVersionId": "7a6ee536-f052-46fa-aa7e-2fca9d674c44"
+ },
+ "orchStatus": null,
+ "originalName": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantId": null,
+ "tenantName": null,
+ "trackById": "RELATED_VNF1_INSTANCE_ID",
+ "uuid": "7a6ee536-f052-46fa-aa7e-2fca9d674c44"
+ },
+ "RELATED_VNF2_INSTANCE_ID": {
+ "action": "None",
+ "inMaint": false,
+ "instanceId": "RELATED_VNF2_INSTANCE_ID",
+ "instanceName": "RELATED_VNF2_INSTANCE_NAME",
+ "instanceType": "RELATED_VNF2_INSTANCE_TYPE",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelType": "vnf",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60"
+ },
+ "orchStatus": null,
+ "originalName": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantId": null,
+ "tenantName": null,
+ "trackById": "RELATED_VNF2_INSTANCE_ID",
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60"
+ },
+ "RELATED_VNF3_INSTANCE_ID": {
+ "action": "None",
+ "inMaint": false,
+ "instanceId": "RELATED_VNF3_INSTANCE_ID",
+ "instanceName": "RELATED_VNF3_INSTANCE_NAME",
+ "instanceType": "RELATED_VNF3_INSTANCE_TYPE",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelType": "vnf",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60"
+ },
+ "orchStatus": null,
+ "originalName": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantId": null,
+ "tenantName": null,
+ "trackById": "RELATED_VNF3_INSTANCE_ID",
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60"
+ },
+ "VNF1_INSTANCE_ID": {
+ "action": "Create",
+ "inMaint": false,
+ "instanceId": "VNF1_INSTANCE_ID",
+ "instanceName": "VNF1_INSTANCE_NAME",
+ "instanceType": "VNF1_INSTANCE_TYPE",
+ "isSelected": true,
+ "lcpCloudRegionId": "hvf23b",
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelName": "vf_vEPDG",
+ "modelType": "vnf",
+ "modelVersion": "2.0",
+ "modelVersionId": "7a6ee536-f052-46fa-aa7e-2fca9d674c44"
+ },
+ "orchStatus": null,
+ "originalName": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "serviceInstanceId": "service-instance-id1",
+ "serviceInstanceName": "service-instance-name",
+ "tenantId": "3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenantName": "APPC-24595-T-IST-02C",
+ "trackById": "VNF1_INSTANCE_ID",
+ "uuid": "7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "vnfStoreKey": "VNF1_INSTANCE_ID"
+ }
+ }
+ },
+ "VNF_GROUP2_INSTANCE_ID": {
+ "action": "None",
+ "inMaint": false,
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE",
+ "instanceId": "VNF_GROUP2_INSTANCE_ID",
+ "instanceName": "VNF_GROUP2_INSTANCE_NAME",
+ "instanceType": "VNF_GROUP2_INSTANCE_TYPE",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelType": "instanceGroup",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "orchStatus": null,
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "trackById": "VNF_GROUP2_INSTANCE_ID",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "vnfs": {}
+ }
+ },
+ "vnfs": {}
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarte.json b/vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarte.json
new file mode 100644
index 000000000..450e43863
--- /dev/null
+++ b/vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarte.json
@@ -0,0 +1,18 @@
+[
+ {
+ "instanceName": "instance name 1",
+ "instanceType" : "service",
+ "jobStatus": "COMPLETE",
+ "requestId": "405652f4-ceb3-4a75-9474-8aea71480a77",
+ "additionalInfo": "Service Instance was created successfully.",
+ "final": "false"
+ },
+ {
+ "instanceName": "instance name 2",
+ "instanceType" : "service",
+ "jobStatus": "COMPLETE",
+ "requestId": "688d40cd-6bfd-4a4b-95f4-5e4ffa6d6fc5",
+ "additionalInfo": "Vnf has been created successfully.",
+ "final": "false"
+ }
+]
diff --git a/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte-no-testapi.json b/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte-no-testapi.json
new file mode 100644
index 000000000..47643d21e
--- /dev/null
+++ b/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte-no-testapi.json
@@ -0,0 +1,194 @@
+{
+ "action":"Create",
+ "isDirty":false,
+ "validationCounter":0,
+ "existingVNFCounterMap": {},
+ "existingNetworksCounterMap": {},
+ "vnfs": {
+ "2017-488_PASQUALE-vPE 0": {
+ "action": "Create",
+ "rollbackOnFailure": "true",
+ "vfModules": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
+ "instanceName": "mimazepubi",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "624eb554b0d147c19ff8885341760481",
+ "rollbackOnFailure": "false",
+ "sdncPreLoad": false,
+ "instanceParams": [{}
+ ],
+ "modelInfo": {
+ "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+ "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+ "modelVersion": "5",
+ "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+ "modelUniqueId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+ "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
+ },
+ "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+ "isMissingData": false
+ }
+ },
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
+ "instanceName": "puwesovabe",
+ "volumeGroupName": "puwesovabe_vol",
+ "lcpCloudRegionId": "JANET25",
+ "legacyRegion": "my region",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "rollbackOnFailure": "true",
+ "sdncPreLoad": true,
+ "instanceParams": [{
+ "PASQUALEvpe0_bandwidth": "10",
+ "2017488_PASQUALEvpe0_vnf_instance_name": "mtnj309me6",
+ "2017488_PASQUALEvpe0_vnf_config_template_version": "17.2",
+ "2017488_PASQUALEvpe0_AIC_CLLI": "ATLMY8GA",
+ "PASQUALEvpe0_bandwidth_units": "Gbps"
+ }
+ ],
+ "modelInfo": {
+ "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
+ "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "modelVersion": "6",
+ "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+ "modelUniqueId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ },
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
+ "isMissingData": false
+ }
+ },
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2": {
+ "instanceName": "bnmgtrx",
+ "volumeGroupName": "",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "624eb554b0d147c19ff8885341760481",
+ "rollbackOnFailure": "false",
+ "sdncPreLoad": false,
+ "instanceParams": [{}
+ ],
+ "modelInfo": {
+ "modelInvariantId": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
+ "modelVersionId": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2",
+ "modelVersion": "6",
+ "modelCustomizationId": "3cd946bb-50e0-40d8-96d3-c9023520b557",
+ "modelUniqueId": "3cd946bb-50e0-40d8-96d3-c9023520b557",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2",
+ "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a"
+ },
+ "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
+ "isMissingData": false
+ }
+ }
+ },
+ "isMissingData": false,
+ "originalName": "2017-488_PASQUALE-vPE 0",
+ "vnfStoreKey": "2017-488_PASQUALE-vPE 0",
+ "trackById": "s0z58emiprq",
+ "instanceName": "2017-488_PASQUALE-vPE",
+ "inMaint":false,
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "lcpCloudRegionId": "JANET25",
+ "legacyRegion": "just another region",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "platformName": "xxx1",
+ "lineOfBusiness": "zzz1",
+ "instanceParams": [
+ {}
+ ],
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "modelName": "2017-488_PASQUALE-vPE",
+ "modelVersion": "5.0",
+ "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelUniqueId" : "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ },
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ }
+ },
+ "networks": {
+ "ExtVL 0": {
+ "action": "Create",
+ "rollbackOnFailure": "true",
+ "isMissingData": false,
+ "originalName": "ExtVL 0",
+ "networkStoreKey": "ExtVL 0",
+ "trackById": "s0z58emiprq",
+ "instanceName": "ExtVL",
+ "inMaint":false,
+ "legacyRegion": "lcpRegionText",
+ "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "platformName": "xxx1",
+ "lineOfBusiness": "zzz1",
+ "instanceParams": [
+ {}
+ ],
+ "modelInfo": {
+ "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelCustomizationName": "ExtVL 0",
+ "modelInvariantId": "379f816b-a7aa-422f-be30-17114ff50b7c",
+ "modelUniqueId" : "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelName": "ExtVL",
+ "modelVersion": "37.0",
+ "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
+ },
+ "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
+ }
+ },
+ "vnfGroups":{
+ },
+ "optionalGroupMembersMap": {},
+ "existingVnfGroupCounterMap": {},
+ "instanceParams": [
+ {}
+ ],
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "projectName": "WATKINS",
+ "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+ "owningEntityName": "WayneHolland",
+ "bulkSize": 1,
+ "modelInfo": {
+ "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "modelVersionId": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd",
+ "modelUniqueId": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd",
+ "modelName": "action-data",
+ "modelVersion": "1.0",
+ "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"
+ },
+ "isEcompGeneratedNaming": true,
+ "existingNames": {
+ "serviceinstancename": ""
+ },
+ "instanceName": "serviceInstanceName",
+ "rollbackOnFailure": "true",
+ "isALaCarte": true,
+ "name": "action-data",
+ "version": "1.0",
+ "description": "",
+ "category": "",
+ "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd",
+ "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "serviceType": "",
+ "serviceRole": "",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "tenantName": null,
+ "aicZoneId": "JAG1",
+ "aicZoneName": null,
+ "lcpCloudRegionId": "JANET25",
+ "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
+ "isMultiStepDesign": false
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte.json b/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte.json
new file mode 100644
index 000000000..7fcc9b1eb
--- /dev/null
+++ b/vid-automation/src/test/resources/a-la-carte/redux-a-la-carte.json
@@ -0,0 +1,195 @@
+{
+ "action":"Create",
+ "isDirty":false,
+ "validationCounter":0,
+ "existingVNFCounterMap": {},
+ "existingNetworksCounterMap": {},
+ "vnfs": {
+ "2017-488_PASQUALE-vPE 0": {
+ "action": "Create",
+ "rollbackOnFailure": "true",
+ "vfModules": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
+ "instanceName": "mimazepubi",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "624eb554b0d147c19ff8885341760481",
+ "rollbackOnFailure": "false",
+ "sdncPreLoad": false,
+ "instanceParams": [{}
+ ],
+ "modelInfo": {
+ "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+ "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+ "modelVersion": "5",
+ "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+ "modelUniqueId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+ "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
+ },
+ "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+ "isMissingData": false
+ }
+ },
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
+ "instanceName": "puwesovabe",
+ "volumeGroupName": "puwesovabe_vol",
+ "lcpCloudRegionId": "JANET25",
+ "legacyRegion": "my region",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "rollbackOnFailure": "true",
+ "sdncPreLoad": true,
+ "instanceParams": [{
+ "PASQUALEvpe0_bandwidth": "10",
+ "2017488_PASQUALEvpe0_vnf_instance_name": "mtnj309me6",
+ "2017488_PASQUALEvpe0_vnf_config_template_version": "17.2",
+ "2017488_PASQUALEvpe0_AIC_CLLI": "ATLMY8GA",
+ "PASQUALEvpe0_bandwidth_units": "Gbps"
+ }
+ ],
+ "modelInfo": {
+ "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
+ "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "modelVersion": "6",
+ "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+ "modelUniqueId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ },
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5",
+ "isMissingData": false
+ }
+ },
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2": {
+ "instanceName": "bnmgtrx",
+ "volumeGroupName": "",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "624eb554b0d147c19ff8885341760481",
+ "rollbackOnFailure": "false",
+ "sdncPreLoad": false,
+ "instanceParams": [{}
+ ],
+ "modelInfo": {
+ "modelInvariantId": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
+ "modelVersionId": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2",
+ "modelVersion": "6",
+ "modelCustomizationId": "3cd946bb-50e0-40d8-96d3-c9023520b557",
+ "modelUniqueId": "3cd946bb-50e0-40d8-96d3-c9023520b557",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2",
+ "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a"
+ },
+ "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
+ "isMissingData": false
+ }
+ }
+ },
+ "isMissingData": false,
+ "originalName": "2017-488_PASQUALE-vPE 0",
+ "vnfStoreKey": "2017-488_PASQUALE-vPE 0",
+ "trackById": "s0z58emiprq",
+ "instanceName": "2017-488_PASQUALE-vPE",
+ "inMaint":false,
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "lcpCloudRegionId": "JANET25",
+ "legacyRegion": "just another region",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "platformName": "xxx1",
+ "lineOfBusiness": "zzz1",
+ "instanceParams": [
+ {}
+ ],
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "modelName": "2017-488_PASQUALE-vPE",
+ "modelVersion": "5.0",
+ "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelUniqueId" : "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ },
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ }
+ },
+ "networks": {
+ "ExtVL 0": {
+ "action": "Create",
+ "rollbackOnFailure": "true",
+ "isMissingData": false,
+ "originalName": "ExtVL 0",
+ "networkStoreKey": "ExtVL 0",
+ "trackById": "s0z58emiprq",
+ "instanceName": "ExtVL",
+ "inMaint":false,
+ "legacyRegion": "lcpRegionText",
+ "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "platformName": "xxx1",
+ "lineOfBusiness": "zzz1",
+ "instanceParams": [
+ {}
+ ],
+ "modelInfo": {
+ "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelCustomizationName": "ExtVL 0",
+ "modelInvariantId": "379f816b-a7aa-422f-be30-17114ff50b7c",
+ "modelUniqueId" : "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelName": "ExtVL",
+ "modelVersion": "37.0",
+ "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
+ },
+ "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
+ }
+ },
+ "vnfGroups":{
+ },
+ "optionalGroupMembersMap": {},
+ "existingVnfGroupCounterMap": {},
+ "instanceParams": [
+ {}
+ ],
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "projectName": "WATKINS",
+ "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+ "owningEntityName": "WayneHolland",
+ "bulkSize": 1,
+ "modelInfo": {
+ "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "modelVersionId": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd",
+ "modelUniqueId": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd",
+ "modelName": "action-data",
+ "modelVersion": "1.0",
+ "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"
+ },
+ "isEcompGeneratedNaming": true,
+ "existingNames": {
+ "serviceinstancename": ""
+ },
+ "instanceName": "serviceInstanceName",
+ "rollbackOnFailure": "true",
+ "isALaCarte": true,
+ "name": "action-data",
+ "version": "1.0",
+ "description": "",
+ "category": "",
+ "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd",
+ "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "serviceType": "",
+ "serviceRole": "",
+ "testApi": "GR_API",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "tenantName": null,
+ "aicZoneId": "JAG1",
+ "aicZoneName": null,
+ "lcpCloudRegionId": "JANET25",
+ "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
+ "isMultiStepDesign": false
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/a-la-carte/redux-multiple-vnf-network.json b/vid-automation/src/test/resources/a-la-carte/redux-multiple-vnf-network.json
new file mode 100644
index 000000000..de2fca2ba
--- /dev/null
+++ b/vid-automation/src/test/resources/a-la-carte/redux-multiple-vnf-network.json
@@ -0,0 +1,118 @@
+{
+ "vnfs": {
+ "VF_vGeraldine 0": {
+ "originalName": "VF_vGeraldine 0",
+ "rollbackOnFailure": "true",
+ "instanceName": "VFvGeraldine00001",
+ "isMissingData": false,
+ "modelName": "VF_vGeraldine 0",
+ "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+ "lineOfBusiness": "zzz1",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelName": "VF_vGeraldine",
+ "modelVersion": "2.0",
+ "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9",
+ "modelCustomizationName": "VF_vGeraldine 0"
+ },
+ "legacyRegion": null
+ },
+ "VF_vGeraldine 0:0001": {
+ "originalName": "VF_vGeraldine 0",
+ "instanceName": "VFvGeraldine00001_001",
+ "rollbackOnFailure": "true",
+ "isMissingData": false,
+ "modelName": "VF_vGeraldine 0",
+ "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+ "trackById": "e4wwvf531y8",
+ "lineOfBusiness": "ONAP",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "4160458e-f648-4b30-a176-43881ffffe9e",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelUniqueId" : "91415b44-753d-494c-926a-456a9172bbb9",
+ "modelName": "VF_vGeraldine",
+ "modelVersion": "2.0",
+ "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9",
+ "modelCustomizationName": "VF_vGeraldine 0",
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60"
+ },
+ "legacyRegion": null,
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "instanceParams": [
+ {}
+ ]
+ }
+ },
+ "networks": {
+ "ExtVL 0": {
+ "action": "Create",
+ "rollbackOnFailure": "true",
+ "isMissingData": false,
+ "originalName": "ExtVL 0",
+ "networkStoreKey": "ExtVL 0",
+ "trackById": "8gdsx5jxxj8",
+ "inMaint":false,
+ "instanceName": "ExtVL",
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
+ "platformName": "xxx1",
+ "lineOfBusiness": "zzz1",
+ "instanceParams": [
+ {}
+ ],
+ "modelInfo": {
+ "modelInvariantId": "379f816b-a7aa-422f-be30-17114ff50b7c",
+ "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "modelUniqueId" : "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelName": "ExtVL",
+ "modelVersion": "37.0",
+ "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelCustomizationName": "ExtVL 0",
+ "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
+ },
+ "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
+ }
+ },
+ "validationCounter": 0,
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "lcpCloudRegionId": "hvf6",
+ "testApi": "GR_API",
+ "tenantId": "1178612d2b394be4834ad77f567c0af2",
+ "aicZoneId": "YYY1",
+ "projectName": "yyy1",
+ "owningEntityId": "aaa1",
+ "owningEntityName": "aaa1",
+ "rollbackOnFailure": "true",
+ "isALaCarte": true,
+ "isEcompGeneratedNaming": false,
+ "bulkSize": 1,
+ "modelInfo": {
+ "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+ "modelName": "ComplexService",
+ "modelVersion": "1.0"
+ },
+ "instanceName": "serviceInstanceName",
+ "existingNames": {
+ "serviceinstancename": "",
+ "vfvgeraldine00001": "",
+ "vfvgeraldine00001_001": ""
+ },
+ "existingVNFCounterMap": {
+ "d6557200-ecf2-4641-8094-5393ae3aae60": 1,
+ "undefined": 1
+ },
+ "existingNetworksCounterMap": {},
+ "tenantName": "AIN Web Tool-15-D-SSPtestcustome",
+ "aicZoneName": "UUUAIAAI-YYY1"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json
new file mode 100644
index 000000000..a95573558
--- /dev/null
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json
@@ -0,0 +1,274 @@
+{
+ "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"
+ },
+ "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": null,
+ "legacyRegion": null,
+ "tenantId": null,
+ "lineOfBusiness": null,
+ "platformName": null,
+ "vfModules": {},
+ "networks": {
+ "NETWORK1_INSTANCE_ID": {
+ "originalName": null,
+ "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",
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "tenantId": null,
+ "lineOfBusiness": null,
+ "platformName": null
+ },
+ "NETWORK2_INSTANCE_ID": {
+ "originalName": null,
+ "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",
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "tenantId": null,
+ "lineOfBusiness": null,
+ "platformName": null
+ }
+ }
+ },
+ "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": null,
+ "legacyRegion": null,
+ "tenantId": null,
+ "lineOfBusiness": null,
+ "platformName": null,
+ "vfModules": {
+ "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+ "2c1ca484-cbc2-408b-ab86-25a2c15ce280": {
+ "originalName": "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",
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "tenantId": null,
+ "lineOfBusiness": null,
+ "platformName": null
+ },
+ "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",
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "tenantId": null,
+ "lineOfBusiness": null,
+ "platformName": null
+ }
+ },
+ "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": {
+ "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
diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json
new file mode 100644
index 000000000..0fbf83070
--- /dev/null
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json
@@ -0,0 +1,392 @@
+{
+ "service": {
+ "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+ "invariantUuid": "d27e42cf-087e-4d31-88ac-6c4b7585f800",
+ "name": "ComplexService",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Emanuel",
+ "serviceType": "",
+ "serviceRole": "",
+ "description": "ComplexService",
+ "serviceEcompNaming": "true",
+ "instantiationType": "Macro",
+ "inputs": {},
+ "vidNotions": {
+ "instantiationUI": "legacy",
+ "modelCategory": "other",
+ "viewEditUI": "legacy"
+ }
+ },
+ "vnfs": {
+ "VF_vGeraldine 0": {
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
+ "description": "VSP_vGeraldine",
+ "name": "VF_vGeraldine",
+ "version": "2.0",
+ "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "gpb2_Internal2_mac": "00:11:22:EF:AC:DF",
+ "sctp-b-ipv6-egress_src_start_port": "0",
+ "sctp-a-ipv6-egress_rule_application": "any",
+ "Internal2_allow_transit": "true",
+ "sctp-b-IPv6_ethertype": "IPv6",
+ "sctp-a-egress_rule_application": "any",
+ "sctp-b-ingress_action": "pass",
+ "sctp-b-ingress_rule_protocol": "icmp",
+ "ncb2_Internal1_mac": "00:11:22:EF:AC:DF",
+ "sctp-b-ipv6-ingress-src_start_port": "0.0",
+ "ncb1_Internal2_mac": "00:11:22:EF:AC:DF",
+ "fsb_volume_size_0": "320.0",
+ "sctp-b-egress_src_addresses": "local",
+ "sctp-a-ipv6-ingress_ethertype": "IPv4",
+ "sctp-a-ipv6-ingress-dst_start_port": "0",
+ "sctp-b-ipv6-ingress_rule_application": "any",
+ "domain_name": "default-domain",
+ "sctp-a-ingress_rule_protocol": "icmp",
+ "sctp-b-egress-src_start_port": "0.0",
+ "sctp-a-egress_src_addresses": "local",
+ "sctp-b-display_name": "epc-sctp-b-ipv4v6-sec-group",
+ "sctp-a-egress-src_start_port": "0.0",
+ "sctp-a-ingress_ethertype": "IPv4",
+ "sctp-b-ipv6-ingress-dst_end_port": "65535",
+ "sctp-b-dst_subnet_prefix_v6": "::",
+ "nf_naming": "{ecomp_generated_naming=true}",
+ "sctp-a-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
+ "sctp-b-egress-dst_start_port": "0.0",
+ "ncb_flavor_name": "nv.c20r64d1",
+ "gpb1_Internal1_mac": "00:11:22:EF:AC:DF",
+ "sctp-b-egress_dst_subnet_prefix_len": "0.0",
+ "Internal2_net_cidr": "10.0.0.10",
+ "sctp-a-ingress-dst_start_port": "0.0",
+ "sctp-a-egress-dst_start_port": "0.0",
+ "fsb1_Internal2_mac": "00:11:22:EF:AC:DF",
+ "sctp-a-egress_ethertype": "IPv4",
+ "vlc_st_service_mode": "in-network-nat",
+ "sctp-a-ipv6-egress_ethertype": "IPv4",
+ "sctp-a-egress-src_end_port": "65535.0",
+ "sctp-b-ipv6-egress_rule_application": "any",
+ "sctp-b-egress_action": "pass",
+ "sctp-a-ingress-src_subnet_prefix_len": "0.0",
+ "sctp-b-ipv6-ingress-src_end_port": "65535.0",
+ "sctp-b-name": "epc-sctp-b-ipv4v6-sec-group",
+ "fsb2_Internal1_mac": "00:11:22:EF:AC:DF",
+ "sctp-a-ipv6-ingress-src_start_port": "0.0",
+ "sctp-b-ipv6-egress_ethertype": "IPv4",
+ "Internal1_net_cidr": "10.0.0.10",
+ "sctp-a-egress_dst_subnet_prefix": "0.0.0.0",
+ "fsb_flavor_name": "nv.c20r64d1",
+ "sctp_rule_protocol": "132",
+ "sctp-b-ipv6-ingress_src_subnet_prefix_len": "0",
+ "sctp-a-ipv6-ingress_rule_application": "any",
+ "ecomp_generated_naming": "true",
+ "sctp-a-IPv6_ethertype": "IPv6",
+ "vlc2_Internal1_mac": "00:11:22:EF:AC:DF",
+ "vlc_st_virtualization_type": "virtual-machine",
+ "sctp-b-ingress-dst_start_port": "0.0",
+ "sctp-b-ingress-dst_end_port": "65535.0",
+ "sctp-a-ipv6-ingress-src_end_port": "65535.0",
+ "sctp-a-display_name": "epc-sctp-a-ipv4v6-sec-group",
+ "sctp-b-ingress_rule_application": "any",
+ "int2_sec_group_name": "int2-sec-group",
+ "vlc_flavor_name": "nd.c16r64d1",
+ "sctp-b-ipv6-egress_src_addresses": "local",
+ "vlc_st_interface_type_int1": "other1",
+ "sctp-b-egress-src_end_port": "65535.0",
+ "sctp-a-ipv6-egress-dst_start_port": "0",
+ "vlc_st_interface_type_int2": "other2",
+ "sctp-a-ipv6-egress_rule_protocol": "any",
+ "Internal2_shared": "false",
+ "sctp-a-ipv6-egress_dst_subnet_prefix_len": "0",
+ "Internal2_rpf": "disable",
+ "vlc1_Internal1_mac": "00:11:22:EF:AC:DF",
+ "sctp-b-ipv6-egress_src_end_port": "65535",
+ "sctp-a-ipv6-egress_src_addresses": "local",
+ "sctp-a-ingress-dst_end_port": "65535.0",
+ "sctp-a-ipv6-egress_src_end_port": "65535",
+ "Internal1_forwarding_mode": "l2",
+ "Internal2_dhcp": "false",
+ "sctp-a-dst_subnet_prefix_v6": "::",
+ "pxe_image_name": "MME_PXE-Boot_16ACP04_GA.qcow2",
+ "vlc_st_interface_type_gtp": "other0",
+ "ncb1_Internal1_mac": "00:11:22:EF:AC:DF",
+ "sctp-b-src_subnet_prefix_v6": "::",
+ "sctp-a-egress_dst_subnet_prefix_len": "0.0",
+ "int1_sec_group_name": "int1-sec-group",
+ "Internal1_dhcp": "false",
+ "sctp-a-ipv6-egress_dst_end_port": "65535",
+ "Internal2_forwarding_mode": "l2",
+ "fsb2_Internal2_mac": "00:11:22:EF:AC:DF",
+ "sctp-b-egress_dst_subnet_prefix": "0.0.0.0",
+ "Internal1_net_cidr_len": "17",
+ "gpb2_Internal1_mac": "00:11:22:EF:AC:DF",
+ "sctp-b-ingress-src_subnet_prefix_len": "0.0",
+ "sctp-a-ingress_dst_addresses": "local",
+ "sctp-a-egress_action": "pass",
+ "fsb_volume_type_0": "SF-Default-SSD",
+ "ncb2_Internal2_mac": "00:11:22:EF:AC:DF",
+ "vlc_st_interface_type_sctp_a": "left",
+ "vlc_st_interface_type_sctp_b": "right",
+ "sctp-a-src_subnet_prefix_v6": "::",
+ "vlc_st_version": "2",
+ "sctp-b-egress_ethertype": "IPv4",
+ "sctp-a-ingress_rule_application": "any",
+ "gpb1_Internal2_mac": "00:11:22:EF:AC:DF",
+ "instance_ip_family_v6": "v6",
+ "sctp-a-ipv6-egress_src_start_port": "0",
+ "sctp-b-ingress-src_start_port": "0.0",
+ "sctp-b-ingress_dst_addresses": "local",
+ "fsb1_Internal1_mac": "00:11:22:EF:AC:DF",
+ "vlc_st_interface_type_oam": "management",
+ "multi_stage_design": "false",
+ "oam_sec_group_name": "oam-sec-group",
+ "Internal2_net_gateway": "10.0.0.10",
+ "sctp-a-ipv6-ingress-dst_end_port": "65535",
+ "sctp-b-ipv6-egress-dst_start_port": "0",
+ "Internal1_net_gateway": "10.0.0.10",
+ "sctp-b-ipv6-egress_rule_protocol": "any",
+ "gtp_sec_group_name": "gtp-sec-group",
+ "sctp-a-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
+ "sctp-b-ipv6-egress_dst_subnet_prefix_len": "0",
+ "sctp-a-ipv6-ingress_dst_addresses": "local",
+ "sctp-a-egress_rule_protocol": "icmp",
+ "sctp-b-ipv6-egress_action": "pass",
+ "sctp-a-ipv6-egress_action": "pass",
+ "Internal1_shared": "false",
+ "sctp-b-ipv6-ingress_rule_protocol": "any",
+ "Internal2_net_cidr_len": "17",
+ "sctp-a-name": "epc-sctp-a-ipv4v6-sec-group",
+ "sctp-a-ingress-src_end_port": "65535.0",
+ "sctp-b-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
+ "sctp-a-egress-dst_end_port": "65535.0",
+ "sctp-a-ingress_action": "pass",
+ "sctp-b-egress_rule_protocol": "icmp",
+ "sctp-b-ipv6-ingress_action": "pass",
+ "vlc_st_service_type": "firewall",
+ "sctp-b-ipv6-egress_dst_end_port": "65535",
+ "sctp-b-ipv6-ingress-dst_start_port": "0",
+ "vlc2_Internal2_mac": "00:11:22:EF:AC:DF",
+ "vlc_st_availability_zone": "true",
+ "fsb_volume_image_name_1": "MME_FSB2_16ACP04_GA.qcow2",
+ "sctp-b-ingress-src_subnet_prefix": "0.0.0.0",
+ "sctp-a-ipv6-ingress_src_subnet_prefix_len": "0",
+ "Internal1_allow_transit": "true",
+ "gpb_flavor_name": "nv.c20r64d1",
+ "availability_zone_max_count": "1",
+ "fsb_volume_image_name_0": "MME_FSB1_16ACP04_GA.qcow2",
+ "sctp-b-ipv6-ingress_dst_addresses": "local",
+ "sctp-b-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
+ "sctp-b-ipv6-ingress_ethertype": "IPv4",
+ "vlc1_Internal2_mac": "00:11:22:EF:AC:DF",
+ "sctp-a-ingress-src_subnet_prefix": "0.0.0.0",
+ "sctp-a-ipv6-ingress_action": "pass",
+ "Internal1_rpf": "disable",
+ "sctp-b-ingress_ethertype": "IPv4",
+ "sctp-b-egress_rule_application": "any",
+ "sctp-b-ingress-src_end_port": "65535.0",
+ "sctp-a-ipv6-ingress_rule_protocol": "any",
+ "sctp-a-ingress-src_start_port": "0.0",
+ "sctp-b-egress-dst_end_port": "65535.0"
+ },
+ "type": "VF",
+ "modelCustomizationName": "VF_vGeraldine 0",
+ "vfModules": {
+ "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+ "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+ "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
+ "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
+ "description": null,
+ "name": "VfVgeraldine..vflorence_vlc..module-1",
+ "version": "2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "vflorence_vlc",
+ "baseModule": false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
+ "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
+ "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
+ "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
+ "description": null,
+ "name": "VfVgeraldine..vflorence_gpb..module-2",
+ "version": "2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "vflorence_gpb",
+ "baseModule": false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+ "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+ "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+ "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+ "description": null,
+ "name": "VfVgeraldine..base_vflorence..module-0",
+ "version": "2",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": "base_vflorence",
+ "baseModule": true
+ },
+ "inputs": {},
+ "volumeGroupAllowed": true
+ }
+ },
+ "volumeGroups": {
+ "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+ "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+ "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+ "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+ "description": null,
+ "name": "VfVgeraldine..base_vflorence..module-0",
+ "version": "2",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": "base_vflorence",
+ "baseModule": true
+ },
+ "inputs": {}
+ }
+ },
+ "vfcInstanceGroups": {}
+ }
+ },
+ "networks": {
+ "ExtVL 0": {
+ "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c",
+ "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks",
+ "name": "ExtVL",
+ "version": "37.0",
+ "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "network_role" : "network role 1, network role 2",
+ "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
+ "exVL_naming": "{ecomp_generated_naming=true}",
+ "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+ "network_homing": "{ecomp_selected_instance_node_target=false}"
+ },
+ "type": "VL",
+ "modelCustomizationName": "ExtVL 0"
+ }
+ },
+ "collectionResource": {},
+ "configurations": {
+ "Port Mirroring Configuration By Policy 0": {
+ "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
+ "invariantUuid": "6ef0ca40-f366-4897-951f-abd65d25f6f7",
+ "description": "A port mirroring configuration by policy object",
+ "name": "Port Mirroring Configuration By Policy",
+ "version": "27.0",
+ "customizationUuid": "3c3b7b8d-8669-4b3b-8664-61970041fad2",
+ "inputs": {},
+ "commands": {},
+ "properties": {},
+ "type": "Configuration",
+ "modelCustomizationName": "Port Mirroring Configuration By Policy 0",
+ "sourceNodes": [],
+ "collectorNodes": null,
+ "configurationByPolicy": false
+ }
+ },
+ "fabricConfigurations": {},
+ "serviceProxies": {},
+ "vfModules": {
+ "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+ "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+ "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
+ "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
+ "description": null,
+ "name": "VfVgeraldine..vflorence_vlc..module-1",
+ "version": "2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "vflorence_vlc",
+ "baseModule": false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
+ "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
+ "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
+ "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
+ "description": null,
+ "name": "VfVgeraldine..vflorence_gpb..module-2",
+ "version": "2",
+ "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "vflorence_gpb",
+ "baseModule": false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+ "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+ "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+ "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+ "description": null,
+ "name": "VfVgeraldine..base_vflorence..module-0",
+ "version": "2",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": "base_vflorence",
+ "baseModule": true
+ },
+ "inputs": {},
+ "volumeGroupAllowed": true
+ }
+ },
+ "volumeGroups": {
+ "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+ "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+ "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+ "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+ "description": null,
+ "name": "VfVgeraldine..base_vflorence..module-0",
+ "version": "2",
+ "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": "base_vflorence",
+ "baseModule": true
+ },
+ "inputs": {}
+ }
+ },
+ "pnfs": {}
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json
new file mode 100644
index 000000000..b2ba2c7e9
--- /dev/null
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json
@@ -0,0 +1,263 @@
+{
+ "networks": {
+ "ExtVL 0": {
+ "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c",
+ "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks",
+ "name": "ExtVL",
+ "version": "37.0",
+ "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "inputs": {},
+ "commands": {},
+ "modelInfo": {
+ "modelVersionId": "12345-5858-6565",
+ "modelName": "modelForNetwork"
+ },
+ "properties": {
+ "min_instances": 1,
+ "max_instances": 10,
+ "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
+ "exVL_naming": "{ecomp_generated_naming=true}",
+ "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+ "network_homing": "{ecomp_selected_instance_node_target=false}"
+ },
+ "type": "VL",
+ "instanceName" : "NetInstance",
+ "modelCustomizationName": "ExtVL 0",
+ "isFailed": true
+ }
+ },
+ "vnfs": {
+ "2017-388_PASQUALE-vPE 0": {
+ "vfModules": {},
+ "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "lineOfBusiness": "ONAP",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168",
+ "modelName": "2017-388_PASQUALE-vPE",
+ "modelVersion": "4.0",
+ "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
+ "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
+ "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168"
+ },
+ "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName",
+ "action": "None",
+ "legacyRegion": "some legacy region"
+ },
+ "2017-488_PASQUALE-vPE 0": {
+ "vfModules": {
+ "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",
+ "modelVersion": "5",
+ "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+ "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",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86"
+ }
+ },
+ "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",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "modelInfo": {
+ "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
+ "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "modelVersion": "6",
+ "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ },
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ }
+ }
+ },
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "lineOfBusiness": "ONAP",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "modelName": "2017-488_PASQUALE-vPE",
+ "modelVersion": "5.0",
+ "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ },
+ "orchStatus": "Created",
+ "inMaint": false,
+ "instanceName": "2017488_PASQUALEvPEVNFinstancename",
+ "action": "None",
+ "legacyRegion": "some legacy region"
+ },
+ "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": {
+ "instanceName": "VFinstancenameZERO_001",
+ "action": "None",
+ "provStatus": "Prov Status",
+ "inMaint": true,
+ "modelInfo": {
+ "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+ "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+ "modelVersion": "5",
+ "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+ "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": {
+ "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",
+ "modelVersion": "6",
+ "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ },
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ }
+ }
+ },
+
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "lineOfBusiness": "ONAP",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "modelName": "2017-488_PASQUALE-vPE",
+ "modelVersion": "5.0",
+ "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ },
+ "instanceName": "2017488_PASQUALEvPEVNFinstancename_001",
+ "action": "None",
+ "legacyRegion": "some legacy region"
+ },
+ "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": {
+ "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",
+ "modelVersion": "5",
+ "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+ "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": {
+ "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",
+ "modelVersion": "6",
+ "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ },
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ }
+ }
+ },
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "lineOfBusiness": "ONAP",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "modelName": "2017-488_PASQUALE-vPE",
+ "modelVersion": "5.0",
+ "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ },
+ "instanceName": "2017488_PASQUALEvPEVNFinstancename_002",
+ "action": "None",
+ "legacyRegion": "some legacy region"
+ }
+ },
+ "validationCounter": 0,
+ "existingVNFCounterMap": {
+ "afacccf6-397d-45d6-b5ae-94c39734b168": 1,
+ "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3
+ },
+ "existingNetworksCounterMap": {},
+ "instanceName": "mCaNkinstancename",
+ "action": "None",
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+ "aicZoneId": "NFT1",
+ "projectName": "WATKINS",
+ "rollbackOnFailure": "true",
+ "aicZoneName": "NFTJSSSS-NFT1",
+ "owningEntityName": "WayneHolland",
+ "tenantName": "AIN Web Tool-15-D-testalexandria",
+ "modelInfo": {
+ "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450",
+ "modelName": "action-data",
+ "modelVersion": "1.0",
+ "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450"
+ },
+ "isALaCarte": false,
+ "orchStatus": "Active",
+ "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json
new file mode 100644
index 000000000..ccf095294
--- /dev/null
+++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json
@@ -0,0 +1,62 @@
+{
+ "modelInfo": {
+ "modelInvariantId": "0367689e-d41e-483f-b200-eab17e4a7f8d",
+ "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705",
+ "modelName": "gayawabawe",
+ "modelType": "service",
+ "modelVersion": "5.1"
+ },
+ "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489",
+ "owningEntityName": "Lucine Sarika",
+ "projectName": "zasaki",
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriberName": "SILVIA ROBBINS",
+ "productFamilyId": "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3",
+ "instanceName": "SERVICE_NAME",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "lcpCloudRegionId": "a93f8383-707e-43fa-8191-a6e69a1aab17",
+ "tenantId": "c85f0e80-0636-44a4-8cb2-4ec00d056e79",
+ "tenantName": "Hedvika Wendelin",
+ "aicZoneId": "de738e5f-3704-4a14-b98f-3bf86ac0c0a0",
+ "aicZoneName": "voloyakane-senamo",
+ "vnfs": {
+ "vSAMP12 1": {
+ "modelInfo": {
+ "modelCustomizationName": "vSAMP12 1",
+ "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",
+ "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe042c22-ba82-43c6-b2f6-8f1fc4164091",
+ "modelName": "vSAMP12",
+ "modelType": "vnf",
+ "modelVersion": "1.0"
+ },
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "instanceName": "SERVICE_NAME_vnf",
+ "action": "Create",
+ "platformName": "vnf_platformName",
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "instanceParams": [],
+ "rollbackOnFailure": false,
+ "instanceId": null,
+ "vfModules": {},
+ "trackById": "TRACK_BY_ID",
+ "isFailed": true,
+ "statusMessage":"Vnf failed.",
+ "lineOfBusiness": "vnf_lineOfBusinessName"
+ }
+ },
+ "networks": {},
+ "vnfGroups": {},
+ "instanceParams": [],
+ "pause": false,
+ "bulkSize": 1,
+ "rollbackOnFailure": false,
+ "isALaCarte": true,
+ "testApi": "VNF_API",
+ "instanceId": "INSTANCE_ID",
+ "action": "None",
+ "trackById": "TRACK_BY_ID",
+ "isFailed": false,
+ "statusMessage": null
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json
new file mode 100644
index 000000000..d1c40594b
--- /dev/null
+++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json
@@ -0,0 +1,67 @@
+{
+ "action": "Create",
+ "aicZoneId": "de738e5f-3704-4a14-b98f-3bf86ac0c0a0",
+ "aicZoneName": "voloyakane-senamo",
+ "bulkSize": 1,
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "instanceId": null,
+ "instanceName": "INSTANCE_NAME",
+ "instanceParams": [
+ ],
+ "isALaCarte": true,
+ "isFailed": true,
+ "lcpCloudRegionId": "a93f8383-707e-43fa-8191-a6e69a1aab17",
+ "modelInfo": {
+ "modelInvariantId": "0367689e-d41e-483f-b200-eab17e4a7f8d",
+ "modelName": "gayawabawe",
+ "modelType": "service",
+ "modelVersion": "5.1",
+ "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705"
+ },
+ "networks": {
+ },
+ "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489",
+ "owningEntityName": "Lucine Sarika",
+ "pause": false,
+ "productFamilyId": "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3",
+ "projectName": "zasaki",
+ "rollbackOnFailure": false,
+ "statusMessage": "The service instantiation is failed.",
+ "subscriberName": "SILVIA ROBBINS",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "tenantId": "c85f0e80-0636-44a4-8cb2-4ec00d056e79",
+ "tenantName": "Hedvika Wendelin",
+ "testApi": "VNF_API",
+ "trackById": "TRACK_BY_ID",
+ "vnfGroups": {
+ },
+ "vnfs": {
+ "vSAMP12 1": {
+ "action": "Create",
+ "instanceId": null,
+ "instanceName": "VNF_NAME",
+ "instanceParams": [
+ ],
+ "isFailed": false,
+ "lcpCloudRegionId": "mdt1",
+ "lineOfBusiness": "vnf_lineOfBusinessName",
+ "modelInfo": {
+ "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7",
+ "modelCustomizationName": "vSAMP12 1",
+ "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+ "modelName": "vSAMP12",
+ "modelType": "vnf",
+ "modelVersion": "1.0",
+ "modelVersionId": "fe042c22-ba82-43c6-b2f6-8f1fc4164091"
+ },
+ "platformName": "vnf_platformName",
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "rollbackOnFailure": false,
+ "statusMessage": null,
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e",
+ "trackById": "TRACK_BY_ID",
+ "vfModules": {
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/asyncInstantiation/auditModalFailedServiceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/auditModalFailedServiceInstance.json
new file mode 100644
index 000000000..c5593ea1a
--- /dev/null
+++ b/vid-automation/src/test/resources/asyncInstantiation/auditModalFailedServiceInstance.json
@@ -0,0 +1,12 @@
+{
+ "id":null,
+ "jobId":null,
+ "instanceName":"1INSTANCE_NAME",
+ "instanceType":null,
+ "jobStatus":"FAILED",
+ "source":null,
+ "requestId":"e5f93320-cce6-424d-adc6-259a4ee8b342",
+ "additionalInfo":"The service instantiation is failed. Please check vconfiiiiiiiguratttttion again.",
+ "final":false,
+ "createdDate":1549198388000
+}
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json
new file mode 100644
index 000000000..71ba53661
--- /dev/null
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarte.json
@@ -0,0 +1,26 @@
+{
+ "modelInfo": {
+ "modelInvariantId": "0367689e-d41e-483f-b200-eab17e4a7f8d",
+ "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705",
+ "modelName": "gayawabawe",
+ "modelVersion": "5.1"
+ },
+ "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489",
+ "owningEntityName": "Lucine Sarika",
+ "projectName" : "zasaki",
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriberName": "SILVIA ROBBINS",
+ "productFamilyId" : "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3",
+ "instanceName" : "SERVICE_NAME",
+ "subscriptionServiceType" : "TYLER SILVIA",
+ "aicZoneId" : "de738e5f-3704-4a14-b98f-3bf86ac0c0a0",
+ "aicZoneName" : "voloyakane-senamo",
+ "lcpCloudRegionId" : "a93f8383-707e-43fa-8191-a6e69a1aab17",
+ "lcpCloudRegionName" : "Cyrus Graciano",
+ "tenantId" : "c85f0e80-0636-44a4-8cb2-4ec00d056e79",
+ "tenantName" : "Hedvika Wendelin",
+ "bulkSize": "1",
+ "testApi": "VNF_API",
+ "isALaCarte": true
+}
+
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json
new file mode 100644
index 000000000..430675256
--- /dev/null
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateALaCarteWithVnfGroup.json
@@ -0,0 +1,44 @@
+{
+ "modelInfo": {
+ "modelInvariantId": "0367689e-d41e-483f-b200-eab17e4a7f8d",
+ "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705",
+ "modelName": "gayawabawe",
+ "modelVersion": "5.1"
+ },
+ "vnfGroups":
+ {
+ "MSOTEST103a":{
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe042c22-ba82-43c6-b2f6-8f1fc4164091",
+ "modelName": "vSAMP12",
+ "modelVersion": "1.0",
+ "modelCustomizationName": "vSAMP12 1",
+ "modelCustomizationId": "a7f1d08e-b02d-11e6-80f5-76304dec7eb7"
+ },
+ "instanceName": "VNF_GROUP_NAME",
+ "isUserProvidedNaming": true,
+ "rollbackOnFailure": false
+ }
+ },
+ "owningEntityId" : "038d99af-0427-42c2-9d15-971b99b9b489",
+ "owningEntityName": "Lucine Sarika",
+ "projectName" : "zasaki",
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriberName": "SILVIA ROBBINS",
+ "productFamilyId" : "ddf9cc0f-6331-4d35-bed0-a37f2d5e9cb3",
+ "instanceName" : "SERVICE_NAME",
+ "isUserProvidedNaming":"true",
+ "subscriptionServiceType" : "TYLER SILVIA",
+ "aicZoneId" : "de738e5f-3704-4a14-b98f-3bf86ac0c0a0",
+ "aicZoneName" : "voloyakane-senamo",
+ "lcpCloudRegionId" : "a93f8383-707e-43fa-8191-a6e69a1aab17",
+ "lcpCloudRegionName" : "Cyrus Graciano",
+ "tenantId" : "c85f0e80-0636-44a4-8cb2-4ec00d056e79",
+ "tenantName" : "Hedvika Wendelin",
+ "bulkSize": "1",
+ "testApi": "VNF_API",
+ "isALaCarte": true
+}
+
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateBulkOfMacro.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateBulkOfMacro.json
index 0ceaeeb3e..22bc229c0 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateBulkOfMacro.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestCreateBulkOfMacro.json
@@ -12,9 +12,8 @@
"subscriberName": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
"productFamilyId" : "myProductFamilyId",
"instanceName" : "SERVICE_NAME",
- "isUserProvidedNaming":"true",
"subscriptionServiceType" : "mySubType",
- "lcpCloudRegionId" : "mtn3",
+ "lcpCloudRegionId" : "hvf3",
"tenantId" : "greatTenant",
"tenantName" : "greatTenant",
"aicZoneId" : "NFT1",
@@ -32,7 +31,6 @@
},
"productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
"instanceName": "VNF_NAME",
- "isUserProvidedNaming":"true",
"platformName": "platformName",
"lineOfBusinessName": "lineOfBusinessName",
"lcpCloudRegionId": "mdt1",
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json
new file mode 100644
index 000000000..eeda4e59a
--- /dev/null
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json
@@ -0,0 +1,117 @@
+{
+ "action":"None",
+ "isDirty":true,
+ "vnfs":{
+
+ },
+ "instanceParams":[
+ {
+ "2017488_PASQUALEvpe0_ASN":"AV_vPE"
+ }
+ ],
+ "validationCounter":0,
+ "existingNames":{
+ "123":"",
+ "instancename":"",
+ "yoav":""
+ },
+ "existingVNFCounterMap":{
+
+ },
+ "existingVnfGroupCounterMap":{
+
+ },
+ "existingNetworksCounterMap":{
+ "94fdd893-4a36-4d70-b16a-ec29c54c184f":1
+ },
+ "networks":{
+ "ExtVL 0":{
+ "rollbackOnFailure":"false",
+ "productFamilyId":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
+ "lcpCloudRegionId":"hvf6",
+ "tenantId":"229bcdc6eaeb4ca59d55221141d01f8e",
+ "lineOfBusiness":"zzz1",
+ "platformName":"platform",
+ "originalName":"ExtVL 0",
+ "modelInfo":{
+ "modelInvariantId":"379f816b-a7aa-422f-be30-17114ff50b7c",
+ "modelVersionId":"ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "modelName":"ExtVL",
+ "modelVersion":"37.0",
+ "modelType":"network",
+ "modelCustomizationId":"94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelCustomizationName":"ExtVL 0"
+ },
+ "instanceName":"ExtVL 0",
+ "instanceId":"NETWORK_INSTANCE_ID",
+ "action":"None_Delete"
+ },
+ "ExtVL 0_1":{
+ "action":"Create",
+ "inMaint":false,
+ "rollbackOnFailure":"true",
+ "originalName":"ExtVL 0",
+ "isMissingData":false,
+ "trackById":"r21vcx0szoc",
+ "networkStoreKey":"ExtVL 0_1",
+ "instanceName":"ExtVL",
+ "productFamilyId":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "lcpCloudRegionId":"hvf6",
+ "tenantId":"229bcdc6eaeb4ca59d55221141d01f8e",
+ "platformName":"xxx1",
+ "lineOfBusiness":"zzz1",
+ "instanceParams":[
+ {
+
+ }
+ ],
+ "modelInfo":{
+ "modelInvariantId":"379f816b-a7aa-422f-be30-17114ff50b7c",
+ "modelVersionId":"ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "modelName":"ExtVL",
+ "modelVersion":"37.0",
+ "modelCustomizationId":"94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelCustomizationName":"ExtVL 0",
+ "uuid":"ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "modelUniqueId":"94fdd893-4a36-4d70-b16a-ec29c54c184f"
+ },
+ "uuid":"ddc3f20c-08b5-40fd-af72-c6d14636b986"
+ }
+ },
+ "vnfGroups":{
+
+ },
+ "bulkSize":1,
+ "instanceName":"InstanceName",
+ "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType":"TYLER SILVIA",
+ "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+ "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77",
+ "lcpCloudRegionId":"JANET25",
+ "tenantId":"092eb9e8e4b7412e8787dd091bc58e86",
+ "aicZoneId":"JAG1",
+ "projectName":"WATKINS",
+ "rollbackOnFailure":true,
+ "aicZoneName":"YUDFJULP-JAG1",
+ "owningEntityName":"WayneHolland",
+ "testApi":"GR_API",
+ "tenantName":"USP-SIP-IC-24335-T-01",
+ "modelInfo":{
+ "modelInvariantId":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "modelVersionId":"6b528779-44a3-4472-bdff-9cd15ec93450",
+ "modelName":"action-data",
+ "modelVersion":"1.0",
+ "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450"
+ },
+ "isALaCarte":true,
+ "name":"action-data",
+ "version":"1.0",
+ "description":"",
+ "category":"",
+ "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450",
+ "invariantUuid":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "serviceType":"",
+ "serviceRole":"",
+ "isMultiStepDesign":false,
+ "instanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
new file mode 100644
index 000000000..3ee4a2b20
--- /dev/null
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
@@ -0,0 +1,286 @@
+{
+ "action": "None",
+ "isDirty": true,
+ "vnfs": {
+ "2017-388_PASQUALE-vPE 0": {
+ "vfModules": {},
+ "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "lineOfBusiness": "ONAP",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168",
+ "modelName": "2017-388_PASQUALE-vPE",
+ "modelVersion": "4.0",
+ "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
+ "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
+ "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168"
+ },
+ "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName",
+ "action": "None",
+ "legacyRegion": "some legacy region"
+ },
+ "2017-488_PASQUALE-vPE 0": {
+ "vfModules": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
+ "instanceId": "VF_MODULE_BASE_INSTANCE_ID",
+ "instanceName": "VFinstancenameZERO",
+ "action": "None_Delete",
+ "modelInfo": {
+ "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+ "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+ "modelVersion": "5",
+ "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+ "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",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86"
+ }
+ },
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
+ "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": {
+ "instanceId": "VF_MODULE_INSTANCE_ID",
+ "instanceName": "VFinstancename",
+ "action": "None_Delete",
+ "volumeGroupName": "VFinstancename_vol_abc",
+ "orchStatus": "Create",
+ "provStatus": "Prov Status",
+ "inMaint": false,
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "modelInfo": {
+ "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
+ "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "modelVersion": "6",
+ "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ },
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ }
+ }
+ },
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "lineOfBusiness": "ONAP",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "modelName": "2017-488_PASQUALE-vPE",
+ "modelVersion": "5.0",
+ "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ },
+ "orchStatus": "Created",
+ "inMaint": false,
+ "instanceId": "VNF_INSTANCE_ID",
+ "instanceName": "2017488_PASQUALEvPEVNFinstancename",
+ "action": "None_Delete",
+ "legacyRegion": "some legacy region"
+ },
+ "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": {
+ "instanceName": "VFinstancenameZERO_001",
+ "action": "None",
+ "provStatus": "Prov Status",
+ "inMaint": true,
+ "modelInfo": {
+ "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+ "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+ "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+ "modelVersion": "5",
+ "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+ "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": {
+ "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",
+ "modelVersion": "6",
+ "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ },
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ }
+ }
+ },
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "lineOfBusiness": "ONAP",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "modelName": "2017-488_PASQUALE-vPE",
+ "modelVersion": "5.0",
+ "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ },
+ "instanceName": "2017488_PASQUALEvPEVNFinstancename_001",
+ "action": "None",
+ "legacyRegion": "some legacy region"
+ },
+ "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": {
+ "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",
+ "modelVersion": "5",
+ "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+ "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": {
+ "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",
+ "modelVersion": "6",
+ "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+ "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ },
+ "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+ }
+ }
+ },
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "lineOfBusiness": "ONAP",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "modelName": "2017-488_PASQUALE-vPE",
+ "modelVersion": "5.0",
+ "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ },
+ "instanceName": "2017488_PASQUALEvPEVNFinstancename_002",
+ "action": "None",
+ "legacyRegion": "some legacy region"
+ },
+ "2017-388_PASQUALE-vPE 0_1": {
+ "action": "Create",
+ "inMaint": false,
+ "rollbackOnFailure": "true",
+ "originalName": "2017-388_PASQUALE-vPE 0",
+ "isMissingData": false,
+ "trackById": "wk10c4hh1oj",
+ "vfModules": {},
+ "vnfStoreKey": "2017-388_PASQUALE-vPE 0_1",
+ "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName",
+ "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
+ "platformName": "xxx1",
+ "lineOfBusiness": "zzz1",
+ "instanceParams": [
+ {
+ "vnf_config_template_version": "17.2",
+ "bandwidth_units": "Gbps",
+ "bandwidth": "10",
+ "AIC_CLLI": "ATLMY8GA",
+ "ASN": "AV_vPE",
+ "vnf_instance_name": "mtnj309me6"
+ }
+ ],
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168",
+ "modelName": "2017-388_PASQUALE-vPE",
+ "modelVersion": "4.0",
+ "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
+ "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
+ "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
+ "modelUniqueId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c"
+ },
+ "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168"
+ }
+ },
+ "instanceParams": [],
+ "validationCounter": 0,
+ "existingNames": {
+ "mcankinstancename": ""
+ },
+ "existingVNFCounterMap": {
+ "afacccf6-397d-45d6-b5ae-94c39734b168": 1,
+ "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3,
+ "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1
+ },
+ "existingVnfGroupCounterMap": {},
+ "existingNetworksCounterMap": {},
+ "networks": {},
+ "vnfGroups": {},
+ "bulkSize": 1,
+ "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
+ "instanceName": "mCaNkinstancename",
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+ "aicZoneId": "NFT1",
+ "projectName": "WATKINS",
+ "rollbackOnFailure": true,
+ "aicZoneName": "NFTJSSSS-NFT1",
+ "owningEntityName": "WayneHolland",
+ "tenantName": "AIN Web Tool-15-D-testalexandria",
+ "modelInfo": {
+ "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450",
+ "modelName": "action-data",
+ "modelVersion": "1.0",
+ "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450"
+ },
+ "isALaCarte": true,
+ "orchStatus": "Active",
+ "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450",
+ "testApi": "VNF_API"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json
new file mode 100644
index 000000000..171568b89
--- /dev/null
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json
@@ -0,0 +1,86 @@
+{
+ "action":"None_Delete",
+ "isDirty":true,
+ "vnfs":{
+
+ },
+ "instanceParams":[
+ {
+ "2017488_PASQUALEvpe0_ASN":"AV_vPE"
+ }
+ ],
+ "validationCounter":0,
+ "existingNames":{
+ "123":"",
+ "instancename":"",
+ "yoav":""
+ },
+ "existingVNFCounterMap":{
+
+ },
+ "existingVnfGroupCounterMap":{
+
+ },
+ "existingNetworksCounterMap":{
+ "94fdd893-4a36-4d70-b16a-ec29c54c184f":1
+ },
+ "networks":{
+ "ExtVL 0":{
+ "rollbackOnFailure":"false",
+ "productFamilyId":"36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e",
+ "lcpCloudRegionId":"hvf6",
+ "tenantId":"229bcdc6eaeb4ca59d55221141d01f8e",
+ "lineOfBusiness":"zzz1",
+ "platformName":"platform",
+ "originalName":"ExtVL 0",
+ "modelInfo":{
+ "modelInvariantId":"379f816b-a7aa-422f-be30-17114ff50b7c",
+ "modelVersionId":"ddc3f20c-08b5-40fd-af72-c6d14636b986",
+ "modelName":"ExtVL",
+ "modelVersion":"37.0",
+ "modelType":"network",
+ "modelCustomizationId":"94fdd893-4a36-4d70-b16a-ec29c54c184f",
+ "modelCustomizationName":"ExtVL 0"
+ },
+ "instanceName":"ExtVL 0",
+ "instanceId":"NETWORK_INSTANCE_ID",
+ "action":"None_Delete"
+ }
+ },
+ "vnfGroups":{
+
+ },
+ "bulkSize":1,
+ "instanceName":"InstanceName",
+ "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType":"TYLER SILVIA",
+ "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+ "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77",
+ "lcpCloudRegionId":"JANET25",
+ "tenantId":"092eb9e8e4b7412e8787dd091bc58e86",
+ "aicZoneId":"JAG1",
+ "projectName":"WATKINS",
+ "rollbackOnFailure":true,
+ "aicZoneName":"YUDFJULP-JAG1",
+ "owningEntityName":"WayneHolland",
+ "testApi":"GR_API",
+ "tenantName":"USP-SIP-IC-24335-T-01",
+ "modelInfo":{
+ "modelInvariantId":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "modelVersionId":"6b528779-44a3-4472-bdff-9cd15ec93450",
+ "modelName":"action-data",
+ "modelVersion":"1.0",
+ "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450"
+ },
+ "isALaCarte":true,
+ "name":"action-data",
+ "version":"1.0",
+ "description":"",
+ "category":"",
+ "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450",
+ "invariantUuid":"e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "serviceType":"",
+ "serviceRole":"",
+ "isMultiStepDesign":false,
+ "instanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json
new file mode 100644
index 000000000..695ce343b
--- /dev/null
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json
@@ -0,0 +1,71 @@
+{
+ "action": "None_Delete",
+ "isDirty": true,
+ "vnfs": {
+ "2017-488_PASQUALE-vPE 0": {
+ "vfModules": {
+ },
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "JANET25",
+ "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+ "lineOfBusiness": "ONAP",
+ "platformName": "platform",
+ "modelInfo": {
+ "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+ "modelName": "2017-488_PASQUALE-vPE",
+ "modelVersion": "5.0",
+ "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+ "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+ "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+ },
+ "orchStatus": "Created",
+ "inMaint": false,
+ "instanceId": "VNF_INSTANCE_ID",
+ "instanceName": "2017488_PASQUALEvPEVNFinstancename",
+ "action": "None_Delete",
+ "legacyRegion": "some legacy region"
+ }
+ },
+ "instanceParams": [],
+ "validationCounter": 0,
+ "existingNames": {
+ "mcankinstancename": ""
+ },
+ "existingVNFCounterMap": {
+ "afacccf6-397d-45d6-b5ae-94c39734b168": 1,
+ "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3,
+ "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1
+ },
+ "existingVnfGroupCounterMap": {},
+ "existingNetworksCounterMap": {},
+ "networks": {},
+ "vnfGroups": {},
+ "bulkSize": 1,
+ "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
+ "instanceName": "mCaNkinstancename",
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+ "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+ "aicZoneId": "NFT1",
+ "projectName": "WATKINS",
+ "rollbackOnFailure": true,
+ "aicZoneName": "NFTJSSSS-NFT1",
+ "owningEntityName": "WayneHolland",
+ "tenantName": "AIN Web Tool-15-D-testalexandria",
+ "modelInfo": {
+ "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450",
+ "modelName": "action-data",
+ "modelVersion": "1.0",
+ "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450"
+ },
+ "isALaCarte": true,
+ "orchStatus": "Active",
+ "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450",
+ "testApi": "VNF_API"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/changeManagement/reduced_vnf_data_by_globalid_and_service_type.json b/vid-automation/src/test/resources/changeManagement/reduced_vnf_data_by_globalid_and_service_type.json
new file mode 100644
index 000000000..20831bec8
--- /dev/null
+++ b/vid-automation/src/test/resources/changeManagement/reduced_vnf_data_by_globalid_and_service_type.json
@@ -0,0 +1,539 @@
+{
+ "results": [
+ {
+ "id": "3400916992",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1",
+ "properties": {
+ "service-instance-id": "66b13cb4-b575-449f-aa45-ffbfe005c7b1",
+ "service-instance-name": "CHARLOTTE_preload_1710_0914",
+ "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "model-version-id": "1525f534-99a2-408f-b847-ff636997d352",
+ "resource-version": "1505856078810",
+ "orchestration-status": "Active"
+ },
+ "related-to": [
+ {
+ "id": "10207440",
+ "node-type": "service-subscription",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
+ },
+ {
+ "id": "3481829392",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec"
+ }
+ ]
+ },
+ {
+ "id": "3771572432",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95",
+ "properties": {
+ "service-instance-id": "f195837b-ef28-42c3-8dea-47ad37eaed95",
+ "service-instance-name": "CHARLOTTE_preload_1710_0914_0920",
+ "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
+ "resource-version": "1505964829466",
+ "orchestration-status": "Active"
+ },
+ "related-to": [
+ {
+ "id": "10207440",
+ "node-type": "service-subscription",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
+ },
+ {
+ "id": "3484520464",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1"
+ }
+ ]
+ },
+ {
+ "id": "3775807704",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700",
+ "properties": {
+ "service-instance-id": "9ad4ac55-a5e0-4b49-95c0-b2d846abf700",
+ "service-instance-name": "CHARLOTTE_preload_1710_0914_100417",
+ "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
+ "resource-version": "1507144734087",
+ "orchestration-status": "Active"
+ },
+ "related-to": [
+ {
+ "id": "10207440",
+ "node-type": "service-subscription",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
+ },
+ {
+ "id": "3783459064",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165"
+ }
+ ]
+ },
+ {
+ "id": "4178862184",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2",
+ "properties": {
+ "service-instance-id": "599c7247-b083-447c-b6b1-0cdd5170dfd2",
+ "service-instance-name": "CHARLOTTE_preload_1710_0914_1010",
+ "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
+ "resource-version": "1507664240411",
+ "orchestration-status": "Active"
+ },
+ "related-to": [
+ {
+ "id": "10207440",
+ "node-type": "service-subscription",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
+ },
+ {
+ "id": "3892133896",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a"
+ }
+ ]
+ },
+ {
+ "id": "3008335920",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08",
+ "properties": {
+ "service-instance-id": "97315a05-e6f3-4c47-ae7e-d850c327aa08",
+ "service-instance-name": "CHARLOTTE_preload_1710_0914_0927",
+ "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+ "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
+ "resource-version": "1506527653053",
+ "orchestration-status": "Active"
+ },
+ "related-to": [
+ {
+ "id": "10207440",
+ "node-type": "service-subscription",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic"
+ },
+ {
+ "id": "3418898432",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855"
+ }
+ ]
+ },
+ {
+ "id": "3481829392",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec",
+ "properties": {
+ "vnf-id": "0c465dd3-4151-4da9-92a2-541bb3174cec",
+ "vnf-name": "Eoghan Fausto",
+ "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+ "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "prov-status": "PREPROV",
+ "orchestration-status": "Created",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "1505856137206",
+ "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "model-version-id": "afacccf6-397d-45d6-b5ae-94c39734b168",
+ "model-customization-id": "b54689f8-45c5-4be2-9e91-f033e028feec",
+ "nf-type": "DNS",
+ "nf-function": "Mobile DNS",
+ "nf-role": "vWheeler",
+ "nf-naming-code": "null"
+ },
+ "related-to": [
+ {
+ "id": "3285635208",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/d49713bf-1bff-4eab-bed1-a8f1bb83aa98"
+ },
+ {
+ "id": "3441209432",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/b8397fec-cf13-40b3-be8f-7d0912506419"
+ },
+ {
+ "id": "3687522312",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/fd098a52-09be-4c48-a9e9-a565d1b39db3"
+ },
+ {
+ "id": "3400916992",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1"
+ },
+ {
+ "id": "3477385312",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+ }
+ ]
+ },
+ {
+ "id": "3484520464",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1",
+ "properties": {
+ "vnf-id": "c2d2d389-fa00-4fb4-a269-e46d495719e1",
+ "vnf-name": "Odell Romana",
+ "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+ "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "prov-status": "PREPROV",
+ "orchestration-status": "Created",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "1505964996823",
+ "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820",
+ "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994",
+ "nf-type": "DNS",
+ "nf-function": "Mobile DNS",
+ "nf-role": "vMobileDNS",
+ "nf-naming-code": "null"
+ },
+ "related-to": [
+ {
+ "id": "3447107680",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/c4711b5c-742e-4d03-8146-bff763f69fbd"
+ },
+ {
+ "id": "3448307712",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/0ba3fcdd-0536-4ac7-a9ec-8d8622db7fb2"
+ },
+ {
+ "id": "3692179528",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/6bb843eb-ef84-43b1-83b4-3154a7f9928c"
+ },
+ {
+ "id": "3771588816",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/a4c008c6-cac0-4e3f-928f-90fa37dc8c4b"
+ },
+ {
+ "id": "3904077944",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/eecb619c-a173-4ead-bf48-d4d09cbbdd5e"
+ },
+ {
+ "id": "4027855088",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/1e29424e-2dca-45ac-b1df-59a8f74d0bc1"
+ },
+ {
+ "id": "4390871192",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/b185220a-7f63-4b29-867d-1452813a4f09"
+ },
+ {
+ "id": "4450529432",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/7a0c4b98-b3cc-490c-bbab-e2d7f169f2d7"
+ },
+ {
+ "id": "3771572432",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95"
+ }
+ ]
+ },
+ {
+ "id": "3783459064",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165",
+ "properties": {
+ "vnf-id": "54626a59-ec0d-4fa9-b0c2-08d008688165",
+ "vnf-name": "Dominika Fionnbharr",
+ "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+ "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "prov-status": "PREPROV",
+ "orchestration-status": "Created",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "1507144948937",
+ "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820",
+ "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994",
+ "nf-type": "DNS",
+ "nf-function": "Mobile DNS",
+ "nf-role": "vMobileDNS",
+ "nf-naming-code": "null"
+ },
+ "related-to": [
+ {
+ "id": "3775807704",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700"
+ }
+ ]
+ },
+ {
+ "id": "3892133896",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a",
+ "properties": {
+ "vnf-id": "d74503d8-abab-49c6-ba48-a6211eee9b7a",
+ "vnf-name": "CHARLOTTE_PreloadTest_VNF",
+ "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+ "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "prov-status": "PREPROV",
+ "orchestration-status": "Created",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "1507664288548",
+ "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820",
+ "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994",
+ "nf-type": "DNS",
+ "nf-function": "Mobile DNS",
+ "nf-role": "vMobileDNS",
+ "nf-naming-code": "null"
+ },
+ "related-to": [
+ {
+ "id": "4178862184",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2"
+ }
+ ]
+ },
+ {
+ "id": "1507690314",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/385548e2-3f31-4900-9437-317d0346e49a",
+ "properties": {
+ "vnf-id": "385548e2-3f31-4900-9437-317d0346e49a",
+ "vnf-name": "Senga Gabrielle",
+ "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+ "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "prov-status": "PREPROV",
+ "orchestration-status": "Created",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "7788675952902",
+ "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "model-version-id": "b217c612-7fcf-484c-861b-df0a5c4b5bcb",
+ "model-customization-id": "ce15d245-763c-4079-ac82-fe93007adb69",
+ "nf-type": "DNS",
+ "nf-function": "Mobile DNS",
+ "nf-role": "vMobileDNS",
+ "nf-naming-code": "null"
+ },
+ "related-to": [
+ {
+ "id": "3664617648",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+ },
+ {
+ "id": "3008335920",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+ },
+ {
+ "id": "3477385312",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+ }
+ ]
+ },
+ {
+ "id": "5278880615",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0465e048-92a4-4a7f-bfe7-de39b32de4bd",
+ "properties": {
+ "vnf-id": "0465e048-92a4-4a7f-bfe7-de39b32de4bd",
+ "vnf-name": "Constantius Raghu",
+ "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+ "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "prov-status": "PREPROV",
+ "orchestration-status": "Created",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "7788675952902",
+ "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "model-version-id": "afacccf6-397d-45d6-b5ae-94c39734b168",
+ "model-customization-id": "ce15d245-763c-4079-ac82-fe93007adb69",
+ "nf-type": "DNS",
+ "nf-function": "Mobile DNS",
+ "nf-role": "vWheeler",
+ "nf-naming-code": "null"
+ },
+ "related-to": [
+ {
+ "id": "3664617648",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+ },
+ {
+ "id": "3008335920",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+ },
+ {
+ "id": "3477385312",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+ }
+ ]
+ },
+ {
+ "id": "3418898432",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855",
+ "properties": {
+ "vnf-id": "8e5e3ba1-3fe6-4d86-966e-f9f03dab4855",
+ "vnf-name": "zolson3amdns02test2",
+ "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+ "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "prov-status": "PREPROV",
+ "orchestration-status": "Created",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "1507132024933",
+ "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+ "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820",
+ "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994",
+ "nf-type": "DNS",
+ "nf-function": "Mobile DNS",
+ "nf-role": "vMobileDNS",
+ "nf-naming-code": "null"
+ },
+ "related-to": [
+ {
+ "id": "3664617648",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+ },
+ {
+ "id": "3008335920",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+ },
+ {
+ "id": "3477385312",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+ },
+ {
+ "id": "3647635704",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0"
+ },
+ {
+ "id": "3664621744",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce"
+ },
+ {
+ "id": "3975352504",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f"
+ },
+ {
+ "id": "4059455552",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7"
+ },
+ {
+ "id": "4098130088",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e"
+ },
+ {
+ "id": "4401291416",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1"
+ },
+ {
+ "id": "4458950808",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82"
+ }
+ ]
+ },
+ {
+ "id": "1024648346",
+ "node-type": "generic-vnf",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/a58bf551-a79c-42d1-83b4-ed9288036245",
+ "properties": {
+ "vnf-id": "a58bf551-a79c-42d1-83b4-ed9288036245",
+ "vnf-name": "Harrison Kris",
+ "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+ "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+ "prov-status": "PREPROV",
+ "orchestration-status": "Created",
+ "in-maint": false,
+ "is-closed-loop-disabled": false,
+ "resource-version": "4679861552759",
+ "model-invariant-id": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
+ "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413",
+ "model-customization-id": "14e8057d-b22a-405c-84aa-90b82bfd6e46",
+ "nf-type": "DNS",
+ "nf-function": "Mobile DNS",
+ "nf-role": "vMobileDNS",
+ "nf-naming-code": "null"
+ },
+ "related-to": [
+ {
+ "id": "3664617648",
+ "node-type": "vf-module",
+ "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+ },
+ {
+ "id": "3008335920",
+ "node-type": "service-instance",
+ "url": "https://aai.onap:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+ },
+ {
+ "id": "3477385312",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+ },
+ {
+ "id": "3647635704",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0"
+ },
+ {
+ "id": "3664621744",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce"
+ },
+ {
+ "id": "3975352504",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f"
+ },
+ {
+ "id": "4059455552",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7"
+ },
+ {
+ "id": "4098130088",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e"
+ },
+ {
+ "id": "4401291416",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1"
+ },
+ {
+ "id": "4458950808",
+ "node-type": "vserver",
+ "url": "https://aai.onap:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82"
+ }
+ ]
+ }
+ ]
+ } \ No newline at end of file
diff --git a/vid-automation/src/test/resources/changeManagement/vnfInPlaceSoftwareUpdate.json b/vid-automation/src/test/resources/changeManagement/vnfInPlaceSoftwareUpdate.json
new file mode 100644
index 000000000..76d368b6e
--- /dev/null
+++ b/vid-automation/src/test/resources/changeManagement/vnfInPlaceSoftwareUpdate.json
@@ -0,0 +1,26 @@
+{
+ "requestDetails": [{
+
+ "vnfName": "VidVnf",
+ "vnfInstanceId": "e5403738-da34-4090-8864-ba9cf1bcdd88",
+
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "requestorId": "az2016"
+ },
+ "requestParameters": {
+ "payload": "{\"existing_software_version\": \"3.1\", \"new_software_version\": \"3.2\", \"operations_timeout\": \"3600\"}"
+ },
+
+ "relatedInstanceList": [{
+ "relatedInstance": {
+ "instanceId": "12709275-787c-4be7-8c9c-fce64ab7ca8c"
+ }
+ }]
+ }],
+ "requestType" : "vnf in place software update"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/changeManagement/vnfReplaceRequest.json b/vid-automation/src/test/resources/changeManagement/vnfReplaceRequest.json
new file mode 100644
index 000000000..9fd971aad
--- /dev/null
+++ b/vid-automation/src/test/resources/changeManagement/vnfReplaceRequest.json
@@ -0,0 +1,40 @@
+{
+ "requestDetails": [{
+
+ "vnfName": "VidVnf",
+ "vnfInstanceId": "e9181708-f105-4dfd-9a36-0e089faa72ba",
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "254583ad-b38c-498b-bdbd-b8de5e07541b",
+ "modelName": "vSAMP12",
+ "modelVersion": "2.0",
+ "modelCustomizationName": "vSAMP12 1",
+ "modelCustomizationId": "c539433a-84a6-4082-a12e-5c9b00c3b960"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "requestorId": "az2016"
+ },
+ "relatedInstanceList": [{
+ "relatedInstance": {
+ "instanceId": "254583ad-b38c-498b-bdbd-b8de5e07541b",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "9ebb1521-2e74-47a4-aac7-e71a79f73a79",
+ "modelName": "fakeModelName",
+ "modelVersion": "2.0"
+ }
+ }
+ }],
+ "requestParameters": {
+ "rebuildVolumeGroups": false
+ }
+ }],
+ "requestType" : "replace"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/changeManagement/vnfUpdateRequest.json b/vid-automation/src/test/resources/changeManagement/vnfUpdateRequest.json
new file mode 100644
index 000000000..e57b39b13
--- /dev/null
+++ b/vid-automation/src/test/resources/changeManagement/vnfUpdateRequest.json
@@ -0,0 +1,45 @@
+{
+ "requestDetails": [{
+
+ "vnfName": "VidVnf",
+ "vnfInstanceId": "c929b7ec-cc9d-11e8-a8d5-f2801f1b9fd1",
+
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "ff5256d1-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "254583ad-b38c-498b-bdbd-b8de5e07541b",
+ "modelName": "vSAMP12",
+ "modelVersion": "2.0",
+ "modelCustomizationName": "vSAMP12 1",
+ "modelCustomizationId": "c539433a-84a6-4082-a12e-5c9b00c3b960"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "suppressRollback": false,
+ "requestorId": "az2016"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "d0c59d4a-cc9d-11e8-a8d5-f2801f1b9fd1",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "9ebb1521-2e74-47a4-aac7-e71a79f73a79",
+ "modelName": "fakeModelName",
+ "modelVersion": "2.0"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "usePreload": true
+ }
+
+ }],
+ "requestType" : "update"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_full_subscribers.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_full_subscribers.json
deleted file mode 100644
index 23009f8db..000000000
--- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_full_subscribers.json
+++ /dev/null
@@ -1,107 +0,0 @@
-{
- "simulatorRequest": {
- "method": "GET",
- "path": "/aai/v../business/customers",
- "queryParams": {
- "subscriber-type": "INFRA",
- "depth": 0
- }
- } ,
- "simulatorResponse": {
- "responseCode": 200,
- "body": {
- "customer":[
- {
- "global-customer-id":"MSO_1610_ST",
- "subscriber-name":"MSO_1610_ST",
- "subscriber-type":"INFRA",
- "resource-version":"1494001902987"
- },
- {
- "global-customer-id":"21014aa2-526b-11e6-beb8-9e71128cae77",
- "subscriber-name":"PACKET CORE",
- "subscriber-type":"INFRA",
- "resource-version":"1494001776295"
- },
- {
- "global-customer-id":"DHV1707-TestSubscriber-2",
- "subscriber-name":"ICORE CORE",
- "subscriber-type":"INFRA",
- "resource-version":"1498751754450"
- },
- {
- "global-customer-id":"DHV1707-TestSubscriber-1",
- "subscriber-name":"PACKET1 CORE",
- "subscriber-type":"INFRA",
- "resource-version":"1498595633607"
- },
- {
- "global-customer-id":"jimmy-example",
- "subscriber-name":"JimmyExampleCust-20161102",
- "subscriber-type":"INFRA",
- "resource-version":"1494001970063"
- },
- {
- "global-customer-id":"jimmy-example2",
- "subscriber-name":"JimmyExampleCust-20161103",
- "subscriber-type":"INFRA",
- "resource-version":"1494001970225"
- },
- {
- "global-customer-id":"DHV1802-TestSub-PWT-102",
- "subscriber-name":"DHV1802-TestSub-PWT-102",
- "subscriber-type":"INFRA",
- "resource-version":"1508852495058"
- },
- {
- "global-customer-id":"DHV1802-TestSub-PWT-101",
- "subscriber-name":"DHV1802-TestSub-PWT-101",
- "subscriber-type":"INFRA",
- "resource-version":"1508179953733"
- },
- {
- "global-customer-id":"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
- "subscriber-name":"Mobility",
- "subscriber-type":"INFRA",
- "resource-version":"1494001894192"
- },
- {
- "global-customer-id":"DHV1802-Subscriber-4",
- "subscriber-name":"DHV1802-Subscriber-5",
- "subscriber-type":"INFRA",
- "resource-version":"1509134064531"
- },
- {
- "global-customer-id":"DHV1802-TestSub-PWT-103",
- "subscriber-name":"DHV1802-TestSub-PWT-103",
- "subscriber-type":"INFRA",
- "resource-version":"1509045503736"
- },
- {
- "global-customer-id":"DHV1802-Subscriber-2",
- "subscriber-name":"DHV1802-Subscriber-2",
- "subscriber-type":"INFRA",
- "resource-version":"1509122065439"
- },
- {
- "global-customer-id":"e433710f-9217-458d-a79d-1c7aff376d89",
- "subscriber-name":"USP VOICE",
- "subscriber-type":"INFRA",
- "resource-version":"1494001938080"
- },
- {
- "global-customer-id":"DHV1802-Subscriber-3",
- "subscriber-name":"DHV1802-Subscriber-3",
- "subscriber-type":"INFRA",
- "resource-version":"1509122759407"
- },
- {
- "global-customer-id":"31739f3e-526b-11e6-beb8-9e71128cae77",
- "subscriber-name":"FIREWALL/MISC",
- "subscriber-type":"INFRA",
- "resource-version":"1494001772223"
- }
- ]
- }
- }
-} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json
index da18285bc..74b8637aa 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region.json
@@ -7,7 +7,7 @@
},
"body": {
"start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911",
- "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP"
+ "query": "query/pnf-fromModel-byRegion?cloudRegionId=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP"
}
} ,
"simulatorResponse": {
diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json
index 5dc4e77eb..386c982c0 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_pnf_by_region_error.json
@@ -7,7 +7,7 @@
},
"body": {
"start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=8a84e59b-45fe-4851-8ff1-34225a0b32c3&model-invariant-id=83b458fd-5dd3-419b-a9e3-7335814a0911",
- "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP"
+ "query": "query/pnf-fromModel-byRegion?cloudRegionId=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP"
}
} ,
"simulatorResponse": {
diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json
index a0e9e88cc..a4a63574e 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "GET",
- "path": "/aai/v12/network/pnfs/pnf/DEAAI78"
+ "path": "/aai/v../network/pnfs/pnf/DEAAI78"
} ,
"simulatorResponse": {
"responseCode": 200,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json
index cc84a7588..ee88d71ea 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/aai_get_specific_pnf_error.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "GET",
- "path": "/aai/v12/network/pnfs/pnf/DEAAI78"
+ "path": "/aai/v../network/pnfs/pnf/DEAAI78"
} ,
"simulatorResponse": {
"responseCode": 500,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations.json b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration.json
index de0c07bc8..d88343ae4 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration.json
@@ -1,8 +1,8 @@
{
"simulatorRequest": {
"method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations"
- } ,
+ "path": "/mso/serviceInstantiation/v7/serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activateFabricConfiguration"
+ },
"simulatorResponse": {
"responseCode": 202,
"body": {
diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration_error.json b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration_error.json
new file mode 100644
index 000000000..90f380ea1
--- /dev/null
+++ b/vid-automation/src/test/resources/registration_to_simulator/activate_fabric_configuration_error.json
@@ -0,0 +1,10 @@
+{
+ "simulatorRequest": {
+ "method": "POST",
+ "path": "/mso/serviceInstantiation/v7/serviceInstances/f36f5734-e9df-4fbf-9f35-61be13f028a1/activateFabricConfiguration"
+ },
+ "simulatorResponse": {
+ "responseCode": 500,
+ "body": "ERROR_PAYLOAD"
+ }
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json
index 949a86afb..773bfd0dd 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate"
+ "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate"
},
"simulatorResponse": {
"responseCode": 202,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json
index 96322b7ae..73ff898a7 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/activate_service_instance_error.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/activate"
+ "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/activate"
} ,
"simulatorResponse": {
"responseCode": 500,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json
new file mode 100644
index 000000000..b0bf14b55
--- /dev/null
+++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_configuration.json
@@ -0,0 +1,34 @@
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "configuration",
+ "modelInvariantId": "model-invariant-id-9533",
+ "modelVersionId": "model-version-id-9533",
+ "modelCustomizationId": "08a181aa-72eb-435f-9593-e88a3ad0a86b"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "requestorId": "us16807000"
+ },
+ "relatedInstanceList": [
+ {
+ "relatedInstance": {
+ "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408",
+ "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7",
+ "modelName": "ServiceContainerMultiplepProbes",
+ "modelVersion": "1.0"
+ }
+ }
+ }
+ ],
+ "requestParameters": {
+ "userParams": []
+ }
+ }
+}
diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json
new file mode 100644
index 000000000..97bc6e46d
--- /dev/null
+++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_activate_fabric_configuration.json
@@ -0,0 +1,22 @@
+{
+ "requestDetails": {
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "ff3514e3-5a33-55df-13ab-12abad84e7ff",
+ "modelVersionId": "fe6985cd-ea33-3346-ac12-ab121484a3fe",
+ "modelName": "Test",
+ "modelVersion": "1.0"
+ },
+ "cloudConfiguration": {
+ "lcpCloudRegionId": "mdt1",
+ "tenantId": "88a6ca3ee0394ade9403f075db23167e"
+ },
+ "requestInfo": {
+ "source": "VID",
+ "requestorId": "az2016"
+ },
+ "requestParameters": {
+ "aLaCarte": false
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json
index e0942bae2..c726590eb 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_create_configuration.json
@@ -1,4 +1,3 @@
-
{
"requestDetails": {
"modelInfo": {
@@ -11,49 +10,46 @@
"modelCustomizationName": "Port Mirroring Configuration By Policy 1"
},
"cloudConfiguration": {
- "lcpCloudRegionId": "AAIAIC25"
+ "lcpCloudRegionId": "JANET25"
},
"requestInfo": {
- "instanceName":"test_sssdad",
+ "instanceName": "dummy_instance",
"source": "VID",
- "requestorId": "1"
+ "requestorId": "us16807000"
},
- "relatedInstanceList": [
- {
- "relatedInstance": {
- "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6 ",
- "modelInfo": {
- "modelType": "service",
- "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408",
- "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7",
- "modelName": "ServiceContainerMultiplepProbes",
- "modelVersion": "1.0"
- }
+ "relatedInstanceList": [{
+ "relatedInstance": {
+ "instanceId": "c187e9fe-40c3-4862-b73e-84ff056205f6",
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "b7d923c9-6175-41f1-91ba-4565c4953408",
+ "modelVersionId": "ee6d61be-4841-4f98-8f23-5de9da846ca7",
+ "modelName": "ServiceContainerMultiplepProbes",
+ "modelVersion": "1.0"
}
- },
- {
- "relatedInstance": {
- "instanceId": "9be14a4f-7367-4cf9-96a1-f08f10f485a7",
- "instanceDirection": "source",
- "modelInfo": {
- "modelType": "vnf",
- "modelInvariantId": "a7eac2b3-8444-40ee-92e3-b3359b32445c",
- "modelVersionId": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6",
- "modelName": "vmmeService2",
- "modelVersion": "1.0",
- "modelCustomizationId": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17"
- }
+ }
+ }, {
+ "relatedInstance": {
+ "instanceId": "9be14a4f-7367-4cf9-96a1-f08f10f485a7",
+ "instanceDirection": "source",
+ "modelInfo": {
+ "modelType": "vnf",
+ "modelInvariantId": "51f2c559-1aba-4fd4-bbf9-8cbbef85ff2a",
+ "modelVersionId": "cb05b259-9f26-4b33-b96c-13c2c202c091",
+ "modelName": "vf_vEPDG",
+ "modelVersion": "2.0",
+ "modelCustomizationId": "35aeaae9-74f7-4b6a-adda-65edb0110361"
}
- },
- {
- "relatedInstance": {
- "instanceId": "AS-pnf2-10219--as988q",
- "instanceDirection": "destination",
- "modelInfo": {
- "modelType": "pnf"
- }
+ }
+ }, {
+ "relatedInstance": {
+ "instanceName": "AS-pnf2-10219--as988q",
+ "instanceDirection": "destination",
+ "modelInfo": {
+ "modelType": "pnf"
}
}
+ }
],
"requestParameters": {
"userParams": []
diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json
new file mode 100644
index 000000000..ad588b68b
--- /dev/null
+++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_deactivate_and_cloud_delete.json
@@ -0,0 +1,5 @@
+{
+ "lcpCloudRegionId": "hvf6",
+ "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+ "userId": "us16807000"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json
index 951eac1fb..3b0204aa7 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/body_jsons/mso_request_delete_or_unassign_service_instance.json
@@ -12,7 +12,7 @@
"requestorId": "16807000"
},
"requestParameters": {
- "testApi": "GR_API",
+ "testApi": "VNF_API",
"aLaCarte": false
}
}
diff --git a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json
index d98dbfe64..ce27b5920 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
+ "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
} ,
"simulatorResponse": {
"responseCode": 202,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json
index 1a6aee73a..7e808b812 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/deactivate_service_instance_error.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
+ "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/deactivate"
} ,
"simulatorResponse": {
"responseCode": 500,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json
index c5e3c6ee4..ef551184d 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
+ "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
} ,
"simulatorResponse": {
"responseCode": 202,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json
index d4b5f54fc..073fd359f 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/dissociate_pnf_from_service_instance_error.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
+ "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/removeRelationships"
} ,
"simulatorResponse": {
"responseCode": 404,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json b/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json
index a43092ef9..a71270e72 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json
@@ -2,7 +2,7 @@
{
"simulatorRequest": {
"method": "GET",
- "path": "/ecompportal_att/auxapi//getSessionSlotCheckInterval"
+ "path": "/ecompportal_att/auxapi//v3/getSessionSlotCheckInterval"
},
"simulatorResponse": {
"responseCode": 200,
@@ -22,6 +22,26 @@
{
"simulatorRequest": {
"method": "GET",
+ "path": "/ecompportal_att/auxapi/v3/getSessionSlotCheckInterval"
+ },
+ "simulatorResponse": {
+ "responseCode": 200,
+ "body": "300000"
+ }
+ },
+ {
+ "simulatorRequest": {
+ "method": "POST",
+ "path": "/ecompportal_att/auxapi/extendSessionTimeOuts"
+ },
+ "simulatorResponse": {
+ "responseCode": 200,
+ "body": "300000"
+ }
+ },
+ {
+ "simulatorRequest": {
+ "method": "GET",
"path": "/ecompportal_att/auxapi/context/get_user"
},
"simulatorResponse": {
diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json
index 61ede56d1..50707ccb1 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "GET",
- "path": "/aai/v12/network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100"
+ "path": "/aai/v14/network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100"
} ,
"simulatorResponse": {
"responseCode": 200,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json
index abe4d2b5e..082a3bf4e 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/get_logical_link_not_found.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "GET",
- "path": "/aai/v12/network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100"
+ "path": "/aai/v../network/logical-links/logical-link/tesai371ve2:ae10|tesaaisdgraclz1a1:po100"
} ,
"simulatorResponse": {
"responseCode": 404,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json b/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json
index 955f356d9..596104b83 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/get_operational_environments_aai.json
@@ -38,7 +38,7 @@
{
"operational-environment-id": "UUID of ECOMP Operational Environment",
"operational-environment-name": "ECOMP Env Name",
- "operational-environment-type": "ECOMP",
+ "operational-environment-type": "ONAP",
"operational-environment-status": "Activate",
"tenant-context": "ECOMP Test",
"workload-context": "ECOMP_Development",
diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VmmeRvpmsFeAic3011217Svc.json b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json
index 1d7849a6c..7fca48f10 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VmmeRvpmsFeAic3011217Svc.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json
@@ -6,7 +6,7 @@
},
"simulatorResponse": {
"responseCode": 200,
- "file": "service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip"
+ "file": "service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip"
}
},
{
@@ -24,7 +24,7 @@
"invariantUUID": "124216d6-71d0-41c8-ac81-0c5acfee514a",
"name": "vMMEvProbe_FE_AIC3-11.2.1_VF",
"version": "1.0",
- "toscaModelURL": "./service-VmmeRvpmsFeAic3011217Svc-csar.csar.zip",
+ "toscaModelURL": "./service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip",
"category": "Application L4+",
"lifecycleState": "CERTIFIED",
"lastUpdaterUserId": "rg276b",
diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json b/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json
index 235c642ec..a5ea4e230 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/get_service_instance_not_found.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "GET",
- "path": "/aai/v12/business/customers/customer/31739f3e-526b-11e6-beb8-9e71128cae77/service-subscriptions/service-subscription/AIM+Transport/service-instances/service-instance/f36f5734-e9df-4fbf-9f35-61be13f028a1"
+ "path": "/aai/v../business/customers/customer/31739f3e-526b-11e6-beb8-9e71128cae77/service-subscriptions/service-subscription/AIM+Transport/service-instances/service-instance/f36f5734-e9df-4fbf-9f35-61be13f028a1"
} ,
"simulatorResponse": {
"responseCode": 404
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_activate_configurations.json b/vid-automation/src/test/resources/registration_to_simulator/mso_activate_configurations.json
deleted file mode 100644
index 19d70d90b..000000000
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_activate_configurations.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
- "simulatorRequest": {
- "method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations/a53c9ca8-8986-44da-9e5e-9e4179e6c78a/activate",
- "body": {
- "val": "dummy payload"
- }
- } ,
- "simulatorResponse": {
- "responseCode": 202,
- "responseHeaders": {
- "Content-Type": "application/json"
- },
- "body": {
- "requestReferences": {
- "instanceId": "f36f5734-e9df-4fbf-9f35-61be13f028a1",
- "requestId": "b6dc9806-b094-42f7-9386-a48de8218ce8"
- }
- }
- }
-} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json
index 7b72f053a..c85b3cb63 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships"
+ "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships"
} ,
"simulatorResponse": {
"responseCode": 202,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json
index 126369df3..f8f6fbbbd 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_add_relationships_error.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships"
+ "path": "/mso/serviceInstances/v./f36f5734-e9df-4fbf-9f35-61be13f028a1/addRelationships"
} ,
"simulatorResponse": {
"responseCode": 500,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json
index 58d338726..c3fb0b009 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_404.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
+ "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
} ,
"simulatorResponse": {
"responseCode": 404,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json
index f049d7662..27eb0dc98 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_error_409.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
+ "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
} ,
"simulatorResponse": {
"responseCode": 409,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json
index 09addafe9..021d012f6 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_config_update_ok.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
+ "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/applyUpdatedConfig"
} ,
"simulatorResponse": {
"responseCode": 202,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations_error.json b/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations_error.json
deleted file mode 100644
index 0752cd15f..000000000
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_create_configurations_error.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
- "simulatorRequest": {
- "method": "POST",
- "path": "/mso/serviceInstances/v6/f36f5734-e9df-4fbf-9f35-61be13f028a1/configurations"
- } ,
- "simulatorResponse": {
- "responseCode": "<ERROR_CODE>",
- "body": "<ERROR_PAYLOAD>"
- }
-} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json
index b5e3f1883..d48d2ae78 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_404.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
+ "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
} ,
"simulatorResponse": {
"responseCode": 404,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json
index f3985ef32..fa429c9e9 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_error_409.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
+ "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
} ,
"simulatorResponse": {
"responseCode": 409,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json
index ee0453393..4ce1936c4 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/mso_in_place_software_update_ok.json
@@ -1,7 +1,7 @@
{
"simulatorRequest": {
"method": "POST",
- "path": ".*/serviceInstances/v6/SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
+ "path": ".*/serviceInstances/v./SERVICE_INSTANCE_ID/vnfs/VNF_INSTANCE_ID/inPlaceSoftwareUpdate"
} ,
"simulatorResponse": {
"responseCode": 202,
diff --git a/vid-automation/src/test/resources/registration_to_simulator/portal_remote_users.json b/vid-automation/src/test/resources/registration_to_simulator/portal_remote_users.json
new file mode 100644
index 000000000..3b3f878f7
--- /dev/null
+++ b/vid-automation/src/test/resources/registration_to_simulator/portal_remote_users.json
@@ -0,0 +1,18 @@
+{
+ "simulatorRequest": {
+ "method" : "GET",
+ "path" : "/ecompportal_att/auxapi//v3/user/1"
+ } ,
+ "simulatorResponse": {
+ "responseCode": 200,
+ "body": {
+ "firstName": "1",
+ "lastName": "1",
+ "orgId": 1,
+ "loginId": "1",
+ "loginPwd": "1",
+ "active": true,
+ "internal": true
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json
new file mode 100644
index 000000000..ff4b6d1b6
--- /dev/null
+++ b/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json
@@ -0,0 +1,54 @@
+{
+ "service": {
+ "vidNotions": {
+ "instantiationUI": "legacy",
+ "modelCategory": "other",
+ "viewEditUI": "legacy"
+ },
+ "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e",
+ "invariantUuid": "d27e42cf-087e-4d31-88ac-6c4b7585f800",
+ "name": "vidmacrofalsenaming",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L1-3",
+ "serviceType": "",
+ "serviceRole": "",
+ "description": "vidmacrofalsenaming",
+ "serviceEcompNaming": "false",
+ "instantiationType": "A-La-Carte",
+ "inputs": {}
+ },
+ "vnfs": {},
+ "networks": {
+ "MULTI_PROVIDER_PORT_GROUP 0": {
+ "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2",
+ "invariantUuid": "b0303003-0abb-454c-9119-8cbe2e09e003",
+ "description": "Creates a neutron multi-provider VLAN network with dummy subnet",
+ "name": "MULTI_PROVIDER_PORT_GROUP",
+ "version": "1.0",
+ "customizationUuid": "0fde4286-ee4c-439d-9556-74b6be6bbc42",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
+ "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+ "network_scope": "GLOBAL",
+ "network_ecomp_naming": "{ecomp_generated_naming=true}",
+ "network_type": "MULTI_PROVIDER_PORT_GROUP",
+ "network_technology": "MULTI_GROUP",
+ "network_homing": "{ecomp_selected_instance_node_target=false}",
+ "ecomp_generated_naming": "false"
+ },
+ "type": "VL",
+ "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0"
+ }
+ },
+ "collectionResource": {},
+ "configurations": {},
+ "fabricConfigurations": {},
+ "serviceProxies": {},
+ "vfModules": {},
+ "volumeGroups": {},
+ "pnfs": {},
+ "vnfGroups": {}
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json
new file mode 100644
index 000000000..2136c84cb
--- /dev/null
+++ b/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json
@@ -0,0 +1,54 @@
+{
+ "service": {
+ "vidNotions": {
+ "instantiationUI": "legacy",
+ "modelCategory": "other",
+ "viewEditUI": "legacy"
+ },
+ "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e",
+ "invariantUuid": "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba",
+ "name": "vidmacrofalsenaming",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L1-3",
+ "serviceType": "",
+ "serviceRole": "",
+ "description": "vidmacrofalsenaming",
+ "serviceEcompNaming": "false",
+ "instantiationType": "ClientConfig",
+ "inputs": {}
+ },
+ "vnfs": {},
+ "networks": {
+ "MULTI_PROVIDER_PORT_GROUP 0": {
+ "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2",
+ "invariantUuid": "b0303003-0abb-454c-9119-8cbe2e09e003",
+ "description": "Creates a neutron multi-provider VLAN network with dummy subnet",
+ "name": "MULTI_PROVIDER_PORT_GROUP",
+ "version": "1.0",
+ "customizationUuid": "0fde4286-ee4c-439d-9556-74b6be6bbc42",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
+ "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+ "network_scope": "GLOBAL",
+ "network_ecomp_naming": "{ecomp_generated_naming=true}",
+ "network_type": "MULTI_PROVIDER_PORT_GROUP",
+ "network_technology": "MULTI_GROUP",
+ "network_homing": "{ecomp_selected_instance_node_target=false}",
+ "ecomp_generated_naming": "false"
+ },
+ "type": "VL",
+ "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0"
+ }
+ },
+ "collectionResource": {},
+ "configurations": {},
+ "fabricConfigurations": {},
+ "serviceProxies": {},
+ "vfModules": {},
+ "volumeGroups": {},
+ "pnfs": {},
+ "vnfGroups": {}
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json
new file mode 100644
index 000000000..07fd1d3a9
--- /dev/null
+++ b/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json
@@ -0,0 +1,54 @@
+{
+ "service": {
+ "vidNotions": {
+ "instantiationUI": "legacy",
+ "modelCategory": "other",
+ "viewEditUI": "legacy"
+ },
+ "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e",
+ "invariantUuid": "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba",
+ "name": "vidmacrofalsenaming",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L1-3",
+ "serviceType": "",
+ "serviceRole": "",
+ "description": "vidmacrofalsenaming",
+ "serviceEcompNaming": "false",
+ "instantiationType": "Macro",
+ "inputs": {}
+ },
+ "vnfs": {},
+ "networks": {
+ "MULTI_PROVIDER_PORT_GROUP 0": {
+ "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2",
+ "invariantUuid": "b0303003-0abb-454c-9119-8cbe2e09e003",
+ "description": "Creates a neutron multi-provider VLAN network with dummy subnet",
+ "name": "MULTI_PROVIDER_PORT_GROUP",
+ "version": "1.0",
+ "customizationUuid": "0fde4286-ee4c-439d-9556-74b6be6bbc42",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
+ "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+ "network_scope": "GLOBAL",
+ "network_ecomp_naming": "{ecomp_generated_naming=true}",
+ "network_type": "MULTI_PROVIDER_PORT_GROUP",
+ "network_technology": "MULTI_GROUP",
+ "network_homing": "{ecomp_selected_instance_node_target=false}",
+ "ecomp_generated_naming": "false"
+ },
+ "type": "VL",
+ "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0"
+ }
+ },
+ "collectionResource": {},
+ "configurations": {},
+ "fabricConfigurations": {},
+ "serviceProxies": {},
+ "vfModules": {},
+ "volumeGroups": {},
+ "pnfs": {},
+ "vnfGroups": {}
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json
new file mode 100644
index 000000000..785635cd6
--- /dev/null
+++ b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json
@@ -0,0 +1,454 @@
+{
+ "service": {
+ "vidNotions": {
+ "instantiationUI": "legacy",
+ "modelCategory": "other",
+ "viewEditUI": "legacy"
+ },
+ "uuid": "43f13072-fe50-496b-b673-7af075d10143",
+ "invariantUuid": "35fb95d8-d1f0-4e46-99ac-e01b423e8e3f",
+ "name": "PASQUALE vMX VPE BV Service 488 test",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L1-3",
+ "serviceType": "",
+ "serviceRole": "",
+ "description": "Model Creation for PID 291247b . OAM Network Service Name : PASQUALE vPE Tenant OAM Network 1 SRIOV Network Service Name : vPE PASQUALE Provider Net 1",
+ "serviceEcompNaming": "true",
+ "instantiationType": "ClientConfig",
+ "inputs": {
+ "2017488PASQUALEvpe20_ASN": {
+ "type": "string",
+ "description": "AV/PE",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "AV_vPE"
+ },
+ "2017488PASQUALEvpe20_bandwidth": {
+ "type": "string",
+ "description": "Requested VPE bandwidth",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "10"
+ },
+ "2017488PASQUALEvpe20_bandwidth_units": {
+ "type": "string",
+ "description": "Units of bandwidth",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "Gbps"
+ },
+ "2017488PASQUALEvpe20_AIC_CLLI": {
+ "type": "string",
+ "description": "AIC Site CLLI",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "ATLMY8GA"
+ },
+ "2017488PASQUALEvpe20_vnf_config_template_version": {
+ "type": "string",
+ "description": "VPE Software Version",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "17.2"
+ },
+ "2017488PASQUALEvpe20_vnf_instance_name": {
+ "type": "string",
+ "description": "The hostname assigned to the vpe.",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "mtnj309me6"
+ }
+ }
+ },
+ "vnfs": {
+ "2017 488 PASQUALE vPE 2 0": {
+ "uuid": "079266b1-fcf5-44ae-bc04-cc3215b28737",
+ "invariantUuid": "e2dcd546-e647-4854-9ed9-e0a4d6880636",
+ "description": "Name PASQUALE vPE Description The Provider edge function for the PASQUALE service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release code 17.2 Owners Mary Fragale Updated 9-25-17 for version 8.0 of the VLM ",
+ "name": "2017 488 PASQUALE vPE 2",
+ "version": "4.0",
+ "customizationUuid": "2b4e9125-b607-49a3-81c7-9260f8ca32f4",
+ "inputs": {
+ "vnf_config_template_version": {
+ "type": "string",
+ "description": "VPE Software Version",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "17.2"
+ },
+ "bandwidth_units": {
+ "type": "string",
+ "description": "Units of bandwidth",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "Gbps"
+ },
+ "bandwidth": {
+ "type": "string",
+ "description": "Requested VPE bandwidth",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "10"
+ },
+ "AIC_CLLI": {
+ "type": "string",
+ "description": "AIC Site CLLI",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "ATLMY8GA"
+ },
+ "ASN": {
+ "type": "string",
+ "description": "AV/PE",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "AV_vPE"
+ },
+ "vnf_instance_name": {
+ "type": "string",
+ "description": "The hostname assigned to the vpe.",
+ "entry_schema": null,
+ "inputProperties": null,
+ "constraints": [],
+ "required": true,
+ "default": "mtnj309me6"
+ }
+ },
+ "commands": {
+ "vnf_config_template_version": {
+ "displayName": "vnf_config_template_version",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_vnf_config_template_version"
+ },
+ "bandwidth_units": {
+ "displayName": "bandwidth_units",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_bandwidth_units"
+ },
+ "bandwidth": {
+ "displayName": "bandwidth",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_bandwidth"
+ },
+ "AIC_CLLI": {
+ "displayName": "AIC_CLLI",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_AIC_CLLI"
+ },
+ "ASN": {
+ "displayName": "ASN",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_ASN"
+ },
+ "vnf_instance_name": {
+ "displayName": "vnf_instance_name",
+ "command": "get_input",
+ "inputName": "2017488PASQUALEvpe20_vnf_instance_name"
+ }
+ },
+ "properties": {
+ "vmxvre_retype": "RE-VMX",
+ "vnf_config_template_version": "get_input:2017488PASQUALEvpe20_vnf_config_template_version",
+ "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d",
+ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9",
+ "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF",
+ "int_ctl_net_name": "VMX-INTXI",
+ "vmx_int_ctl_prefix": "10.0.0.10",
+ "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5",
+ "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279",
+ "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a",
+ "nf_type": "vPE",
+ "vmxvpfe_int_ctl_ip_1": "10.0.0.10",
+ "is_AVPN_service": "false",
+ "vmx_RSG_name": "vREXI-affinity",
+ "vmx_int_ctl_forwarding": "l2",
+ "vmxvre_oam_ip_0": "10.0.0.10",
+ "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF",
+ "vmxvpfe_sriov41_0_port_vlanstrip": "false",
+ "vmxvpfe_sriov42_0_port_vlanfilter": "4001",
+ "vmxvpfe_sriov44_0_port_unknownunicastallow": "true",
+ "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2",
+ "vmxvre_instance": "0",
+ "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF",
+ "vmxvre_flavor_name": "ns.c1r16d32.v5",
+ "vmxvpfe_volume_size_0": "40.0",
+ "vmxvpfe_sriov43_0_port_vlanfilter": "4001",
+ "nf_naming": "{ecomp_generated_naming=true}",
+ "multi_stage_design": "false",
+ "nf_naming_code": "tvpr",
+ "vmxvre_name_0": "vREXI",
+ "vmxvpfe_sriov42_0_port_vlanstrip": "false",
+ "vmxvpfe_volume_name_0": "vPFEXI_FBVolume",
+ "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141",
+ "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2",
+ "vmxvpfe_sriov43_0_port_unknownunicastallow": "true",
+ "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true",
+ "vmxvre_console": "vidconsole",
+ "vmxvpfe_sriov44_0_port_vlanfilter": "4001",
+ "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF",
+ "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3",
+ "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true",
+ "vmxvpfe_sriov44_0_port_vlanstrip": "false",
+ "vf_module_id": "123",
+ "nf_function": "Firewall",
+ "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true",
+ "vmxvre_int_ctl_ip_0": "10.0.0.10",
+ "ecomp_generated_naming": "true",
+ "AIC_CLLI": "get_input:2017488PASQUALEvpe20_AIC_CLLI",
+ "vnf_name": "mtnj309me6vre",
+ "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
+ "vmxvre_volume_type_1": "HITACHI",
+ "vmxvpfe_sriov44_0_port_broadcastallow": "true",
+ "vmxvre_volume_type_0": "HITACHI",
+ "vmxvpfe_volume_type_0": "HITACHI",
+ "vmxvpfe_sriov43_0_port_broadcastallow": "true",
+ "bandwidth_units": "get_input:2017488PASQUALEvpe20_bandwidth_units",
+ "vnf_id": "123",
+ "vmxvre_oam_prefix": "24",
+ "availability_zone_0": "mtpocfo-kvm-az01",
+ "ASN": "get_input:2017488PASQUALEvpe20_ASN",
+ "vmxvre_chassis_i2cid": "161",
+ "vmxvpfe_name_0": "vPFEXI",
+ "bandwidth": "get_input:2017488PASQUALEvpe20_bandwidth",
+ "availability_zone_max_count": "1",
+ "vmxvre_volume_size_0": "45.0",
+ "vmxvre_volume_size_1": "50.0",
+ "vmxvpfe_sriov42_0_port_broadcastallow": "true",
+ "vmxvre_oam_gateway": "10.0.0.10",
+ "vmxvre_volume_name_1": "vREXI_FAVolume",
+ "vmxvre_ore_present": "0",
+ "vmxvre_volume_name_0": "vREXI_FBVolume",
+ "vmxvre_type": "0",
+ "vnf_instance_name": "get_input:2017488PASQUALEvpe20_vnf_instance_name",
+ "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true",
+ "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429",
+ "vmx_int_ctl_len": "24",
+ "vmxvpfe_sriov43_0_port_vlanstrip": "false",
+ "vmxvpfe_sriov41_0_port_broadcastallow": "true",
+ "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d",
+ "vmxvpfe_sriov41_0_port_vlanfilter": "4001",
+ "nf_role": "MIS",
+ "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a",
+ "vmxvpfe_sriov42_0_port_unknownunicastallow": "true",
+ "vmxvpfe_flavor_name": "ns.c20r16d25.v5"
+ },
+ "type": "VF",
+ "modelCustomizationName": "2017 488 PASQUALE vPE 2 0",
+ "vfModules": {
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+ "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01",
+ "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4",
+ "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "properties": {
+ "minCountInstances": null,
+ "maxCountInstances": null,
+ "initialCount": null,
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
+ "baseModule" : false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": true
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+ "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f",
+ "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589",
+ "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "PASQUALE_vRE_BV",
+ "baseModule" : false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": true
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0": {
+ "uuid": "0a45a870-3a19-4238-a72a-eadfc583d4fe",
+ "invariantUuid": "c636b302-fba2-4ed7-9f3b-c99715b6bb2e",
+ "customizationUuid": "a0b634e6-514e-4977-91dd-3b8c295e6bc8",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": "PASQUALE_base_vPE_BV",
+ "baseModule" : true
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ }
+ },
+ "volumeGroups": {
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+ "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01",
+ "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4",
+ "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "properties": {
+ "minCountInstances": null,
+ "maxCountInstances": null,
+ "initialCount": null,
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
+ "baseModule" : false
+ },
+ "inputs": {}
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+ "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f",
+ "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589",
+ "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "PASQUALE_vRE_BV",
+ "baseModule" : false
+ },
+ "inputs": {}
+ }
+ },
+ "vfcInstanceGroups": {}
+ }
+ },
+ "networks": {},
+ "collectionResource": {},
+ "configurations": {},
+ "fabricConfigurations": {},
+ "serviceProxies": {},
+ "vfModules": {
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+ "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01",
+ "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4",
+ "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "properties": {
+ "minCountInstances": null,
+ "maxCountInstances": null,
+ "initialCount": null,
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
+ "baseModule" : false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": true
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0": {
+ "uuid": "0a45a870-3a19-4238-a72a-eadfc583d4fe",
+ "invariantUuid": "c636b302-fba2-4ed7-9f3b-c99715b6bb2e",
+ "customizationUuid": "a0b634e6-514e-4977-91dd-3b8c295e6bc8",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": "PASQUALE_base_vPE_BV",
+ "baseModule" : true
+ },
+ "inputs": {},
+ "volumeGroupAllowed": false
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+ "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f",
+ "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589",
+ "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "PASQUALE_vRE_BV",
+ "baseModule" : false
+ },
+ "inputs": {},
+ "volumeGroupAllowed": true
+ }
+ },
+ "volumeGroups": {
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+ "uuid": "13bea14d-9405-43c6-920b-97bab64b6a01",
+ "invariantUuid": "83dc51de-a337-498e-9fee-763603a057b4",
+ "customizationUuid": "a90865d5-6de0-4ef8-bf53-d45fa3edddfc",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+ "properties": {
+ "minCountInstances": null,
+ "maxCountInstances": null,
+ "initialCount": null,
+ "vfModuleLabel": "PASQUALE_vPFE_BV",
+ "baseModule" : false
+ },
+ "inputs": {}
+ },
+ "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+ "uuid": "3f6d5e51-a9a0-4c53-bb6d-be836767d96f",
+ "invariantUuid": "54466b6d-e33c-4f4d-87e2-32bc5b103589",
+ "customizationUuid": "dba1d1ff-77e2-4f4d-b1b4-1bed564f13b1",
+ "description": null,
+ "name": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "version": "1",
+ "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": "PASQUALE_vRE_BV",
+ "baseModule" : false
+ },
+ "inputs": {}
+ }
+ },
+ "pnfs": {},
+ "vnfGroups": {}
+}
diff --git a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json
new file mode 100644
index 000000000..4097fd936
--- /dev/null
+++ b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json
@@ -0,0 +1,363 @@
+{
+ "service": {
+ "uuid": "281b5f7d-c7ac-4ea9-92fb-2c1d625ca681",
+ "invariantUuid": "a977af77-db15-4375-a637-e9b994ecd569",
+ "name": "vMME_rVPMS_FE AIC3.0-11.2.1.7_SVC",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Emanuel",
+ "serviceType": null,
+ "serviceRole": null,
+ "description": "New service for vMME vProbe Front End AIC3.0 VPMS Radcom 11.2.1.7. Front End includes Qrouter, vProbe aff, vLB Agent aff and vLB.",
+ "serviceEcompNaming": "true",
+ "instantiationType": null,
+ "inputs": {}
+ },
+ "vnfs": {
+ "vMMEvProbe_FE_AIC3-11.2.1_VF 1": {
+ "uuid": "245562de-3984-49ef-a708-6c9d7cfcabd1",
+ "invariantUuid": "124216d6-71d0-41c8-ac81-0c5acfee514a",
+ "description": " New service for vMME vProbe Front End AIC3.0 VPMS Radcom 11.2.1.7. Front End includes Qrouter, vProbe aff, vLB Agent aff and vLB. ",
+ "name": "vMMEvProbe_FE_AIC3-11.2.1_VF",
+ "version": "1.0",
+ "customizationUuid": "8293273d-0e76-4661-926f-06a01ad2e683",
+ "inputs": {},
+ "commands": {},
+ "properties": {},
+ "type": null,
+ "modelCustomizationName": "vMMEvProbe_FE_AIC3-11.2.1_VF 1",
+ "vfModules": {
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1": {
+ "uuid": "e67e5b39-1f3b-4692-beec-eda94a0375a5",
+ "invariantUuid": "21c1b57d-a618-4397-a7f4-9c37169ea09b",
+ "customizationUuid": "a7d59494-3710-4b05-b4cd-e45dadbdc7ac",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null,
+ "volumeGroupAllowed": true
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0": {
+ "uuid": "59bb7d14-278f-4ff5-bd5a-1a720c8b0d19",
+ "invariantUuid": "9b5589c2-e4d1-4456-a23b-e0001c349155",
+ "customizationUuid": "b9d6f6e8-e24a-4ad9-b863-1c3f6757bfe7",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": null,
+ "baseModule" : true
+ },
+ "inputs": null,
+ "volumeGroupAllowed": false
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2": {
+ "uuid": "530e5e9f-2e82-4946-bf59-630f4d7ef4de",
+ "invariantUuid": "d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd",
+ "customizationUuid": "c1f95365-716c-4f6c-9477-a8f760a2edce",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null,
+ "volumeGroupAllowed": true
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4": {
+ "uuid": "064385f9-795b-4fcb-9e3b-51d7d0ccad80",
+ "invariantUuid": "603e8f71-88ad-4bbf-9992-2e9a72a91e29",
+ "customizationUuid": "3b5efcd3-d14d-4b0e-91cf-937db5aa65b5",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null,
+ "volumeGroupAllowed": true
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3": {
+ "uuid": "85b712e0-af62-4255-aeb6-ec9ae0f4eb13",
+ "invariantUuid": "cba59330-855a-460b-8856-f6bff0dac6c2",
+ "customizationUuid": "962479d7-b5b7-4129-bf9f-bfe4775e7921",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null,
+ "volumeGroupAllowed": true
+ }
+ },
+ "volumeGroups": {
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1": {
+ "uuid": "e67e5b39-1f3b-4692-beec-eda94a0375a5",
+ "invariantUuid": "21c1b57d-a618-4397-a7f4-9c37169ea09b",
+ "customizationUuid": "a7d59494-3710-4b05-b4cd-e45dadbdc7ac",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2": {
+ "uuid": "530e5e9f-2e82-4946-bf59-630f4d7ef4de",
+ "invariantUuid": "d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd",
+ "customizationUuid": "c1f95365-716c-4f6c-9477-a8f760a2edce",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4": {
+ "uuid": "064385f9-795b-4fcb-9e3b-51d7d0ccad80",
+ "invariantUuid": "603e8f71-88ad-4bbf-9992-2e9a72a91e29",
+ "customizationUuid": "3b5efcd3-d14d-4b0e-91cf-937db5aa65b5",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3": {
+ "uuid": "85b712e0-af62-4255-aeb6-ec9ae0f4eb13",
+ "invariantUuid": "cba59330-855a-460b-8856-f6bff0dac6c2",
+ "customizationUuid": "962479d7-b5b7-4129-bf9f-bfe4775e7921",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null
+ }
+ },
+ "vfcInstanceGroups": {}
+ }
+ },
+ "networks": {},
+ "collectionResource": null,
+ "configurations": null,
+ "fabricConfigurations": {},
+ "serviceProxies": null,
+ "vfModules": {
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1": {
+ "uuid": "e67e5b39-1f3b-4692-beec-eda94a0375a5",
+ "invariantUuid": "21c1b57d-a618-4397-a7f4-9c37169ea09b",
+ "customizationUuid": "a7d59494-3710-4b05-b4cd-e45dadbdc7ac",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null,
+ "volumeGroupAllowed": true
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0": {
+ "uuid": "59bb7d14-278f-4ff5-bd5a-1a720c8b0d19",
+ "invariantUuid": "9b5589c2-e4d1-4456-a23b-e0001c349155",
+ "customizationUuid": "b9d6f6e8-e24a-4ad9-b863-1c3f6757bfe7",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Base_Module..module-0",
+ "properties": {
+ "minCountInstances": 1,
+ "maxCountInstances": 1,
+ "initialCount": 1,
+ "vfModuleLabel": null,
+ "baseModule" : true
+ },
+ "inputs": null,
+ "volumeGroupAllowed": false
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2": {
+ "uuid": "530e5e9f-2e82-4946-bf59-630f4d7ef4de",
+ "invariantUuid": "d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd",
+ "customizationUuid": "c1f95365-716c-4f6c-9477-a8f760a2edce",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null,
+ "volumeGroupAllowed": true
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4": {
+ "uuid": "064385f9-795b-4fcb-9e3b-51d7d0ccad80",
+ "invariantUuid": "603e8f71-88ad-4bbf-9992-2e9a72a91e29",
+ "customizationUuid": "3b5efcd3-d14d-4b0e-91cf-937db5aa65b5",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null,
+ "volumeGroupAllowed": true
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3": {
+ "uuid": "85b712e0-af62-4255-aeb6-ec9ae0f4eb13",
+ "invariantUuid": "cba59330-855a-460b-8856-f6bff0dac6c2",
+ "customizationUuid": "962479d7-b5b7-4129-bf9f-bfe4775e7921",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null,
+ "volumeGroupAllowed": true
+ }
+ },
+ "volumeGroups": {
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1": {
+ "uuid": "e67e5b39-1f3b-4692-beec-eda94a0375a5",
+ "invariantUuid": "21c1b57d-a618-4397-a7f4-9c37169ea09b",
+ "customizationUuid": "a7d59494-3710-4b05-b4cd-e45dadbdc7ac",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vprobe_eph..module-1",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2": {
+ "uuid": "530e5e9f-2e82-4946-bf59-630f4d7ef4de",
+ "invariantUuid": "d1fb14d9-0fa8-4ead-b5cc-be311c7a95bd",
+ "customizationUuid": "c1f95365-716c-4f6c-9477-a8f760a2edce",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlbagent_aff..module-2",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4": {
+ "uuid": "064385f9-795b-4fcb-9e3b-51d7d0ccad80",
+ "invariantUuid": "603e8f71-88ad-4bbf-9992-2e9a72a91e29",
+ "customizationUuid": "3b5efcd3-d14d-4b0e-91cf-937db5aa65b5",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_qrouter..module-4",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null
+ },
+ "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3": {
+ "uuid": "85b712e0-af62-4255-aeb6-ec9ae0f4eb13",
+ "invariantUuid": "cba59330-855a-460b-8856-f6bff0dac6c2",
+ "customizationUuid": "962479d7-b5b7-4129-bf9f-bfe4775e7921",
+ "description": null,
+ "name": "VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3",
+ "version": "1",
+ "modelCustomizationName": "vflorencevprobe_fe_aic31121_vf1..VflorencevprobeFeAic31121Vf..FE_Add_On_Module_vlb..module-3",
+ "properties": {
+ "minCountInstances": 0,
+ "maxCountInstances": null,
+ "initialCount": 0,
+ "vfModuleLabel": null,
+ "baseModule" : false
+ },
+ "inputs": null
+ }
+ },
+ "pnfs": null,
+ "vnfGroups": null
+}
diff --git a/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json
new file mode 100644
index 000000000..1bbddc11c
--- /dev/null
+++ b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json
@@ -0,0 +1,31 @@
+{
+ "serviceNetworks": [
+ {
+ "networkId": "7989a6d2-ba10-4a5d-8f15-4520bc833090",
+ "name": "DDDEEEFFF",
+ "nodeType": "Provider Network",
+ "nodeStatus": "Failed",
+ "vlans": [
+ {
+ "vlanIdOuter": "34612"
+ },
+ {
+ "vlanIdOuter": "8568012"
+ }
+ ]
+ },
+ {
+ "networkId": "e8e2332e-1f84-4237-bc97-3b5b842f52e4",
+ "name": "GGGHHHIII",
+ "nodeType": "Network",
+ "nodeStatus": "Assigned",
+ "vlans": [
+ {
+ "vlanIdOuter": "4"
+ }
+ ]
+ }
+ ],
+ "vnfNetworks": [
+ ]
+}
diff --git a/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json
new file mode 100644
index 000000000..952e36e3e
--- /dev/null
+++ b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json
@@ -0,0 +1,58 @@
+{
+ "serviceNetworks": [
+ ],
+ "vnfNetworks": [
+ {
+ "vnfId": "c015cc0f-0f37-4488-aabf-53795fd93cd3",
+ "networks": [
+ {
+ "networkId": "36517f3d-2bc2-48f5-aaf8-418520c54330",
+ "name": "AAAAABBBBCCCC",
+ "nodeType": "Provider Network",
+ "nodeStatus": "Assigned",
+ "vlans": [
+ {
+ "vlanIdOuter": "34123"
+ },
+ {
+ "vlanIdOuter": "65540"
+ }
+ ]
+ },
+ {
+ "networkId": "12347f3d-2bc2-48f5-aaf8-418520c54330",
+ "name": "DDDEEEE",
+ "nodeType": "Provider Network",
+ "nodeStatus": "Created",
+ "vlans": [
+ {
+ "vlanIdOuter": "12345"
+ },
+ {
+ "vlanIdOuter": "67890"
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "vnfId": "c55da606-cf38-42c7-bc3c-be8e23b19299",
+ "networks": [
+ {
+ "networkId": "12aa7f3d-2bc2-48f5-aaf8-418520c54330",
+ "name": "XXXYYYZZZ",
+ "nodeType": "Network",
+ "nodeStatus": "Created",
+ "vlans": [
+ {
+ "vlanIdOuter": "417695"
+ },
+ {
+ "vlanIdOuter": "783243"
+ }
+ ]
+ }
+ ]
+ }
+ ]
+}
diff --git a/vid-automation/src/test/resources/test_config.properties b/vid-automation/src/test/resources/test_config.properties
index db876b7df..01342158b 100644
--- a/vid-automation/src/test/resources/test_config.properties
+++ b/vid-automation/src/test/resources/test_config.properties
@@ -1,3 +1,2 @@
-test.loginId=vid1
-test.loginPassword=Kp8bJ4SXszM0WX
-
+test.loginId=us16807000
+test.loginPassword=us16807000 \ No newline at end of file
diff --git a/vid-automation/src/test/resources/viewEdit/aaiHomingDataResponse.json b/vid-automation/src/test/resources/viewEdit/aaiHomingDataResponse.json
new file mode 100644
index 000000000..5dfd2644b
--- /dev/null
+++ b/vid-automation/src/test/resources/viewEdit/aaiHomingDataResponse.json
@@ -0,0 +1,8 @@
+{
+ "cloudRegionID": "olson5b",
+ "cloudOwner": "irma-aic",
+ "tenantName": null,
+ "tenantID": "db1818f7f2e34862b378bfb2cc520f91",
+ "is-permitted": false,
+ "isPermitted": false
+} \ No newline at end of file