Merge changes Ib4430bf2,Icc0bdb9e,I2736b984

* changes:
  Merge from ecomp 718fd196 - Ext. Services Simulator
  Merge from ecomp 718fd196 - Integration Tests
  Merge from ecomp 718fd196 - Modern UI

41 files changed, 1346 insertions, 323 deletions

diff --git a/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
index 08534ce49..d1a777028 100644
--- a/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
+++ b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
@@ -1,12 +1,14 @@
 {
   "isDirty":true,
   "vnfs": {},
+  "vrfs": {},
   "instanceParams": [],
   "validationCounter": 0,
   "existingNames": {
     "wowservicewithvnfgroping": ""
   },
   "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingVnfGroupCounterMap": {},
   "existingNetworksCounterMap": {},
   "networks": {},
@@ -28,6 +30,12 @@
   "projectName": null,
   "rollbackOnFailure": false,
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "modelInfo": {
     "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
     "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
diff --git a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
index f1bbf1712..cb2f2011c 100644
--- a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
+++ b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
@@ -2,6 +2,7 @@
   "action": "None",
   "isDirty": true,
   "vnfs": {},
+  "vrfs": {},
   "instanceParams": [],
   "validationCounter": 0,
   "existingNames": {
@@ -9,6 +10,7 @@
     "vnf_group3_instance_name": ""
   },
   "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingVnfGroupCounterMap": {
     "daeb6568-cef8-417f-9075-ed259ce59f48": 3
   },
@@ -192,6 +194,12 @@
   "projectName": null,
   "rollbackOnFailure": false,
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "modelInfo": {
     "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
     "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
diff --git a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
index f43a1dd12..b7c6dc2a5 100644
--- a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
+++ b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
@@ -1,10 +1,12 @@
 {
   "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingVnfGroupCounterMap": {
     "daeb6568-cef8-417f-9075-ed259ce59f48": 2
   },
   "existingNetworksCounterMap": {},
   "vnfs": {},
+  "vrfs": {},
   "vnfGroups": {
     "VNF_GROUP1_INSTANCE_ID": {
       "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
@@ -163,6 +165,12 @@
   "rollbackOnFailure": false,
   "testApi": "VNF_API",
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "action": "Delete",
   "isDirty": true,
   "instanceId": "service-instance-id",
diff --git a/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json
index f83799308..7f4aca906 100644
--- a/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json
+++ b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json
@@ -3,7 +3,8 @@
     "vidNotions": {
       "instantiationUI": "serviceWithVnfGrouping",
       "modelCategory": "other",
-      "viewEditUI": "serviceWithVnfGrouping"
+      "viewEditUI": "serviceWithVnfGrouping",
+      "instantiationType": "ALaCarte"
     },
     "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
     "invariantUuid": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
@@ -19,12 +20,13 @@
     "inputs": {}
   },
   "vnfs": {},
+  "vrfs": {},
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {
-    "vDOROTHEA_svc_vprs_proxy 0": {
+    "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",
@@ -80,7 +82,7 @@
         "quantity": 4
       },
       "members": {
-        "vDOROTHEA_svc_vprs_proxy 0": {
+        "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",
diff --git a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
index 734c13306..d6cf636de 100644
--- a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
+++ b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
@@ -2,12 +2,14 @@
   "action": "None",
   "isDirty": true,
   "vnfs": {},
+  "vrfs": {},
   "instanceParams": [],
   "validationCounter": 0,
   "existingNames": {
     "service_instance_name": ""
   },
   "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingVnfGroupCounterMap": {
     "daeb6568-cef8-417f-9075-ed259ce59f48": 2
   },
@@ -167,6 +169,12 @@
   "projectName": null,
   "rollbackOnFailure": false,
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "modelInfo": {
     "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
     "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
index 0f4bc3fa3..bb0334b7a 100644
--- a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
+++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
@@ -36,7 +36,7 @@
   },
   "instanceParams": [
     {
-      "2017488_PASQUALEvpe0_ASN": "AV_vPE"
+      "2017488_pasqualevpe0_ASN": "AV_vPE"
     }
   ],
   "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
@@ -51,6 +51,12 @@
     "modelName": "Grouping Service for Test",
     "modelVersion": "1.0"
   },
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "existingNames": {
     "abc": ""
   },
diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
index da9727e89..cabdbca38 100644
--- a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
+++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
@@ -8,6 +8,7 @@
   },
   "existingNetworksCounterMap": {},
   "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingVnfGroupCounterMap": {
     "daeb6568-cef8-417f-9075-ed259ce59f48": 2,
     "c2b300e6-45de-4e5e-abda-3032bee2de56": 0
@@ -17,6 +18,12 @@
   "instanceName": "SERVICE_INSTANCE_NAME",
   "instanceParams": [],
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "isDirty": true,
   "lcpCloudRegionId": null,
   "modelInfo": {
@@ -205,5 +212,6 @@
       "vnfs": {}
     }
   },
-  "vnfs": {}
+  "vnfs": {},
+  "vrfs": {}
 }
\ No newline at end of file
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
index 47643d21e..a6c4dc16f 100644
--- 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
@@ -9,8 +9,8 @@
       "action": "Create",
       "rollbackOnFailure": "true",
       "vfModules": {
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
             "instanceName": "mimazepubi",
             "lcpCloudRegionId": "hvf6",
             "tenantId": "624eb554b0d147c19ff8885341760481",
@@ -21,50 +21,50 @@
             "modelInfo": {
               "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
               "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "modelVersion": "5",
               "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
               "modelUniqueId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
             },
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
             "isMissingData": false
           }
         },
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
             "instanceName": "puwesovabe",
             "volumeGroupName": "puwesovabe_vol",
-            "lcpCloudRegionId": "JANET25",
+            "lcpCloudRegionId": "AAIAIC25",
             "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"
+              "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",
+              "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",
+              "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": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
             "instanceName": "bnmgtrx",
             "volumeGroupName": "",
             "lcpCloudRegionId": "hvf6",
@@ -76,11 +76,11 @@
             "modelInfo": {
               "modelInvariantId": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
               "modelVersionId": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2",
+              "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",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
               "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a"
             },
             "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
@@ -95,7 +95,7 @@
       "instanceName": "2017-488_PASQUALE-vPE",
       "inMaint":false,
       "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "legacyRegion": "just another region",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "platformName": "xxx1",
@@ -128,7 +128,7 @@
       "inMaint":false,
       "legacyRegion": "lcpRegionText",
       "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "platformName": "xxx1",
       "lineOfBusiness": "zzz1",
@@ -188,7 +188,7 @@
   "tenantName": null,
   "aicZoneId": "JAG1",
   "aicZoneName": null,
-  "lcpCloudRegionId": "JANET25",
+  "lcpCloudRegionId": "AAIAIC25",
   "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
index 7fcc9b1eb..cc1d5b566 100644
--- 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
@@ -9,8 +9,8 @@
       "action": "Create",
       "rollbackOnFailure": "true",
       "vfModules": {
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
             "instanceName": "mimazepubi",
             "lcpCloudRegionId": "hvf6",
             "tenantId": "624eb554b0d147c19ff8885341760481",
@@ -21,50 +21,50 @@
             "modelInfo": {
               "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
               "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "modelVersion": "5",
               "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
               "modelUniqueId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
             },
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
             "isMissingData": false
           }
         },
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
             "instanceName": "puwesovabe",
             "volumeGroupName": "puwesovabe_vol",
-            "lcpCloudRegionId": "JANET25",
+            "lcpCloudRegionId": "AAIAIC25",
             "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"
+              "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",
+              "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",
+              "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": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2": {
             "instanceName": "bnmgtrx",
             "volumeGroupName": "",
             "lcpCloudRegionId": "hvf6",
@@ -76,11 +76,11 @@
             "modelInfo": {
               "modelInvariantId": "eff8cc59-53a1-4101-aed7-8cf24ecf8339",
               "modelVersionId": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2",
+              "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",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2",
               "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a"
             },
             "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a",
@@ -95,7 +95,7 @@
       "instanceName": "2017-488_PASQUALE-vPE",
       "inMaint":false,
       "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "legacyRegion": "just another region",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "platformName": "xxx1",
@@ -128,7 +128,7 @@
       "inMaint":false,
       "legacyRegion": "lcpRegionText",
       "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "platformName": "xxx1",
       "lineOfBusiness": "zzz1",
@@ -189,7 +189,7 @@
   "tenantName": null,
   "aicZoneId": "JAG1",
   "aicZoneName": null,
-  "lcpCloudRegionId": "JANET25",
+  "lcpCloudRegionId": "AAIAIC25",
   "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034",
   "isMultiStepDesign": false
 }
\ 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
index a95573558..50786d36b 100644
--- a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json
@@ -42,15 +42,15 @@
       },
       "uuid": "vnf-instance-model-version-id",
       "productFamilyId": null,
-      "lcpCloudRegionId": null,
+      "lcpCloudRegionId": "olson3",
+      "cloudOwner": "att-nc",
       "legacyRegion": null,
-      "tenantId": null,
+      "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
       "lineOfBusiness": null,
       "platformName": null,
       "vfModules": {},
       "networks": {
         "NETWORK1_INSTANCE_ID": {
-          "originalName": null,
           "trackById": "NETWORK1_INSTANCE_ID",
           "instanceName": "NETWORK1_INSTANCE_NAME",
           "action": "None",
@@ -65,16 +65,9 @@
             "modelCustomizationId": "network-instance-model-customization-id",
             "modelType": "network"
           },
-          "uuid": "network-instance-model-version-id",
-          "productFamilyId": null,
-          "lcpCloudRegionId": null,
-          "legacyRegion": null,
-          "tenantId": null,
-          "lineOfBusiness": null,
-          "platformName": null
+          "uuid": "network-instance-model-version-id"
         },
         "NETWORK2_INSTANCE_ID": {
-          "originalName": null,
           "trackById": "NETWORK2_INSTANCE_ID",
           "instanceName": "NETWORK2_INSTANCE_NAME",
           "action": "None",
@@ -89,13 +82,7 @@
             "modelCustomizationId": "network-instance-model-customization-id",
             "modelType": "network"
           },
-          "uuid": "network-instance-model-version-id",
-          "productFamilyId": null,
-          "lcpCloudRegionId": null,
-          "legacyRegion": null,
-          "tenantId": null,
-          "lineOfBusiness": null,
-          "platformName": null
+          "uuid": "network-instance-model-version-id"
         }
       }
     },
@@ -118,15 +105,16 @@
       },
       "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
       "productFamilyId": null,
-      "lcpCloudRegionId": null,
+      "lcpCloudRegionId": "hvf6",
+      "cloudOwner": "irma-aic",
       "legacyRegion": null,
-      "tenantId": null,
+      "tenantId": "88a6ca3ee0394ade9403f075db23167e",
       "lineOfBusiness": null,
       "platformName": null,
       "vfModules": {
         "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
           "2c1ca484-cbc2-408b-ab86-25a2c15ce280": {
-            "originalName": "VfVgeraldine..vflorence_vlc..module-1",
+            "originalName": "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1",
             "trackById": "2c1ca484-cbc2-408b-ab86-25a2c15ce280",
             "instanceName": "ss820f_0918_db",
             "action": "None",
@@ -203,13 +191,7 @@
         "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
         "modelType": "network"
       },
-      "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
-      "productFamilyId": null,
-      "lcpCloudRegionId": null,
-      "legacyRegion": null,
-      "tenantId": null,
-      "lineOfBusiness": null,
-      "platformName": null
+      "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
     },
     "NETWORK4_INSTANCE_ID": {
       "originalName": "ExtVL 0",
@@ -228,39 +210,9 @@
         "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
         "modelType": "network"
       },
-      "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
-      "productFamilyId": null,
-      "lcpCloudRegionId": null,
-      "legacyRegion": null,
-      "tenantId": null,
-      "lineOfBusiness": null,
-      "platformName": null
+      "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986"
     }
   },
-  "instanceName": "SERVICE_INSTANCE_NAME",
-  "action": "None",
-  "instanceId": "service-instance-id",
-  "orchStatus": "GARBAGE DATA",
-  "globalSubscriberId": "global-customer-id",
-  "subscriptionServiceType": "service-instance-type",
-  "owningEntityId": null,
-  "owningEntityName": null,
-  "productFamilyId": null,
-  "lcpCloudRegionId": null,
-  "tenantId": null,
-  "tenantName": null,
-  "aicZoneId": null,
-  "aicZoneName": null,
-  "projectName": null,
-  "rollbackOnFailure": null,
-  "isALaCarte": false,
-  "modelInfo": {
-    "modelInvariantId": "d27e42cf-087e-4d31-88ac-6c4b7585f800",
-    "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
-    "modelName": "vf_vEPDG",
-    "modelType": "service",
-    "modelVersion": "5.0"
-  },
   "validationCounter": 0,
   "vnfGroups": {},
   "existingVNFCounterMap": {
diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json
index 0fbf83070..013745c90 100644
--- a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json
@@ -15,7 +15,8 @@
     "vidNotions": {
       "instantiationUI": "legacy",
       "modelCategory": "other",
-      "viewEditUI": "legacy"
+      "viewEditUI": "legacy",
+      "instantiationType": "Macro"
     }
   },
   "vnfs": {
@@ -292,7 +293,7 @@
       "modelCustomizationName": "ExtVL 0"
     }
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {
     "Port Mirroring Configuration By Policy 0": {
       "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json
index b2ba2c7e9..7cf11c824 100644
--- a/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json
@@ -32,7 +32,7 @@
       "vfModules": {},
       "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
       "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "lineOfBusiness": "ONAP",
       "platformName": "platform",
@@ -51,44 +51,44 @@
     },
     "2017-488_PASQUALE-vPE 0": {
       "vfModules": {
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
             "instanceName": "VFinstancenameZERO",
             "action": "None",
             "modelInfo": {
               "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
               "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "modelVersion": "5",
               "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
             },
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
             "provStatus": "Prov Status",
             "orchStatus": "Active",
             "inMaint": true,
-            "lcpCloudRegionId": "JANET25",
+            "lcpCloudRegionId": "AAIAIC25",
             "tenantId": "092eb9e8e4b7412e8787dd091bc58e86"
           }
         },
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": {
             "instanceName": "VFinstancename",
             "action": "None",
             "volumeGroupName": "VFinstancename_vol_abc",
             "orchStatus": "Create",
             "provStatus": "Prov Status",
             "inMaint": false,
-            "lcpCloudRegionId": "JANET25",
+            "lcpCloudRegionId": "AAIAIC25",
             "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
             "modelInfo": {
               "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
               "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "modelVersion": "6",
               "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
             },
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
@@ -97,7 +97,7 @@
       },
       "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
       "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "lineOfBusiness": "ONAP",
       "platformName": "platform",
@@ -118,8 +118,8 @@
     },
     "2017-488_PASQUALE-vPE 0:0001": {
       "vfModules": {
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
             "instanceName": "VFinstancenameZERO_001",
             "action": "None",
             "provStatus": "Prov Status",
@@ -127,27 +127,27 @@
             "modelInfo": {
               "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
               "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "modelVersion": "5",
               "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
             },
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
           }
         },
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": {
             "instanceName": "VFinstancename_001",
             "action": "None",
             "volumeGroupName": "VFinstancename_vol_abc_001",
             "modelInfo": {
               "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
               "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "modelVersion": "6",
               "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
             },
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
@@ -157,7 +157,7 @@
 
       "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
       "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "lineOfBusiness": "ONAP",
       "platformName": "platform",
@@ -176,34 +176,34 @@
     },
     "2017-488_PASQUALE-vPE 0:0002": {
       "vfModules": {
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
             "instanceName": "VFinstancenameZERO_002",
             "action": "None",
             "modelInfo": {
               "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
               "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "modelVersion": "5",
               "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
             },
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
           }
         },
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": {
             "instanceName": "VFinstancename_002",
             "action": "None",
             "volumeGroupName": "VFinstancename_vol_abc_002",
             "modelInfo": {
               "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
               "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "modelVersion": "6",
               "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
             },
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
@@ -212,7 +212,7 @@
       },
       "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
       "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "lineOfBusiness": "ONAP",
       "platformName": "platform",
diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json
new file mode 100644
index 000000000..fda51c25a
--- /dev/null
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/serviceWithVrfTopology.json
@@ -0,0 +1,125 @@
+{
+  "instanceName": "SERVICE_INSTANCE_NAME",
+  "action": "None",
+  "globalSubscriberId": "global-customer-id",
+  "subscriptionServiceType": "service-instance-type",
+  "owningEntityId": null,
+  "productFamilyId": null,
+  "lcpCloudRegionId": null,
+  "tenantId": null,
+  "aicZoneId": null,
+  "projectName": null,
+  "rollbackOnFailure": null,
+  "aicZoneName": null,
+  "cloudOwner": null,
+  "owningEntityName": null,
+  "tenantName": null,
+  "instanceId": "service-instance-id",
+  "modelInfo": {
+    "modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
+    "modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8",
+    "modelName": "Service with VRF",
+    "modelVersion": "5.0",
+    "modelType": "service"
+  },
+  "isALaCarte": true,
+  "orchStatus": "GARBAGE DATA",
+  "collectionResources": {
+  },
+  "networks": {},
+  "vnfs": {},
+  "vnfGroups": {},
+  "vrfs": {
+    "VRF_INSTANCE_ID": {
+      "action": "None",
+      "cloudOwner": null,
+      "inMaint": false,
+      "instanceId": "VRF_INSTANCE_ID",
+      "instanceName": "VRF_INSTANCE_NAME",
+      "instanceType": null,
+      "lcpCloudRegionId": null,
+      "legacyRegion": null,
+      "lineOfBusiness": null,
+      "modelInfo": {
+        "modelVersionId": "9cac02be-2489-4374-888d-2863b4511a59",
+        "modelInvariantId": "b67a289b-1688-496d-86e8-1583c828be0a",
+        "modelCustomizationId":"dd024d73-9bd1-425d-9db5-476338d53433",
+        "modelName": "VRF Entry Configuration",
+        "modelVersion": "5.0",
+        "modelType": "configuration"
+      },
+      "vpns": {
+        "VPN_INSTANCE_ID": {
+          "action": "None",
+          "instanceId": "VPN_INSTANCE_ID",
+          "trackById": "VPN_INSTANCE_ID",
+          "instanceName": "VPN_INSTANCE_NAME",
+          "instanceType": "SERVICE-INFRASTRUCTURE",
+          "orchStatus": "Active",
+          "provStatus": "prov",
+          "inMaint": false,
+          "region": "USA,EMEA",
+          "customerId": "VPN1260",
+          "modelInfo": {
+            "modelVersionId": "vpn-model-version-id",
+            "modelInvariantId": "vpn-model-invariant-id",
+            "modelCustomizationId": "vpn-model-customization-id",
+            "modelName": "vf_vEPDG",
+            "modelVersion": "6.0",
+            "modelType": "vpnBinding"
+          },
+          "routeTargets": [
+            {
+              "globalRouteTarget": "mock-global-1",
+              "routeTargetRole": "mock-role-x"
+            }
+          ],
+          "uuid": "vpn-model-version-id"
+        }
+      },
+      "networks": {
+        "NETWORK_INSTANCE_ID": {
+          "action": "None",
+          "boundToVpn": true,
+          "inMaint": false,
+          "instanceId": "NETWORK_INSTANCE_ID",
+          "instanceName": "NETWORK_INSTANCE_NAME",
+          "instanceType": "SR-IOV-PROVIDER2-2",
+          "modelInfo": {
+            "modelVersionId": "network-instance-model-version-id",
+            "modelInvariantId": "network-instance-model-invariant-id",
+            "modelCustomizationId": "network-instance-model-customization-id",
+            "modelType": "network",
+            "modelVersion": "6.0",
+            "modelName": "Network Entry"
+          },
+          "orchStatus": "Assigned",
+          "provStatus": "prov",
+          "role": "NETWORK_INSTANCE_ROLE",
+          "trackById": "NETWORK_INSTANCE_ID",
+          "uuid": "network-instance-model-version-id",
+          "routeTarget":
+            {
+              "globalRouteTarget": "mock-global-1",
+              "routeTargetRole": "mock-role-x"
+            }
+        }
+      },
+      "orchStatus": "Create",
+      "originalName": "VRF Entry Configuration 0",
+      "platformName": null,
+      "productFamilyId": null,
+      "provStatus": null,
+      "tenantId": null,
+      "trackById": "VRF_INSTANCE_ID",
+      "uuid": "9cac02be-2489-4374-888d-2863b4511a59"
+    }
+  },
+  "validationCounter": 0,
+  "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {
+    "dd024d73-9bd1-425d-9db5-476338d53433":  1
+  },
+  "existingVnfGroupCounterMap": {},
+  "existingNetworksCounterMap": {}
+}
\ No newline at end of file
diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json
index ccf095294..869ff2d96 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceTreeForRetry_serviceInstance.json
@@ -6,6 +6,7 @@
     "modelType": "service",
     "modelVersion": "5.1"
   },
+  "vidNotions":null,
   "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489",
   "owningEntityName": "Lucine Sarika",
   "projectName": "zasaki",
@@ -47,6 +48,7 @@
     }
   },
   "networks": {},
+  "vrfs": {},
   "vnfGroups": {},
   "instanceParams": [],
   "pause": false,
diff --git a/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json
index d1c40594b..d27dd05cd 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/ServiceWithFailedServiceInstance.json
@@ -18,6 +18,7 @@
     "modelVersion": "5.1",
     "modelVersionId": "e3c34d88-a216-4f1d-a782-9af9f9588705"
   },
+  "vidNotions":null,
   "networks": {
   },
   "owningEntityId": "038d99af-0427-42c2-9d15-971b99b9b489",
@@ -35,6 +36,7 @@
   "trackById": "TRACK_BY_ID",
   "vnfGroups": {
   },
+  "vrfs": {},
   "vnfs": {
     "vSAMP12 1": {
       "action": "Create",
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json
index eeda4e59a..fe4aab145 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Network.json
@@ -4,9 +4,12 @@
   "vnfs":{
 
   },
+  "vrfs":{
+
+  },
   "instanceParams":[
     {
-      "2017488_PASQUALEvpe0_ASN":"AV_vPE"
+      "2017488_pasqualevpe0_ASN":"AV_vPE"
     }
   ],
   "validationCounter":0,
@@ -21,6 +24,9 @@
   "existingVnfGroupCounterMap":{
 
   },
+  "existingVRFCounterMap":{
+
+  },
   "existingNetworksCounterMap":{
     "94fdd893-4a36-4d70-b16a-ec29c54c184f":1
   },
@@ -87,7 +93,7 @@
   "subscriptionServiceType":"TYLER SILVIA",
   "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
   "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77",
-  "lcpCloudRegionId":"JANET25",
+  "lcpCloudRegionId":"AAIAIC25",
   "tenantId":"092eb9e8e4b7412e8787dd091bc58e86",
   "aicZoneId":"JAG1",
   "projectName":"WATKINS",
@@ -104,6 +110,12 @@
     "uuid":"6b528779-44a3-4472-bdff-9cd15ec93450"
   },
   "isALaCarte":true,
+  "vidNotions": {
+    "instantiationUI": "legacy",
+    "modelCategory": "other",
+    "viewEditUI": "legacy",
+    "instantiationType": "ALaCarte"
+  },
   "name":"action-data",
   "version":"1.0",
   "description":"",
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
index 3ee4a2b20..f54419169 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDelete1Create1Vnf.json
@@ -6,7 +6,7 @@
       "vfModules": {},
       "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
       "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "lineOfBusiness": "ONAP",
       "platformName": "platform",
@@ -25,30 +25,30 @@
     },
     "2017-488_PASQUALE-vPE 0": {
       "vfModules": {
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
             "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",
+              "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "modelVersion": "5",
               "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
             },
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
             "provStatus": "Prov Status",
             "orchStatus": "Active",
             "inMaint": true,
-            "lcpCloudRegionId": "JANET25",
+            "lcpCloudRegionId": "AAIAIC25",
             "tenantId": "092eb9e8e4b7412e8787dd091bc58e86"
           }
         },
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": {
             "instanceId": "VF_MODULE_INSTANCE_ID",
             "instanceName": "VFinstancename",
             "action": "None_Delete",
@@ -56,15 +56,15 @@
             "orchStatus": "Create",
             "provStatus": "Prov Status",
             "inMaint": false,
-            "lcpCloudRegionId": "JANET25",
+            "lcpCloudRegionId": "AAIAIC25",
             "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
             "modelInfo": {
               "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
               "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "modelVersion": "6",
               "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
             },
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
@@ -73,7 +73,7 @@
       },
       "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
       "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "lineOfBusiness": "ONAP",
       "platformName": "platform",
@@ -95,8 +95,8 @@
     },
     "2017-488_PASQUALE-vPE 0:0001": {
       "vfModules": {
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
             "instanceName": "VFinstancenameZERO_001",
             "action": "None",
             "provStatus": "Prov Status",
@@ -104,27 +104,27 @@
             "modelInfo": {
               "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
               "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "modelVersion": "5",
               "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
             },
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
           }
         },
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": {
             "instanceName": "VFinstancename_001",
             "action": "None",
             "volumeGroupName": "VFinstancename_vol_abc_001",
             "modelInfo": {
               "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
               "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "modelVersion": "6",
               "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
             },
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
@@ -133,7 +133,7 @@
       },
       "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
       "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "lineOfBusiness": "ONAP",
       "platformName": "platform",
@@ -152,34 +152,34 @@
     },
     "2017-488_PASQUALE-vPE 0:0002": {
       "vfModules": {
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
             "instanceName": "VFinstancenameZERO_002",
             "action": "None",
             "modelInfo": {
               "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
               "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "modelVersion": "5",
               "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0",
               "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
             },
             "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
           }
         },
-        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
-          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": {
+        "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1fshmc": {
             "instanceName": "VFinstancename_002",
             "action": "None",
             "volumeGroupName": "VFinstancename_vol_abc_002",
             "modelInfo": {
               "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
               "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
-              "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "modelVersion": "6",
               "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
-              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelCustomizationName": "2017488PasqualeVpe..PASQUALE_vRE_BV..module-1",
               "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
             },
             "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
@@ -188,7 +188,7 @@
       },
       "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
       "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "lineOfBusiness": "ONAP",
       "platformName": "platform",
@@ -243,6 +243,7 @@
       "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168"
     }
   },
+  "vrfs": {},
   "instanceParams": [],
   "validationCounter": 0,
   "existingNames": {
@@ -254,6 +255,7 @@
     "b3c76f73-eeb5-4fb6-9d31-72a889f1811c": 1
   },
   "existingVnfGroupCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingNetworksCounterMap": {},
   "networks": {},
   "vnfGroups": {},
@@ -280,6 +282,12 @@
     "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450"
   },
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "legacy",
+    "viewEditUI": "legacy",
+    "modelCategory": "other",
+    "instantiationType": "ALaCarte"
+  },
   "orchStatus": "Active",
   "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450",
   "testApi": "VNF_API"
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json
new file mode 100644
index 000000000..64f2b161d
--- /dev/null
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteMacroService.json
@@ -0,0 +1,139 @@
+{
+  "action":"Delete",
+  "isDirty":true,
+  "vnfs":{
+
+  },
+  "vrfs":{
+    "VRF_INSTANCE_ID":{
+      "action":"None_Delete",
+      "cloudOwner":null,
+      "inMaint":false,
+      "instanceId":"VRF_INSTANCE_ID",
+      "instanceName":"VRF_INSTANCE_NAME",
+      "instanceType":null,
+      "lcpCloudRegionId":"AAIAIC25",
+      "legacyRegion":null,
+      "lineOfBusiness":null,
+      "modelInfo":{
+        "modelVersionId":"9cac02be-2489-4374-888d-2863b4511a59",
+        "modelInvariantId":"b67a289b-1688-496d-86e8-1583c828be0a",
+        "modelCustomizationId":"dd024d73-9bd1-425d-9db5-476338d53433",
+        "modelName":"VRF Entry Configuration",
+        "modelVersion":"5.0",
+        "modelType":"collection"
+      },
+      "vpns":{
+        "VPN_INSTANCE_ID":{
+          "action":"None",
+          "instanceId":"VPN_INSTANCE_ID",
+          "trackById":"VPN_INSTANCE_ID",
+          "instanceName":"VPN_INSTANCE_NAME",
+          "instanceType":"SERVICE-INFRASTRUCTURE",
+          "orchStatus":"Active",
+          "provStatus":"prov",
+          "inMaint":false,
+          "modelInfo":{
+            "modelVersionId":"vpn-model-version-id",
+            "modelInvariantId":"vpn-model-invariant-id",
+            "modelCustomizationId":"vpn-model-customization-id",
+            "modelName":"vf_vEPDG",
+            "modelVersion":"6.0",
+            "modelType":"vpnBinding"
+          },
+          "routeTargets":[
+
+          ],
+          "uuid":"vpn-model-version-id"
+        }
+      },
+      "networks":{
+        "NETWORK_INSTANCE_ID":{
+          "action":"None",
+          "boundToVpn":true,
+          "inMaint":false,
+          "instanceId":"NETWORK_INSTANCE_ID",
+          "instanceName":"NETWORK_INSTANCE_NAME",
+          "instanceType":"SR-IOV-PROVIDER2-2",
+          "modelInfo":{
+            "modelVersionId":"network-instance-model-version-id",
+            "modelInvariantId":"network-instance-model-invariant-id",
+            "modelCustomizationId":"network-instance-model-customization-id",
+            "modelType":"network",
+            "modelVersion":"6.0",
+            "modelName":"Network Entry"
+          },
+          "orchStatus":"Assigned",
+          "provStatus":"prov",
+          "role":"NETWORK_INSTANCE_ROLE",
+          "trackById":"NETWORK_INSTANCE_ID",
+          "uuid":"network-instance-model-version-id"
+        }
+      },
+      "orchStatus":"Create",
+      "originalName":null,
+      "platformName":null,
+      "productFamilyId":null,
+      "provStatus":null,
+      "tenantId":"092eb9e8e4b7412e8787dd091bc58e86",
+      "trackById":"VRF_INSTANCE_ID",
+      "uuid":"9cac02be-2489-4374-888d-2863b4511a59"
+    }
+  },
+  "instanceParams":[
+
+  ],
+  "validationCounter":0,
+  "existingNames":{
+    "service_instance_name":""
+  },
+  "existingVNFCounterMap":{
+
+  },
+  "existingVRFCounterMap":{
+    "dd024d73-9bd1-425d-9db5-476338d53433":1
+  },
+  "existingVnfGroupCounterMap":{
+
+  },
+  "existingNetworksCounterMap":{
+
+  },
+  "networks":{
+
+  },
+  "vnfGroups":{
+
+  },
+  "bulkSize":1,
+  "instanceName":"InstanceName",
+  "globalSubscriberId":"global-customer-id",
+  "subscriptionServiceType":"service-instance-type",
+  "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+  "productFamilyId":null,
+  "lcpCloudRegionId":"AAIAIC25",
+  "tenantId":"092eb9e8e4b7412e8787dd091bc58e86",
+  "aicZoneId":"JAG1",
+  "projectName": "WATKINS",
+  "rollbackOnFailure":false,
+  "aicZoneName":"YUDFJULP-JAG1",
+  "cloudOwner":null,
+  "owningEntityName":"WayneHolland",
+  "tenantName":"USP-SIP-IC-24335-T-01",
+  "instanceId":"service-instance-id",
+  "modelInfo":{
+    "modelInvariantId":"dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
+    "modelVersionId":"f028b2e2-7080-4b13-91b2-94944d4c42d8",
+    "modelName":"Service with VRF",
+    "modelVersion":"5.0",
+    "modelType":"service"
+  },
+  "isALaCarte":false,
+  "orchStatus":"GARBAGE DATA",
+  "vidNotions":{
+    "instantiationUI":"infrastructureVpn",
+    "modelCategory":"other",
+    "viewEditUI":"infrastructureVpn",
+    "instantiationType":"Macro"
+  }
+}
\ 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
index 171568b89..fe595360d 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithNetwork.json
@@ -6,7 +6,7 @@
   },
   "instanceParams":[
     {
-      "2017488_PASQUALEvpe0_ASN":"AV_vPE"
+      "2017488_pasqualevpe0_ASN":"AV_vPE"
     }
   ],
   "validationCounter":0,
@@ -56,7 +56,7 @@
   "subscriptionServiceType":"TYLER SILVIA",
   "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
   "productFamilyId":"17cc1042-527b-11e6-beb8-9e71128cae77",
-  "lcpCloudRegionId":"JANET25",
+  "lcpCloudRegionId":"AAIAIC25",
   "tenantId":"092eb9e8e4b7412e8787dd091bc58e86",
   "aicZoneId":"JAG1",
   "projectName":"WATKINS",
diff --git a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json
index 695ce343b..ac5f7faf9 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/vidRequestDeleteServiceWithVnf.json
@@ -7,7 +7,7 @@
       },
       "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
       "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
-      "lcpCloudRegionId": "JANET25",
+      "lcpCloudRegionId": "AAIAIC25",
       "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
       "lineOfBusiness": "ONAP",
       "platformName": "platform",
diff --git a/vid-automation/src/test/resources/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
index 20831bec8..1f6a5eb2c 100644
--- 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
@@ -3,7 +3,7 @@
         {
           "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",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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",
@@ -16,19 +16,19 @@
             {
               "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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson"
             },
             {
               "id": "3481829392",
               "node-type": "generic-vnf",
-              "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec"
+              "url": "https://aai.onap.org: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",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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",
@@ -41,19 +41,19 @@
             {
               "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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson"
             },
             {
               "id": "3484520464",
               "node-type": "generic-vnf",
-              "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1"
+              "url": "https://aai.onap.org: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",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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",
@@ -66,19 +66,19 @@
             {
               "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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson"
             },
             {
               "id": "3783459064",
               "node-type": "generic-vnf",
-              "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165"
+              "url": "https://aai.onap.org: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",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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",
@@ -91,19 +91,19 @@
             {
               "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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson"
             },
             {
               "id": "3892133896",
               "node-type": "generic-vnf",
-              "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a"
+              "url": "https://aai.onap.org: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",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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",
@@ -116,19 +116,19 @@
             {
               "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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson"
             },
             {
               "id": "3418898432",
               "node-type": "generic-vnf",
-              "url": "https://aai.onap:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855"
+              "url": "https://aai.onap.org: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",
+          "url": "https://aai.onap.org: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",
@@ -151,34 +151,34 @@
             {
               "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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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"
+              "url": "https://aai.onap.org: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",
+          "url": "https://aai.onap.org: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",
@@ -201,54 +201,54 @@
             {
               "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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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",
+          "url": "https://aai.onap.org: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",
@@ -271,14 +271,14 @@
             {
               "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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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",
+          "url": "https://aai.onap.org: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",
@@ -301,14 +301,14 @@
             {
               "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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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",
+          "url": "https://aai.onap.org: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",
@@ -331,24 +331,24 @@
             {
               "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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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"
+              "url": "https://aai.onap.org: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",
+          "url": "https://aai.onap.org: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",
@@ -371,24 +371,24 @@
             {
               "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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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"
+              "url": "https://aai.onap.org: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",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855",
           "properties": {
             "vnf-id": "8e5e3ba1-3fe6-4d86-966e-f9f03dab4855",
             "vnf-name": "zolson3amdns02test2",
@@ -411,59 +411,59 @@
             {
               "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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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",
+          "url": "https://aai.onap.org: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",
@@ -486,52 +486,52 @@
             {
               "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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org: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"
+              "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82"
             }
           ]
         }
diff --git a/vid-automation/src/test/resources/cr/getTopologyWithCR.json b/vid-automation/src/test/resources/cr/getTopologyWithCR.json
new file mode 100644
index 000000000..c25b759ff
--- /dev/null
+++ b/vid-automation/src/test/resources/cr/getTopologyWithCR.json
@@ -0,0 +1,35 @@
+{
+  "action": "None",
+  "instanceName": "DrorSvcNetworkCollector_9",
+  "instanceId": "d2abf307-5c7c-4271-b300-83be2787ef3b",
+  "orchStatus": "Assigned",
+  "productFamilyId": null,
+  "lcpCloudRegionId": null,
+  "tenantId": null,
+  "cloudOwner": null,
+  "modelInfo": {
+    "modelInvariantId": "fedbf04e-4af8-4e0f-b5f6-15eb8a68579a",
+    "modelVersionId": "b0650fa9-145f-4c4a-98d9-c035f9cc72b1",
+    "modelName": "Dror_SVC_Network_Collector",
+    "modelType": "service",
+    "modelVersion": "3.0"
+  },
+  "globalSubscriberId": "21014aa2-526b-11e6-beb8-9e71128cae77",
+  "subscriptionServiceType": "VPE",
+  "owningEntityId": null,
+  "owningEntityName": null,
+  "tenantName": null,
+  "aicZoneId": null,
+  "aicZoneName": null,
+  "projectName": null,
+  "rollbackOnFailure": null,
+  "isALaCarte": false,
+  "vnfs": {},
+  "vrfs": {},
+  "networks": {},
+  "vnfGroups": {},
+  "validationCounter": 0,
+  "existingVNFCounterMap": {},
+  "existingNetworksCounterMap": {},
+  "existingVnfGroupCounterMap": {}
+}
diff --git a/vid-automation/src/test/resources/cr/serviceWithCrResponse.json b/vid-automation/src/test/resources/cr/serviceWithCrResponse.json
new file mode 100644
index 000000000..29cdcde93
--- /dev/null
+++ b/vid-automation/src/test/resources/cr/serviceWithCrResponse.json
@@ -0,0 +1,70 @@
+{
+  "service": {
+    "vidNotions": {
+      "instantiationUI": "serviceWithCollectionResource",
+      "modelCategory": "other",
+      "viewEditUI": "serviceWithCollectionResource",
+      "instantiationType": "Macro"
+    },
+    "uuid":"b0650fa9-145f-4c4a-98d9-c035f9cc72b1",
+    "invariantUuid":"fedbf04e-4af8-4e0f-b5f6-15eb8a68579a",
+    "name":"Dror_SVC_Network_Collector",
+    "version":"3.0",
+    "toscaModelURL":null,
+    "category":"Network L1-3",
+    "serviceType":"INFRASTRUCTURE",
+    "serviceRole":"","description":"VT feature CR part Dror",
+    "serviceEcompNaming":"true",
+    "instantiationType":"Macro",
+    "inputs":{}
+  },
+  "isDirty" : false,
+  "vnfs": {},
+  "vrfs": { },
+  "networks": {},
+  "collectionResources": {
+    "Dror_CR_Network_1810 0": {
+      "uuid":"648d4e9f-74dc-46f2-aab4-c114ee8df24b",
+      "invariantUuid":"34f62a07-17c2-4f0d-a50e-3ad516e04658",
+      "description":"Testing VT feature on 1810. CR part. Dror",
+      "name":"Dror_CR_Network_1810","version":"4.0",
+      "customizationUuid":"a5e69ff2-119c-4aca-9c0c-fe653f9e419e",
+      "inputs":{},
+      "commands":{},
+      "properties":{
+        "dror_cr_network_1810..NetworkCollection..0_network_collection_function":"vTSBC Customer Landing Network Collection",
+        "cr_role":"SUB-INTERFACE",
+        "cr_type":"L3-NETWORK",
+        "dror_cr_network_1810..NetworkCollection..0_network_collection_description":"Landing Networks for vTSBC Customer",
+        "ecomp_generated_naming":"false","dror_cr_network_1810..Fixed..1_quantity":"10"
+      },
+      "type":"CR",
+      "category":"Generic",
+      "subcategory":"Infrastructure",
+      "resourceVendor":"AT&T",
+      "resourceVendorRelease":"0.1",
+      "resourceVendorModelNumber":"",
+      "customizationUUID":"a5e69ff2-119c-4aca-9c0c-fe653f9e419e",
+      "networksCollection":{
+        "dror_cr_network_1810..NetworkCollection..0":{
+          "uuid":"0c5e0919-3a6e-47dd-98e9-ad7c55c3552f",
+          "invariantUuid":"2434c82c-8607-46d2-a4fd-da91a75294e1",
+          "name":"dror_cr_network_1810..NetworkCollection..0",
+          "version":"1",
+          "networkCollectionProperties":
+          {
+            "networkCollectionFunction":"vTSBC Customer Landing Network Collection",
+            "networkCollectionDescription":"Landing Networks for vTSBC Customer"
+          }
+        }
+      }
+    }
+  },
+  "configurations": {},
+  "fabricConfigurations": {},
+  "serviceProxies": {},
+  "vfModules": {},
+  "volumeGroups": {},
+  "pnfs": {},
+  "vnfGroups": {}
+}
diff --git a/vid-automation/src/test/resources/features.properties b/vid-automation/src/test/resources/features.properties
index 6f4f4efd4..782d28908 100644
--- a/vid-automation/src/test/resources/features.properties
+++ b/vid-automation/src/test/resources/features.properties
@@ -1,15 +1,32 @@
-FLAG_ASYNC_INSTANTIATION = true
-FLAG_ASYNC_JOBS = true
-FLAG_REGION_ID_FROM_REMOTE = true
 CREATE_INSTANCE_TEST = false
 EMPTY_DRAWING_BOARD_TEST = false
-FLAG_ADVANCED_PORTS_FILTER = true
 FLAG_ADD_MSO_TESTAPI_FIELD = true
-FLAG_UNASSIGN_SERVICE = true
-FLAG_COLLECTION_RESOURCE_SUPPORT = true
-FLAG_NETWORK_TO_ASYNC_INSTANTIATION = true
+FLAG_NETWORK_TO_ASYNC_INSTANTIATION = false
 FLAG_SERVICE_MODEL_CACHE = true
 FLAG_SHOW_ASSIGNMENTS = true
-FLAG_SHOW_VERIFY_SERVICE = false
-FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = false
-FLAG_HANDLE_SO_WORKFLOWS = false
\ No newline at end of file
+FLAG_SHOW_VERIFY_SERVICE = true
+FLAG_DEFAULT_VNF = true
+FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD = true
+FLAG_RESTRICTED_SELECT = false
+FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS = true
+FLAG_A_LA_CARTE_AUDIT_INFO=true
+FLAG_5G_IN_NEW_INSTANTIATION_UI = true
+FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS = true
+FLAG_ASYNC_ALACARTE_VNF = true
+FLAG_ASYNC_ALACARTE_VFMODULE= true
+FLAG_SUPPLEMENTARY_FILE = true
+FLAG_EXP_ANY_ALACARTE_NEW_INSTANTIATION_UI=false
+FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST=true
+FLAG_1810_CR_LET_SELECTING_COLLECTOR_TYPE_UNCONDITIONALLY=true
+FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE = true
+FLAG_1810_AAI_LOCAL_CACHE = true
+FLAG_1902_NEW_VIEW_EDIT= false
+FLAG_EXP_USE_DEFAULT_HOST_NAME_VERIFIER = false
+FLAG_1902_VNF_GROUPING = true
+FLAG_1902_RETRY_JOB = true
+FLAG_VF_MODULE_RESUME_STATUS_CREATE = true
+FLAG_EXP_CREATE_RESOURCES_IN_PARALLEL = false
+FLAG_1906_COMPONENT_INFO = false
+FLAG_1906_INSTANTIATION_API_USER_VALIDATION = true
+FLAG_1908_RESUME_MACRO_SERVICE=true
+FLAG_1908_RELEASE_TENANT_ISOLATION=true
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 74b8637aa..ef7396590 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
@@ -6,8 +6,8 @@
       "format": ["simple"]
     },
     "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=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP"
+      "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/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"
     }
   } ,
   "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 386c982c0..34ffff414 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
@@ -6,8 +6,8 @@
       "format": ["simple"]
     },
     "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=JANET25&equipVendor=Cisco&equipModel=Nexus%203048-TP"
+      "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/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"
     }
   } ,
   "simulatorResponse": {
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 c726590eb..ca175834b 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
@@ -10,7 +10,7 @@
       "modelCustomizationName": "Port Mirroring Configuration By Policy 1"
     },
     "cloudConfiguration": {
-      "lcpCloudRegionId": "JANET25"
+      "lcpCloudRegionId": "AAIAIC25"
     },
     "requestInfo": {
       "instanceName": "dummy_instance",
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 a71270e72..18643d792 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//v3/getSessionSlotCheckInterval"
+      "path": "/(ONAPPORTAL|ecompportal_att)/auxapi//v[0-9]+/getSessionSlotCheckInterval"
     },
     "simulatorResponse": {
       "responseCode": 200,
@@ -22,7 +22,7 @@
   {
     "simulatorRequest": {
       "method": "GET",
-      "path": "/ecompportal_att/auxapi/v3/getSessionSlotCheckInterval"
+      "path": "/(ONAPPORTAL|ecompportal_att)/auxapi/v[0-9]+/getSessionSlotCheckInterval"
     },
     "simulatorResponse": {
       "responseCode": 200,
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 596104b83..968f2d00c 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
@@ -10,7 +10,7 @@
         "operational-environment-id": "UUID_of_Operational_Environment",
         "operational-environment-name": "Op Env Name",
         "operational-environment-type": "VNF",
-        "operational-environment-status": "Activate",
+        "operational-environment-status": "ACTIVE",
         "tenant-context": "Test",
         "workload-context": "VNF_Development",
         "resource-version": "1505228226913",
@@ -39,7 +39,7 @@
           "operational-environment-id": "UUID of ECOMP Operational Environment",
           "operational-environment-name": "ECOMP Env Name",
           "operational-environment-type": "ONAP",
-          "operational-environment-status": "Activate",
+          "operational-environment-status": "ACTIVE",
           "tenant-context": "ECOMP Test",
           "workload-context": "ECOMP_Development",
           "resource-version": "1505228226912"
diff --git a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json
index 7fca48f10..d1bc1dbaf 100644
--- a/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json
+++ b/vid-automation/src/test/resources/registration_to_simulator/get_sdc_catalog_services_VflorenceRvpmsFeAic3011217Svc.json
@@ -22,7 +22,7 @@
       "body": {
         "uuid": "245562de-3984-49ef-a708-6c9d7cfcabd1",
         "invariantUUID": "124216d6-71d0-41c8-ac81-0c5acfee514a",
-        "name": "vMMEvProbe_FE_AIC3-11.2.1_VF",
+        "name": "vFLORENCEvProbe_FE_AIC3-11.2.1_VF",
         "version": "1.0",
         "toscaModelURL": "./service-VflorenceRvpmsFeAic3011217Svc-csar.csar.zip",
         "category": "Application L4+",
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
index 3b3f878f7..b8aea08ba 100644
--- 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
@@ -1,7 +1,7 @@
 {
   "simulatorRequest": {
     "method" : "GET",
-    "path" : "/ecompportal_att/auxapi//v3/user/1"
+    "path" : "/(ONAPPORTAL|ecompportal_att)/auxapi//v[0-9]+/user/1"
   } ,
   "simulatorResponse": {
     "responseCode": 200,
diff --git a/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json
index ff4b6d1b6..e61769508 100644
--- a/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json
+++ b/vid-automation/src/test/resources/sdcApiTest/aLaCarteInstantiationTypeResponse.json
@@ -3,7 +3,8 @@
     "vidNotions": {
       "instantiationUI": "legacy",
       "modelCategory": "other",
-      "viewEditUI": "legacy"
+      "viewEditUI": "legacy",
+      "instantiationType": "ALaCarte"
     },
     "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e",
     "invariantUuid": "d27e42cf-087e-4d31-88ac-6c4b7585f800",
@@ -19,6 +20,7 @@
     "inputs": {}
   },
   "vnfs": {},
+  "vrfs": {},
   "networks": {
     "MULTI_PROVIDER_PORT_GROUP 0": {
       "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2",
@@ -43,7 +45,7 @@
       "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0"
     }
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
diff --git a/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json
index 2136c84cb..582147ac2 100644
--- a/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json
+++ b/vid-automation/src/test/resources/sdcApiTest/emptyInstantiationTypeResponse.json
@@ -3,7 +3,8 @@
     "vidNotions": {
       "instantiationUI": "legacy",
       "modelCategory": "other",
-      "viewEditUI": "legacy"
+      "viewEditUI": "legacy",
+      "instantiationType": "ClientConfig"
     },
     "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e",
     "invariantUuid": "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba",
@@ -19,6 +20,7 @@
     "inputs": {}
   },
   "vnfs": {},
+  "vrfs": {},
   "networks": {
     "MULTI_PROVIDER_PORT_GROUP 0": {
       "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2",
@@ -43,7 +45,7 @@
       "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0"
     }
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
diff --git a/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json b/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json
index 07fd1d3a9..9f251ed7f 100644
--- a/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json
+++ b/vid-automation/src/test/resources/sdcApiTest/macroInstantiationTypeResponse.json
@@ -3,7 +3,8 @@
     "vidNotions": {
       "instantiationUI": "legacy",
       "modelCategory": "other",
-      "viewEditUI": "legacy"
+      "viewEditUI": "legacy",
+      "instantiationType": "Macro"
     },
     "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e",
     "invariantUuid": "a8dcd72d-d44d-44f2-aa85-53aa9ca99cba",
@@ -19,6 +20,7 @@
     "inputs": {}
   },
   "vnfs": {},
+  "vrfs": {},
   "networks": {
     "MULTI_PROVIDER_PORT_GROUP 0": {
       "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2",
@@ -43,7 +45,7 @@
       "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0"
     }
   },
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
diff --git a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json
index 785635cd6..2b648c1ed 100644
--- a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json
+++ b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponse.json
@@ -3,7 +3,8 @@
     "vidNotions": {
       "instantiationUI": "legacy",
       "modelCategory": "other",
-      "viewEditUI": "legacy"
+      "viewEditUI": "legacy",
+      "instantiationType": "ClientConfig"
     },
     "uuid": "43f13072-fe50-496b-b673-7af075d10143",
     "invariantUuid": "35fb95d8-d1f0-4e46-99ac-e01b423e8e3f",
@@ -17,7 +18,7 @@
     "serviceEcompNaming": "true",
     "instantiationType": "ClientConfig",
     "inputs": {
-      "2017488PASQUALEvpe20_ASN": {
+      "2017488pasqualevpe20_ASN": {
         "type": "string",
         "description": "AV/PE",
         "entry_schema": null,
@@ -26,7 +27,7 @@
         "required": true,
         "default": "AV_vPE"
       },
-      "2017488PASQUALEvpe20_bandwidth": {
+      "2017488pasqualevpe20_bandwidth": {
         "type": "string",
         "description": "Requested VPE bandwidth",
         "entry_schema": null,
@@ -35,7 +36,7 @@
         "required": true,
         "default": "10"
       },
-      "2017488PASQUALEvpe20_bandwidth_units": {
+      "2017488pasqualevpe20_bandwidth_units": {
         "type": "string",
         "description": "Units of bandwidth",
         "entry_schema": null,
@@ -44,7 +45,7 @@
         "required": true,
         "default": "Gbps"
       },
-      "2017488PASQUALEvpe20_AIC_CLLI": {
+      "2017488pasqualevpe20_AIC_CLLI": {
         "type": "string",
         "description": "AIC Site CLLI",
         "entry_schema": null,
@@ -53,7 +54,7 @@
         "required": true,
         "default": "ATLMY8GA"
       },
-      "2017488PASQUALEvpe20_vnf_config_template_version": {
+      "2017488pasqualevpe20_vnf_config_template_version": {
         "type": "string",
         "description": "VPE Software Version",
         "entry_schema": null,
@@ -62,7 +63,7 @@
         "required": true,
         "default": "17.2"
       },
-      "2017488PASQUALEvpe20_vnf_instance_name": {
+      "2017488pasqualevpe20_vnf_instance_name": {
         "type": "string",
         "description": "The hostname assigned to the vpe.",
         "entry_schema": null,
@@ -141,37 +142,37 @@
         "vnf_config_template_version": {
           "displayName": "vnf_config_template_version",
           "command": "get_input",
-          "inputName": "2017488PASQUALEvpe20_vnf_config_template_version"
+          "inputName": "2017488pasqualevpe20_vnf_config_template_version"
         },
         "bandwidth_units": {
           "displayName": "bandwidth_units",
           "command": "get_input",
-          "inputName": "2017488PASQUALEvpe20_bandwidth_units"
+          "inputName": "2017488pasqualevpe20_bandwidth_units"
         },
         "bandwidth": {
           "displayName": "bandwidth",
           "command": "get_input",
-          "inputName": "2017488PASQUALEvpe20_bandwidth"
+          "inputName": "2017488pasqualevpe20_bandwidth"
         },
         "AIC_CLLI": {
           "displayName": "AIC_CLLI",
           "command": "get_input",
-          "inputName": "2017488PASQUALEvpe20_AIC_CLLI"
+          "inputName": "2017488pasqualevpe20_AIC_CLLI"
         },
         "ASN": {
           "displayName": "ASN",
           "command": "get_input",
-          "inputName": "2017488PASQUALEvpe20_ASN"
+          "inputName": "2017488pasqualevpe20_ASN"
         },
         "vnf_instance_name": {
           "displayName": "vnf_instance_name",
           "command": "get_input",
-          "inputName": "2017488PASQUALEvpe20_vnf_instance_name"
+          "inputName": "2017488pasqualevpe20_vnf_instance_name"
         }
       },
       "properties": {
         "vmxvre_retype": "RE-VMX",
-        "vnf_config_template_version": "get_input:2017488PASQUALEvpe20_vnf_config_template_version",
+        "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",
@@ -217,7 +218,7 @@
         "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",
+        "AIC_CLLI": "get_input:2017488pasqualevpe20_AIC_CLLI",
         "vnf_name": "mtnj309me6vre",
         "vmxvpfe_sriov41_0_port_unknownunicastallow": "true",
         "vmxvre_volume_type_1": "HITACHI",
@@ -225,14 +226,14 @@
         "vmxvre_volume_type_0": "HITACHI",
         "vmxvpfe_volume_type_0": "HITACHI",
         "vmxvpfe_sriov43_0_port_broadcastallow": "true",
-        "bandwidth_units": "get_input:2017488PASQUALEvpe20_bandwidth_units",
+        "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",
+        "ASN": "get_input:2017488pasqualevpe20_ASN",
         "vmxvre_chassis_i2cid": "161",
         "vmxvpfe_name_0": "vPFEXI",
-        "bandwidth": "get_input:2017488PASQUALEvpe20_bandwidth",
+        "bandwidth": "get_input:2017488pasqualevpe20_bandwidth",
         "availability_zone_max_count": "1",
         "vmxvre_volume_size_0": "45.0",
         "vmxvre_volume_size_1": "50.0",
@@ -242,7 +243,7 @@
         "vmxvre_ore_present": "0",
         "vmxvre_volume_name_0": "vREXI_FBVolume",
         "vmxvre_type": "0",
-        "vnf_instance_name": "get_input:2017488PASQUALEvpe20_vnf_instance_name",
+        "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",
@@ -258,14 +259,14 @@
       "type": "VF",
       "modelCustomizationName": "2017 488 PASQUALE vPE 2 0",
       "vfModules": {
-        "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+        "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",
+          "name": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2",
           "version": "1",
-          "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+          "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2",
           "properties": {
             "minCountInstances": null,
             "maxCountInstances": null,
@@ -276,14 +277,14 @@
           "inputs": {},
           "volumeGroupAllowed": true
         },
-        "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+        "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",
+          "name": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1",
           "version": "1",
-          "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+          "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
@@ -294,14 +295,14 @@
           "inputs": {},
           "volumeGroupAllowed": true
         },
-        "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0": {
+        "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",
+          "name": "2017488PasqualeVpe2..PASQUALE_base_vPE_BV..module-0",
           "version": "1",
-          "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0",
+          "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_base_vPE_BV..module-0",
           "properties": {
             "minCountInstances": 1,
             "maxCountInstances": 1,
@@ -314,14 +315,14 @@
         }
       },
       "volumeGroups": {
-        "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+        "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",
+          "name": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2",
           "version": "1",
-          "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+          "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2",
           "properties": {
             "minCountInstances": null,
             "maxCountInstances": null,
@@ -331,14 +332,14 @@
           },
           "inputs": {}
         },
-        "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+        "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",
+          "name": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1",
           "version": "1",
-          "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+          "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1",
           "properties": {
             "minCountInstances": 0,
             "maxCountInstances": null,
@@ -352,20 +353,21 @@
       "vfcInstanceGroups": {}
     }
   },
+  "vrfs": {},
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {},
   "vfModules": {
-    "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+    "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",
+      "name": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2",
       "version": "1",
-      "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+      "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2",
       "properties": {
         "minCountInstances": null,
         "maxCountInstances": null,
@@ -376,14 +378,14 @@
       "inputs": {},
       "volumeGroupAllowed": true
     },
-    "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0": {
+    "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",
+      "name": "2017488PasqualeVpe2..PASQUALE_base_vPE_BV..module-0",
       "version": "1",
-      "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_base_vPE_BV..module-0",
+      "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_base_vPE_BV..module-0",
       "properties": {
         "minCountInstances": 1,
         "maxCountInstances": 1,
@@ -394,14 +396,14 @@
       "inputs": {},
       "volumeGroupAllowed": false
     },
-    "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+    "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",
+      "name": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1",
       "version": "1",
-      "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+      "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
@@ -414,14 +416,14 @@
     }
   },
   "volumeGroups": {
-    "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2": {
+    "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",
+      "name": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2",
       "version": "1",
-      "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vPFE_BV..module-2",
+      "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vPFE_BV..module-2",
       "properties": {
         "minCountInstances": null,
         "maxCountInstances": null,
@@ -431,14 +433,14 @@
       },
       "inputs": {}
     },
-    "2017488PASQUALEvpe20..2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1": {
+    "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",
+      "name": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1",
       "version": "1",
-      "modelCustomizationName": "2017488PASQUALEVpe2..PASQUALE_vRE_BV..module-1",
+      "modelCustomizationName": "2017488PasqualeVpe2..PASQUALE_vRE_BV..module-1",
       "properties": {
         "minCountInstances": 0,
         "maxCountInstances": null,
diff --git a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json
index 4097fd936..11c6b184b 100644
--- a/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json
+++ b/vid-automation/src/test/resources/sdcApiTest/minMaxInitialExpectedResponseOldCsar.json
@@ -2,30 +2,30 @@
   "service": {
     "uuid": "281b5f7d-c7ac-4ea9-92fb-2c1d625ca681",
     "invariantUuid": "a977af77-db15-4375-a637-e9b994ecd569",
-    "name": "vMME_rVPMS_FE AIC3.0-11.2.1.7_SVC",
+    "name": "vFLORENCE_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.",
+    "description": "New service for vFLORENCE 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": {
+    "vFLORENCEvProbe_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",
+      "description": " New service for vFLORENCE vProbe Front End AIC3.0 VPMS Radcom 11.2.1.7. Front End includes Qrouter, vProbe aff, vLB Agent aff and vLB. ",
+      "name": "vFLORENCEvProbe_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",
+      "modelCustomizationName": "vFLORENCEvProbe_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",
@@ -191,8 +191,9 @@
       "vfcInstanceGroups": {}
     }
   },
+  "vrfs": null,
   "networks": {},
-  "collectionResource": null,
+  "collectionResources": null,
   "configurations": null,
   "fabricConfigurations": {},
   "serviceProxies": null,
diff --git a/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks.json b/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks.json
new file mode 100644
index 000000000..471cd854d
--- /dev/null
+++ b/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks.json
@@ -0,0 +1,126 @@
+[
+  {
+    "action": "None",
+    "boundToVpn": true,
+    "cloudOwner": "att-nc",
+    "inMaint": false,
+    "instanceId": "3b3308d4-0cd3-43e4-9a7b-d1925c861131",
+    "instanceName": "AUK51a_oam_calea_net_0",
+    "role": "oam_calea_net_0",
+    "instanceType": "SR-IOV-PROVIDER2-0",
+    "orchStatus": "Active",
+    "physicalName": "sriovnet0",
+    "lcpCloudRegionId": "auk51a",
+    "serviceUUID": "1c98917b-8255-43c6-98f1-7a2942e75ce1",
+    "serviceName": "AUK51a_oam_calea_net_service_0",
+    "tenantName": "ecomp_ispt",
+    "tenantId": "b530fc990b6d4334bd45518bebca6a51",
+    "trackById": "3b3308d4-0cd3-43e4-9a7b-d1925c861131",
+    "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+    "modelInfo" : {
+      "modelCustomizationId": "e5f33853-f84c-4cdd-99f2-93846957aa18",
+      "modelInvariantId": "b9a9b549-0ee4-49fc-b4f2-5edc6701da68",
+      "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+      "modelType": "network"
+    }
+  },
+  {
+    "action": "None",
+    "boundToVpn": true,
+    "cloudOwner": "att-nc",
+    "inMaint": false,
+    "instanceId": "b45cdb14-7a80-4ebd-b979-b1d7c7620851",
+    "instanceName": "AUK51a_oam_calea_net_1",
+    "role": "oam_calea_net_1",
+    "instanceType": "SR-IOV-PROVIDER2-1",
+    "orchStatus": "Active",
+    "physicalName": "sriovnet1",
+    "lcpCloudRegionId": "auk51a",
+    "serviceUUID": "fc21e453-7ff4-438e-bc69-df1f9474b00a",
+    "serviceName": "AUK51a_oam_calea_net_service_1",
+    "tenantName": "ecomp_ispt",
+    "tenantId": "b530fc990b6d4334bd45518bebca6a51",
+    "trackById": "b45cdb14-7a80-4ebd-b979-b1d7c7620851",
+    "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+    "modelInfo" : {
+      "modelCustomizationId": "3b45cdb14-7a80-4ebd-b979-b1d7c7620851",
+      "modelInvariantId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135",
+      "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+      "modelType": "network"
+    }
+  },
+  {
+    "action": "None",
+    "boundToVpn": true,
+    "cloudOwner": "att-nc",
+    "inMaint": false,
+    "instanceId": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce",
+    "instanceName": "AUK51a_oam_calea_net_2",
+    "role": "oam_calea_net_2",
+    "instanceType": "SR-IOV-PROVIDER2-2",
+    "orchStatus": "Active",
+    "physicalName": "sriovnet2",
+    "lcpCloudRegionId": "auk51a",
+    "serviceUUID": "b28d8a84-7d93-4b56-b525-c239c1e780a4",
+    "serviceName": "AUK51a_oam_calea_net_service_2",
+    "tenantName": "ecomp_ispt",
+    "tenantId": "b530fc990b6d4334bd45518bebca6a51",
+    "trackById": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce",
+    "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+    "modelInfo" : {
+      "modelCustomizationId": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce",
+      "modelInvariantId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135",
+      "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+      "modelType": "network"
+    }
+  },
+  {
+    "action": "None",
+    "boundToVpn": true,
+    "cloudOwner": "att-nc",
+    "inMaint": false,
+    "instanceId": "95380967-0f1c-41e9-a47f-9baa3f90860c",
+    "instanceName": "AUK51a_oam_calea_net_3",
+    "role": "oam_calea_net_3",
+    "instanceType": "SR-IOV-PROVIDER2-3",
+    "orchStatus": "Active",
+    "physicalName": "sriovnet3",
+    "lcpCloudRegionId": "auk51a",
+    "serviceUUID": "f09bbb55-8942-4621-892f-4690a8e5570a",
+    "serviceName": "AUK51a_oam_calea_net_service_3",
+    "tenantName": "ecomp_ispt",
+    "tenantId": "b530fc990b6d4334bd45518bebca6a51",
+    "trackById": "95380967-0f1c-41e9-a47f-9baa3f90860c",
+    "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+    "modelInfo" : {
+      "modelCustomizationId": "95380967-0f1c-41e9-a47f-9baa3f90860c",
+      "modelInvariantId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135",
+      "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+      "modelType": "network"
+    }
+  },
+  {
+    "action": "None",
+    "boundToVpn": true,
+    "cloudOwner": "att-nc",
+    "inMaint": false,
+    "instanceId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135",
+    "instanceName": "AUK51a_oam_calea_net_0",
+    "instanceType": "SR-IOV-PROVIDER2-0",
+    "orchStatus": "Active",
+    "physicalName": "sriovnet0",
+    "lcpCloudRegionId": "auk51a",
+    "serviceUUID": "1c98917b-8255-43c6-98f1-7a2942e75ce1",
+    "serviceName": "AUK51a_oam_calea_net_service_0",
+    "tenantName": "ecomp_ispt",
+    "tenantId": "b530fc990b6d4334bd45518bebca6a51",
+    "trackById": "3b3308d4-0cd3-43e4-9a7b-d1925c861135",
+    "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+    "modelInfo" : {
+      "modelCustomizationId": "95380967-0f1c-41e9-a47f-9baa3f90860c",
+      "modelInvariantId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135",
+      "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+      "modelType": "network"
+    }
+  }
+]
\ No newline at end of file
diff --git a/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks2.json b/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks2.json
new file mode 100644
index 000000000..596a9f353
--- /dev/null
+++ b/vid-automation/src/test/resources/viewEdit/aaiGetActiveNetworks2.json
@@ -0,0 +1,22 @@
+[
+  {
+    "action":"None",
+    "instanceName":"CHICGIL01VDBE01_SubIntNtwk043",
+    "instanceId":"l3network2-550-as988q",
+    "orchStatus":"active",
+    "lcpCloudRegionId":"cloud-region-id-CC-ANAI-528",
+    "tenantId":"tenant-id-CC-ANAI-528T1",
+    "cloudOwner":"cloud-owner-CC-ANAI-528",
+    "modelInfo":{
+      "modelCustomizationId":"wgmn6PrJ5",
+      "modelType":"network"
+    },
+    "instanceType":"K6VD",
+    "inMaint":false,
+    "trackById":"l3network2-550-as988q",
+    "role":"X92XE0j",
+    "physicalName":"wq6OKbZMTY",
+    "tenantName":"tenant-name-CC-ANAI-528T1",
+    "boundToVpn":true
+  }
+]
\ No newline at end of file
diff --git a/vid-automation/src/test/resources/viewEdit/aaiGetVpnList.json b/vid-automation/src/test/resources/viewEdit/aaiGetVpnList.json
new file mode 100644
index 000000000..bc1f655c4
--- /dev/null
+++ b/vid-automation/src/test/resources/viewEdit/aaiGetVpnList.json
@@ -0,0 +1,155 @@
+[
+  {
+    "action": "None",
+    "inMaint": false,
+    "instanceId": "120d39fb-3627-473d-913c-d228dd0f8e5b",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1260",
+    "modelInfo": {
+      "modelType": "vpnBinding"
+    },
+    "routeTargets": [
+      {
+        "globalRouteTarget":"mock-global-1",
+        "routeTargetRole" : "mock-role-x"
+      },
+      {
+        "globalRouteTarget":"mock-global-2",
+        "routeTargetRole" : "mock-role-y"
+      }
+
+    ]
+  },
+  {
+    "action": "None",
+    "inMaint": false,
+    "instanceId": "c70391f3-a6e3-4874-9834-cbe12d7bf8b6",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1274",
+    "modelInfo": {
+      "modelCustomizationId": "cc3bff3f-cd4d-49bb-aac3-77e8e1168297",
+      "modelInvariantId": "e73127d5-c2de-43b2-bc02-602fa5c9aa29",
+      "modelVersionId": "94209bf1-67fa-4741-96fe-a2b3f86f84b2",
+      "modelType": "vpnBinding"
+    },
+    "routeTargets": []
+  },
+  {
+    "action": "None",
+    "inMaint": false,
+    "instanceId": "4776516b-7da2-446c-9ba7-47ca8c30c571",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1275",
+    "modelInfo": {
+      "modelType": "vpnBinding"
+    },
+    "routeTargets": []
+  },
+  {
+    "action": "None",
+    "inMaint": false,
+    "instanceId": "46fcb25a-e7ba-4d96-99ba-3bb6eae6aba7",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1271",
+    "modelInfo": {
+      "modelType": "vpnBinding"
+    },
+    "routeTargets": []
+  },
+  {
+    "action": "None",
+    "inMaint": false,
+    "instanceId": "ffefbe38-3087-418a-87ae-f6582a15be78",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1272",
+    "modelInfo": {
+      "modelType": "vpnBinding"
+    },
+    "routeTargets": []
+  },
+  {
+    "action": "None",
+    "inMaint": false,
+    "instanceId": "961d05be-ee41-40a2-8653-f603fc495175",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1273",
+    "modelInfo": {
+      "modelType": "vpnBinding"
+    },
+    "routeTargets": []
+  },
+  {
+    "action": "None",
+    "inMaint": false,
+    "instanceId": "14bcfc2f-bbee-4fd9-89a5-42eb5dbb08d5",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "913443",
+    "modelInfo": {
+      "modelType": "vpnBinding"
+    },
+    "routeTargets": []
+  },
+  {
+    "action": "None",
+    "inMaint": false,
+    "instanceId": "89d4c968-158c-4722-a22c-c5c2ccc17fd5",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1276",
+    "modelInfo": {
+      "modelType": "vpnBinding"
+    },
+    "routeTargets": []
+  },
+  {
+    "action": "None",
+    "inMaint": false,
+    "instanceId": "3e7834fb-a8e0-4243-a837-5352ccab4602",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1259",
+    "modelInfo": {
+      "modelType": "vpnBinding"
+    },
+    "routeTargets": []
+  },
+  {
+    "action": "None",
+    "inMaint": false,
+    "instanceId": "844a1ea7-556a-4e49-8aa3-171f1db4ea02",
+    "instanceName": "LPPVPN",
+    "platformName": "AVPN",
+    "instanceType": "SERVICE-INFRASTRUCTURE",
+    "region": "USA,EMEA",
+    "customerId": "VPN1277",
+    "modelInfo": {
+      "modelType": "vpnBinding"
+    },
+    "routeTargets": []
+  }
+]
\ No newline at end of file
diff --git a/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json b/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json
new file mode 100644
index 000000000..a3fcd0e4e
--- /dev/null
+++ b/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json
@@ -0,0 +1,213 @@
+{
+  "action": "Create",
+  "isDirty": false,
+  "vrfs": {
+    "VRF Entry Configuration 0": {
+      "originalName": null,
+      "trackById": "VRF1_INSTANCE_ID",
+      "action": "None",
+      "instanceId": "VRF1_INSTANCE_ID",
+      "instanceType": "VRF1_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": "vrf"
+      },
+      "uuid": "vnf-instance-model-version-id",
+      "productFamilyId": null,
+      "lcpCloudRegionId": "olson3",
+      "cloudOwner": "att-nc",
+      "legacyRegion": null,
+      "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e",
+      "lineOfBusiness": null,
+      "platformName": null,
+      "vfModules": {},
+      "networks": {
+        "NETWORK1_INSTANCE_ID": {
+          "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",
+            "modelName": "modelName",
+            "modelType": "network"
+          },
+          "uuid": "network-instance-model-version-id",
+          "productFamilyId": null,
+          "lcpCloudRegionId": null,
+          "legacyRegion": null,
+          "tenantId": null,
+          "lineOfBusiness": null,
+          "platformName": null
+        }
+      },
+      "vpns": {
+        "VPN1_INSTANCE_ID": {
+          "originalName": null,
+          "trackById": "VPN1_INSTANCE_ID",
+          "instanceName": "VPN1_INSTANCE_NAME",
+          "action": "None",
+          "instanceId": "VPN1_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",
+            "modelName": "modelName",
+            "modelType": "vpnBinding"
+          },
+          "uuid": "network-instance-model-version-id",
+          "productFamilyId": null,
+          "lcpCloudRegionId": null,
+          "legacyRegion": null,
+          "tenantId": null,
+          "lineOfBusiness": null,
+          "platformName": null
+        }
+      }
+    },
+    "VRF Entry Configuration": {
+      "uuid": "9cac02be-2489-4374-888d-2863b4511a59",
+      "invariantUuid": "b67a289b-1688-496d-86e8-1583c828be0a",
+      "description": "VRF Entry configuration object",
+      "name": "VRF Entry Configuration",
+      "version": "30.0",
+      "customizationUuid": "dd024d73-9bd1-425d-9db5-476338d53433",
+      "inputs": {},
+      "commands": {},
+      "properties": {
+        "ecomp_generated_naming": "false"
+      },
+      "type": "Configuration",
+      "modelCustomizationName": "VRF Entry Configuration 0",
+      "sourceNodes": [],
+      "collectorNodes": null,
+      "configurationByPolicy": false,
+      "vpns": {
+        "VRF Entry Configuration vpns 1": {
+          "instanceId": "120d39fb-3627-473d-913c-d228dd0f8e5b",
+          "instanceName": "LPPVPN",
+          "platformName": "AVPN",
+          "instanceType": "SERVICE-INFRASTRUCTURE",
+          "region": "USA,EMEA",
+          "customerId": "VPN1260",
+          "modelInfo": {
+            "modelCustomizationId": null,
+            "modelInvariantId": null,
+            "modelVersionId": null
+          },
+          "routeTargets": [
+            {
+              "globalRouteTarget": "globalRouteTarget_1",
+              "routeTargetRole": "routeTargetRole_1"
+            },
+            {
+              "globalRouteTarget": "globalRouteTarget_2",
+              "routeTargetRole": "routeTargetRole_2"
+            },
+            {
+              "globalRouteTarget": "globalRouteTarget_3",
+              "routeTargetRole": "routeTargetRole_3"
+            }
+          ],
+          "isSelected": true
+        }
+      },
+      "networks": {
+        "VRF Entry Configuration networks 1": {
+          "action": "None",
+          "boundToVpn": true,
+          "cloudOwner": "att-nc",
+          "inMaint": false,
+          "instanceId": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce",
+          "instanceName": "AUK51a_oam_calea_net_2",
+          "role": "oam_calea_net_2",
+          "instanceType": "SR-IOV-PROVIDER2-2",
+          "orchStatus": "Active",
+          "physicalName": "sriovnet2",
+          "lcpCloudRegionId": "auk51a",
+          "serviceUUID": "b28d8a84-7d93-4b56-b525-c239c1e780a4",
+          "serviceName": "AUK51a_oam_calea_net_service_2",
+          "tenantName": "ecomp_ispt",
+          "tenantId": "b530fc990b6d4334bd45518bebca6a51",
+          "trackById": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce",
+          "uuid": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+          "modelInfo": {
+            "modelCustomizationId": "10a74149-c9d7-4918-bbcf-d5fb9b1799ce",
+            "modelInvariantId": "3b3308d4-0cd3-43e4-9a7b-d1925c861135",
+            "modelVersionId": "77010093-df36-4dcb-8428-c3d02bf3f88d",
+            "modelType": "network"
+          },
+          "isSelected": true
+        }
+      }
+    }
+  },
+  "vnfs": {},
+  "instanceParams": [
+    {}
+  ],
+  "validationCounter": 0,
+  "existingNames": {
+    "dfd": ""
+  },
+  "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
+  "existingVnfGroupCounterMap": {},
+  "existingNetworksCounterMap": {},
+  "networks": {},
+  "vnfGroups": {},
+  "bulkSize": 1,
+  "instanceName": "dfd",
+  "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+  "subscriptionServiceType": "TYLER SILVIA",
+  "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+  "lcpCloudRegionId": "lcpCloudRegionId",
+  "tenantName": "tenantName",
+  "projectName": "WATKINS",
+  "rollbackOnFailure": true,
+  "aicZoneName": null,
+  "owningEntityName": "WayneHolland",
+  "testApi": "VNF_API",
+  "modelInfo": {
+    "modelInvariantId": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
+    "modelVersionId": "f028b2e2-7080-4b13-91b2-94944d4c42d8",
+    "modelName": "infraVPN",
+    "modelVersion": "1.0",
+    "uuid": "f028b2e2-7080-4b13-91b2-94944d4c42d8",
+    "modelUniqueId": "f028b2e2-7080-4b13-91b2-94944d4c42d8"
+  },
+  "isALaCarte": true,
+  "name": "infraVPN",
+  "version": "1.0",
+  "description": "ddd",
+  "category": "Network Service",
+  "uuid": "f028b2e2-7080-4b13-91b2-94944d4c42d8",
+  "invariantUuid": "dfc2c44c-2429-44ca-ae26-1e6dc1f207fb",
+  "serviceType": "BONDING",
+  "serviceRole": "INFRASTRUCTURE-VPN",
+  "vidNotions": {
+    "instantiationUI": "macroService",
+    "modelCategory": "other",
+    "viewEditUI": "legacy",
+    "instantiationType": "Macro"
+  },
+  "isEcompGeneratedNaming": true,
+  "isMultiStepDesign": false,
+  "subscriberName": "SILVIA ROBBINS"
+}
\ No newline at end of file
diff --git a/vid-automation/src/test/resources/vrf/vrfServiceRoleResponse.json b/vid-automation/src/test/resources/vrf/vrfServiceRoleResponse.json
new file mode 100644
index 000000000..d4a6b022e
--- /dev/null
+++ b/vid-automation/src/test/resources/vrf/vrfServiceRoleResponse.json
@@ -0,0 +1,87 @@
+{
+  "service": {
+      "vidNotions": {
+      "instantiationUI": "infrastructureVpn",
+      "modelCategory": "other",
+      "viewEditUI": "serviceWithVRF",
+      "instantiationType": "Macro"
+    },
+    "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+    "invariantUuid": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+    "name": "VRF Service for Test",
+    "version": "1.0",
+    "toscaModelURL": null,
+    "category": "Network L4+",
+    "serviceType": "INFRASTRUCTURE",
+    "serviceRole": "CONFIGURATION",
+    "description": "xxx",
+    "serviceEcompNaming": "true",
+    "instantiationType": "A-La-Carte",
+    "inputs": {}
+  },
+  "vnfs": {},
+  "vrfs": {
+    "VRF Entry Configuration 0": {
+      "uuid": "9cac02be-2489-4374-888d-2863b4511a59",
+      "invariantUuid": "b67a289b-1688-496d-86e8-1583c828be0a",
+      "description": "VRF Entry configuration object",
+      "name": "VRF Entry Configuration",
+      "version": "30.0",
+      "customizationUuid": "dd024d73-9bd1-425d-9db5-476338d53433",
+      "inputs": {},
+      "commands": {},
+      "properties": {
+        "ecomp_generated_naming": "false"
+      },
+      "type": "Configuration",
+      "modelCustomizationName": "VRF Entry Configuration 0",
+      "sourceNodes": [],
+      "collectorNodes": null,
+      "configurationByPolicy": false
+    }
+  },
+  "networks": {},
+  "collectionResources": {},
+  "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": { }
+}