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

29 files changed, 187 insertions, 169 deletions

diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json b/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json
index 9c6552b32..3e31a39df 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/add_network/mso_add_network_error.json
@@ -9,7 +9,7 @@
           "instanceName": "<SERVICE_INSTANCE_NAME>",
           "source": "VID",
           "suppressRollback": false,
-          "requestorId": "mo57174000",
+          "requestorId": "em1536000",
           "productFamilyId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb"
         },
         "modelInfo": {
diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_filter_vfc_ig_service_instance_by_id.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_filter_vfc_ig_service_instance_by_id.json
index d8ffb8095..d1e1a02be 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_filter_vfc_ig_service_instance_by_id.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_filter_vfc_ig_service_instance_by_id.json
@@ -14,7 +14,7 @@
         "result-data": [
           {
             "resource-type": "service-instance",
-            "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/dc3a893e-0104-4ef6-abfe-6c2932294a3f"
+            "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/dc3a893e-0104-4ef6-abfe-6c2932294a3f"
           }
         ]
       }
@@ -35,7 +35,7 @@
         "result-data": [
           {
             "resource-type": "service-instance",
-            "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/dc3a893e-0104-4ef6-abfe-6c2932294a3e"
+            "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/dc3a893e-0104-4ef6-abfe-6c2932294a3e"
           }
         ]
       }
diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA-ROBBINS_vfc_ig.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA-ROBBINS_vfc_ig.json
index 4d3ee7226..b33835f8b 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA-ROBBINS_vfc_ig.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA-ROBBINS_vfc_ig.json
@@ -7327,7 +7327,7 @@
               "relationship": [
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
@@ -7335,7 +7335,7 @@
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "JANET25"
+                      "relationship-value": "AAIAIC25"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -8399,7 +8399,7 @@
                 "relationship": [
                   {
                     "related-to": "tenant",
-                    "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                    "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                     "relationship-data": [
                       {
                         "relationship-key": "cloud-region.cloud-owner",
@@ -8407,7 +8407,7 @@
                       },
                       {
                         "relationship-key": "cloud-region.cloud-region-id",
-                        "relationship-value": "JANET25"
+                        "relationship-value": "AAIAIC25"
                       },
                       {
                         "relationship-key": "tenant.tenant-id",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json
index 42ab78f84..b13a7a481 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json
@@ -6739,7 +6739,7 @@
               "relationship": [
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
@@ -6747,7 +6747,7 @@
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "JANET25"
+                      "relationship-value": "AAIAIC25"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -9611,7 +9611,7 @@
                 "relationship": [
                   {
                     "related-to": "tenant",
-                    "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                    "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                     "relationship-data": [
                       {
                         "relationship-key": "cloud-region.cloud-owner",
@@ -9619,7 +9619,7 @@
                       },
                       {
                         "relationship-key": "cloud-region.cloud-region-id",
-                        "relationship-value": "JANET25"
+                        "relationship-value": "AAIAIC25"
                       },
                       {
                         "relationship-key": "tenant.tenant-id",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json
index d55471fde..91413a070 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-333.json
@@ -6,7 +6,7 @@
     },
     "simulatorResponse": {
       "responseCode": 200,
-      "file": "service-vDOROTHEASrv-csar.zip"
+      "file": "service-VdorotheaSrv-csar.zip"
     }
   },
   {
@@ -16,7 +16,7 @@
     },
     "simulatorResponse": {
       "responseCode": 200,
-      "file": "service-vDOROTHEASrv-csar_ecomp_false6.zip"
+      "file": "service-VdorotheaSrv-csar_ecomp_false6.zip"
     }
   },
   {
@@ -34,7 +34,7 @@
         "invariantUUID": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
         "name": "Demo Service",
         "version": "1.0",
-        "toscaModelURL": "./service-vDOROTHEASrv-csar.zip",
+        "toscaModelURL": "./service-VdorotheaSrv-csar.zip",
         "category": "TYLER SILVIA",
         "lifecycleState": "CERTIFIED",
         "lastUpdaterUserId": "rg276b",
@@ -60,7 +60,7 @@
         "invariantUUID": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
         "name": "Demo Service",
         "version": "1.0",
-        "toscaModelURL": "./service-vDOROTHEASrv-csar_ecomp_false6.zip",
+        "toscaModelURL": "./service-VdorotheaSrv-csar_ecomp_false6.zip",
         "category": "TYLER SILVIA",
         "lifecycleState": "CERTIFIED",
         "lastUpdaterUserId": "rg276b",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-444.json b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-444.json
index 3c85f240f..72422f652 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-444.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/add_subinterface/get_sdc_catalog_services_vid-test-444.json
@@ -6,7 +6,7 @@
     },
     "simulatorResponse": {
       "responseCode": 200,
-      "file": "service-vDOROTHEASrv-csar.zip"
+      "file": "service-VdorotheaSrv-csar.zip"
     }
   },
   {
@@ -24,7 +24,7 @@
         "invariantUUID": "709d1be4-9a3f-4a29-8c4d-a20465e808a3",
         "name": "Demo Service",
         "version": "1.0",
-        "toscaModelURL": "./service-vDOROTHEASrv-csar.zip",
+        "toscaModelURL": "./service-VdorotheaSrv-csar.zip",
         "category": "TYLER SILVIA",
         "lifecycleState": "CERTIFIED",
         "lastUpdaterUserId": "rg276b",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_aai_sub_details.json b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_aai_sub_details.json
index defbb58e2..bf7720c6b 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_aai_sub_details.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/browseASDC/get_aai_sub_details.json
@@ -22,7 +22,7 @@
               "service-instance":[
                 {
                   "service-instance-id":"414db2d4-18d0-415e-aac2-f255b586cfb5",
-                  "service-instance-name":"vFlowLogic-vflf_080117",
+                  "service-instance-name":"vRichardson-vflf_080117",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1502391806301",
@@ -32,7 +32,7 @@
                 },
                 {
                   "service-instance-id":"769be44e-981a-4da8-af3b-ca5fa76b7fb1",
-                  "service-instance-name":"vFlowLogic-vflp_080117",
+                  "service-instance-name":"vRichardson-vflp_080117",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1501712783617",
@@ -1718,13 +1718,13 @@
             "is-permitted":false
           },
           {
-            "service-type":"vMME",
+            "service-type":"vFLORENCE",
             "resource-version":"1497729820723",
             "service-instances":{
               "service-instance":[
                 {
                   "service-instance-id":"26731151-6854-4936-8ddc-1eb2b28cef26",
-                  "service-instance-name":"vMME_2017-33_Svc",
+                  "service-instance-name":"vFLORENCE_2017-33_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255152917",
@@ -1734,7 +1734,7 @@
                 },
                 {
                   "service-instance-id":"b75fb352-0719-465b-ba48-3aa7d781b394",
-                  "service-instance-name":"vMME1610Svc",
+                  "service-instance-name":"vFLORENCE1610Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148345",
@@ -1744,7 +1744,7 @@
                 },
                 {
                   "service-instance-id":"1d291ab5-0440-4263-8648-1846a09d6135",
-                  "service-instance-name":"vMME_1610_Svc",
+                  "service-instance-name":"vFLORENCE_1610_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148352",
@@ -1764,7 +1764,7 @@
                 },
                 {
                   "service-instance-id":"14ce9494-9a75-49bf-a898-3503697c29f1",
-                  "service-instance-name":"vMME+Svc+Jul+14",
+                  "service-instance-name":"vFLORENCE+Svc+Jul+14",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255135820",
@@ -1774,7 +1774,7 @@
                 },
                 {
                   "service-instance-id":"72960ff3-a1e9-493d-93f4-ac026b22326b",
-                  "service-instance-name":"vMME_CI_110216_Svc",
+                  "service-instance-name":"vFLORENCE_CI_110216_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255136021",
@@ -1784,7 +1784,7 @@
                 },
                 {
                   "service-instance-id":"c9bf0fc4-b621-40d1-8b89-7f8235171ffb",
-                  "service-instance-name":"vMME1.8_LAB_8152017_Svc",
+                  "service-instance-name":"vFLORENCE1.8_LAB_8152017_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1504727411210",
@@ -1794,7 +1794,7 @@
                 },
                 {
                   "service-instance-id":"aee4df10-4289-4ae1-acdc-7f8cffa61603",
-                  "service-instance-name":"xx_2017_417_vMME_0622_Svc",
+                  "service-instance-name":"xx_2017_417_vFLORENCE_0622_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1498675414340",
@@ -3970,7 +3970,7 @@
               "is-permitted":false
             },
             {
-              "service-type":"vMME",
+              "service-type":"vFLORENCE",
               "resource-version":"1497729820723",
               "is-permitted":false
             },
diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/ecompportal_getSessionSlotCheckInterval.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/ecompportal_getSessionSlotCheckInterval.json
index a71270e72..18643d792 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/ecompportal_getSessionSlotCheckInterval.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/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/main/resources/registration_to_simulator/changeManagement/get_aai_sub_details.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_aai_sub_details.json
index defbb58e2..bf7720c6b 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_aai_sub_details.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_aai_sub_details.json
@@ -22,7 +22,7 @@
               "service-instance":[
                 {
                   "service-instance-id":"414db2d4-18d0-415e-aac2-f255b586cfb5",
-                  "service-instance-name":"vFlowLogic-vflf_080117",
+                  "service-instance-name":"vRichardson-vflf_080117",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1502391806301",
@@ -32,7 +32,7 @@
                 },
                 {
                   "service-instance-id":"769be44e-981a-4da8-af3b-ca5fa76b7fb1",
-                  "service-instance-name":"vFlowLogic-vflp_080117",
+                  "service-instance-name":"vRichardson-vflp_080117",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1501712783617",
@@ -1718,13 +1718,13 @@
             "is-permitted":false
           },
           {
-            "service-type":"vMME",
+            "service-type":"vFLORENCE",
             "resource-version":"1497729820723",
             "service-instances":{
               "service-instance":[
                 {
                   "service-instance-id":"26731151-6854-4936-8ddc-1eb2b28cef26",
-                  "service-instance-name":"vMME_2017-33_Svc",
+                  "service-instance-name":"vFLORENCE_2017-33_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255152917",
@@ -1734,7 +1734,7 @@
                 },
                 {
                   "service-instance-id":"b75fb352-0719-465b-ba48-3aa7d781b394",
-                  "service-instance-name":"vMME1610Svc",
+                  "service-instance-name":"vFLORENCE1610Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148345",
@@ -1744,7 +1744,7 @@
                 },
                 {
                   "service-instance-id":"1d291ab5-0440-4263-8648-1846a09d6135",
-                  "service-instance-name":"vMME_1610_Svc",
+                  "service-instance-name":"vFLORENCE_1610_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255148352",
@@ -1764,7 +1764,7 @@
                 },
                 {
                   "service-instance-id":"14ce9494-9a75-49bf-a898-3503697c29f1",
-                  "service-instance-name":"vMME+Svc+Jul+14",
+                  "service-instance-name":"vFLORENCE+Svc+Jul+14",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255135820",
@@ -1774,7 +1774,7 @@
                 },
                 {
                   "service-instance-id":"72960ff3-a1e9-493d-93f4-ac026b22326b",
-                  "service-instance-name":"vMME_CI_110216_Svc",
+                  "service-instance-name":"vFLORENCE_CI_110216_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1494255136021",
@@ -1784,7 +1784,7 @@
                 },
                 {
                   "service-instance-id":"c9bf0fc4-b621-40d1-8b89-7f8235171ffb",
-                  "service-instance-name":"vMME1.8_LAB_8152017_Svc",
+                  "service-instance-name":"vFLORENCE1.8_LAB_8152017_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1504727411210",
@@ -1794,7 +1794,7 @@
                 },
                 {
                   "service-instance-id":"aee4df10-4289-4ae1-acdc-7f8cffa61603",
-                  "service-instance-name":"xx_2017_417_vMME_0622_Svc",
+                  "service-instance-name":"xx_2017_417_vFLORENCE_0622_Svc",
                   "persona-model-id":null,
                   "persona-model-version":null,
                   "resource-version":"1498675414340",
@@ -3970,7 +3970,7 @@
               "is-permitted":false
             },
             {
-              "service-type":"vMME",
+              "service-type":"vFLORENCE",
               "resource-version":"1497729820723",
               "is-permitted":false
             },
diff --git a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type.json b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type.json
index f0e1b5e7f..81c8ec8f6 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/changeManagement/get_vnf_data_by_globalid_and_service_type.json
@@ -7,7 +7,7 @@
         "simple"
       ]
     },
-    "body": "{\"start\": [\"business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vFlowLogic/service-instances\"],\"query\": \"query/vnf-topology-fromServiceInstance\"}"
+    "body": "{\"start\": [\"business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances\"],\"query\": \"query/vnf-topology-fromServiceInstance\"}"
   },
   "simulatorResponse": {
     "responseCode": 200,
@@ -16,7 +16,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",
@@ -29,19 +29,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",
@@ -54,19 +54,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",
@@ -79,19 +79,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",
@@ -104,19 +104,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",
@@ -129,19 +129,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",
@@ -164,34 +164,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",
@@ -214,54 +214,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",
@@ -284,14 +284,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",
@@ -314,14 +314,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",
@@ -344,24 +344,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",
@@ -384,24 +384,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",
@@ -424,59 +424,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",
@@ -499,59 +499,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/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"
             }
           ]
         },
         {
           "id": "1024648346",
           "node-type": "generic-vfmodule",
-          "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",
@@ -574,52 +574,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/main/resources/registration_to_simulator/create_configuration/aai_get_pnf_instances_by_region.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_pnf_instances_by_region.json
index bcfedebf2..467029dbf 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_pnf_instances_by_region.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_pnf_instances_by_region.json
@@ -7,7 +7,7 @@
     },
     "body": {
       "start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/<SERVICE-TYPE>/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"
+      "query": "query/pnf-fromModel-byRegion?cloudRegionId=AAIAIC25&equipVendor=Cisco&equipModel=Nexus%203048-TP"
     }
   },
   "simulatorResponse": {
diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_tenants.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_tenants.json
index 781dcb3f9..4740a6743 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_tenants.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_tenants.json
@@ -12,7 +12,7 @@
         "relationship": [
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
@@ -20,7 +20,7 @@
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "JANET25"
+                "relationship-value": "AAIAIC25"
               },
               {
                 "relationship-key": "tenant.tenant-id",
@@ -149,7 +149,7 @@
           "relationship": [
             {
               "related-to": "tenant",
-              "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+              "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
               "relationship-data": [
                 {
                   "relationship-key": "cloud-region.cloud-owner",
@@ -157,7 +157,7 @@
                 },
                 {
                   "relationship-key": "cloud-region.cloud-region-id",
-                  "relationship-value": "JANET25"
+                  "relationship-value": "AAIAIC25"
                 },
                 {
                   "relationship-key": "tenant.tenant-id",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_vnf_instances_by_region.json b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_vnf_instances_by_region.json
index 27d26f397..a03075db7 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_vnf_instances_by_region.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/create_configuration/aai_get_vnf_instances_by_region.json
@@ -5,7 +5,7 @@
     "queryParams": {
       "format": ["simple"]
     },
-    "body": {"start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c", "query": "query/queryvnfFromModelbyRegion?cloudRegionId=JANET25"}
+    "body": {"start": "/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances?model-version-id=2a2ea15f-07c6-4b89-bfca-e8aba39a34d6&model-invariant-id=a7eac2b3-8444-40ee-92e3-b3359b32445c", "query": "query/queryvnfFromModelbyRegion?cloudRegionId=AAIAIC25"}
   },
   "simulatorResponse": {
     "responseCode": 200,
diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json
index af955a40b..d8216c817 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_models_by_service_type_SILVIA_ROBBINS.json
@@ -9727,7 +9727,7 @@
                 }
               },
               {
-                "model-name": "4-27_vMME_Service",
+                "model-name": "4-27_vFLORENCE_Service",
                 "service-instance": {
                   "service-instance-id": "5164a1ed-d7ba-4e33-b82d-3a5f90543c47",
                   "service-instance-name": "Lital39887395",
@@ -9742,7 +9742,7 @@
                   "extra-property": [
                     {
                       "property-name": "model-ver.model-description",
-                      "property-value": "4-27_vMME_Service"
+                      "property-value": "4-27_vFLORENCE_Service"
                     },
                     {
                       "property-name": "model-ver.model-version-id",
@@ -9750,7 +9750,7 @@
                     },
                     {
                       "property-name": "model-ver.model-name",
-                      "property-value": "4-27_vMME_Service"
+                      "property-value": "4-27_vFLORENCE_Service"
                     },
                     {
                       "property-name": "model.model-type",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json
index 82ee8f555..07047cd70 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/create_new_instance/aai_get_subscribers_for_customer_SILVIA_ROBBINS.json
@@ -6739,7 +6739,7 @@
               "relationship": [
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
@@ -6747,7 +6747,7 @@
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "JANET25"
+                      "relationship-value": "AAIAIC25"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -9611,7 +9611,7 @@
                 "relationship": [
                   {
                     "related-to": "tenant",
-                    "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                    "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                     "relationship-data": [
                       {
                         "relationship-key": "cloud-region.cloud-owner",
@@ -9619,7 +9619,7 @@
                       },
                       {
                         "relationship-key": "cloud-region.cloud-region-id",
-                        "relationship-value": "JANET25"
+                        "relationship-value": "AAIAIC25"
                       },
                       {
                         "relationship-key": "tenant.tenant-id",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json b/vid-automation/src/main/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json
index 52b425bd8..43704f4de 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/ecompportal_getSessionSlotCheckInterval.json
+++ b/vid-automation/src/main/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/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json b/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json
index 00bf8911f..137d0de30 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/environment/activate/get_operational_environments_aai1.json
@@ -10,7 +10,7 @@
         "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea",
         "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": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb",
         "operational-environment-name": "Op Env Name",
         "operational-environment-type": "VNF",
-        "operational-environment-status": "Deactivate",
+        "operational-environment-status": "INACTIVE",
         "tenant-context": "Test",
         "workload-context": "VNF_Development",
         "resource-version": "1505228226913",
@@ -68,7 +68,7 @@
         "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec",
         "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"
@@ -77,7 +77,7 @@
         "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed",
         "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/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json b/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json
index 1977e6b71..ad8e3c09a 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/environment/attachManifest/get_attachable_operational_environment.json
@@ -10,7 +10,7 @@
         "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea",
         "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": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb",
           "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",
@@ -68,7 +68,7 @@
           "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec",
           "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"
@@ -77,7 +77,7 @@
           "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed",
           "operational-environment-name": "ECOMP Env Name",
           "operational-environment-type": "ONAP",
-          "operational-environment-status": "Deactivate",
+          "operational-environment-status": "INACTIVE",
           "tenant-context": "ECOMP Test",
           "workload-context": "ECOMP_Development",
           "resource-version": "1505228226912"
diff --git a/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json b/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json
index 8d6cd4ad7..fece3ffd1 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/environment/deactivate/get_operational_environments_aai1.json
@@ -10,7 +10,7 @@
         "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea",
         "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": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb",
         "operational-environment-name": "Op Env Name",
         "operational-environment-type": "VNF",
-        "operational-environment-status": "Deactivate",
+        "operational-environment-status": "INACTIVE",
         "tenant-context": "Test",
         "workload-context": "VNF_Development",
         "resource-version": "1505228226913",
@@ -68,7 +68,7 @@
         "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec",
         "operational-environment-name": "ECOMP Env Name",
         "operational-environment-type": "ONAP",
-        "operational-environment-status": "Deactivate",
+        "operational-environment-status": "INACTIVE",
         "tenant-context": "ECOMP Test",
         "workload-context": "ECOMP_Development",
         "resource-version": "1505228226912"
@@ -77,7 +77,7 @@
         "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed",
         "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/main/resources/registration_to_simulator/get_full_operational_environment.json b/vid-automation/src/main/resources/registration_to_simulator/get_full_operational_environment.json
index b25833bc2..7c97ce3c3 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/get_full_operational_environment.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/get_full_operational_environment.json
@@ -13,7 +13,7 @@
         "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea",
         "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",
@@ -42,7 +42,7 @@
           "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb",
           "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",
@@ -72,7 +72,7 @@
           "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec",
           "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",
@@ -101,7 +101,7 @@
           "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ef",
           "operational-environment-name": "new_name",
           "operational-environment-type": "VNF",
-          "operational-environment-status": "Deactivate",
+          "operational-environment-status": "INACTIVE",
           "tenant-context": "new_tenant",
           "workload-context": "new_workload_context",
           "resource-version": "1505228226913",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json b/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json
index 02938431c..2b5c92332 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/get_operational_environment.json
@@ -15,7 +15,7 @@
             "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ea",
             "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",
@@ -44,7 +44,7 @@
             "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974eb",
             "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",
@@ -73,7 +73,7 @@
             "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec",
             "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",
@@ -118,7 +118,7 @@
             "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ec",
             "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"
@@ -127,7 +127,7 @@
             "operational-environment-id": "f07ca256-96dd-40ad-b4d2-7a77e2a974ed",
             "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/main/resources/registration_to_simulator/sanity/aai_get_tenants.json b/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_tenants.json
index 254c35e8f..b6d2fc329 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_tenants.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/sanity/aai_get_tenants.json
@@ -12,7 +12,7 @@
         "relationship": [
           {
             "related-to": "tenant",
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
             "relationship-data": [
               {
                 "relationship-key": "cloud-region.cloud-owner",
@@ -20,7 +20,7 @@
               },
               {
                 "relationship-key": "cloud-region.cloud-region-id",
-                "relationship-value": "JANET25"
+                "relationship-value": "AAIAIC25"
               },
               {
                 "relationship-key": "tenant.tenant-id",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_cr_service_instance_by_id.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_cr_service_instance_by_id.json
index 589a4ffa1..e8cc77d7d 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_cr_service_instance_by_id.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_cr_service_instance_by_id.json
@@ -13,7 +13,7 @@
       "result-data": [
         {
           "resource-type": "service-instance",
-          "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7testCR"
+          "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7testCR"
         }
       ]
     }
diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id.json
index 6f5107e52..1534746c0 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id.json
@@ -13,7 +13,7 @@
       "result-data": [
         {
           "resource-type": "service-instance",
-          "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7b04f9d"
+          "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/3f93c7cb-2fd0-4557-9514-e189b7b04f9d"
         }
       ]
     }
diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id_test_sssdad.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id_test_sssdad.json
index e5cabc754..e0fef6c89 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id_test_sssdad.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_filter_service_instance_by_id_test_sssdad.json
@@ -13,7 +13,7 @@
       "result-data": [
         {
           "resource-type": "service-instance",
-          "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/VIRTUAL%20USP/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f6"
+          "resource-link": "/aai/v11/business/customers/customer/e433710f-9217-458d-a79d-1c7aff376d89/service-subscriptions/service-subscription/TYLER%20SILVIA/service-instances/service-instance/c187e9fe-40c3-4862-b73e-84ff056205f6"
         }
       ]
     }
diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json
index 897342b86..83a5dab2d 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_Emanuel.json
@@ -8366,7 +8366,7 @@
                 },
                 {
                   "service-instance-id": "8b5e21c0-6466-4ac5-919f-6469b2a65fe5",
-                  "service-instance-name": "VIK_test_vDOROTHEA",
+                  "service-instance-name": "VIK_test_VDOROTHEA",
                   "service-type": "",
                   "service-role": "",
                   "environment-context": "General_Revenue-Bearing",
@@ -27085,7 +27085,7 @@
                 },
                 {
                   "service-instance-id": "f416d2f3-92c1-43e3-8d36-2adb10e180bc",
-                  "service-instance-name": "oren-PASQUALE",
+                  "service-instance-name": "oren-pasquale",
                   "service-type": "",
                   "service-role": "",
                   "environment-context": "null",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json
index daf7d59f9..afc8f6853 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS.json
@@ -1348,7 +1348,7 @@
               "relationship": [
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
@@ -1356,7 +1356,7 @@
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "JANET25"
+                      "relationship-value": "AAIAIC25"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -1892,7 +1892,7 @@
                 "relationship": [
                   {
                     "related-to": "tenant",
-                    "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                    "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                     "relationship-data": [
                       {
                         "relationship-key": "cloud-region.cloud-owner",
@@ -1900,7 +1900,7 @@
                       },
                       {
                         "relationship-key": "cloud-region.cloud-region-id",
-                        "relationship-value": "JANET25"
+                        "relationship-value": "AAIAIC25"
                       },
                       {
                         "relationship-key": "tenant.tenant-id",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS_cr.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS_cr.json
index 5708e6d09..f9794bcc5 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS_cr.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_get_subscribers_for_customer_SILVIA-ROBBINS_cr.json
@@ -1348,7 +1348,7 @@
               "relationship": [
                 {
                   "related-to": "tenant",
-                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                  "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                   "relationship-data": [
                     {
                       "relationship-key": "cloud-region.cloud-owner",
@@ -1356,7 +1356,7 @@
                     },
                     {
                       "relationship-key": "cloud-region.cloud-region-id",
-                      "relationship-value": "JANET25"
+                      "relationship-value": "AAIAIC25"
                     },
                     {
                       "relationship-key": "tenant.tenant-id",
@@ -1892,7 +1892,7 @@
                 "relationship": [
                   {
                     "related-to": "tenant",
-                    "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/JANET25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
+                    "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/AAIAIC25/tenants/tenant/092eb9e8e4b7412e8787dd091bc58e86",
                     "relationship-data": [
                       {
                         "relationship-key": "cloud-region.cloud-owner",
@@ -1900,7 +1900,7 @@
                       },
                       {
                         "relationship-key": "cloud-region.cloud-region-id",
-                        "relationship-value": "JANET25"
+                        "relationship-value": "AAIAIC25"
                       },
                       {
                         "relationship-key": "tenant.tenant-id",
diff --git a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit_test_sssdad.json b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit_test_sssdad.json
index 23a37697b..c41be6563 100644
--- a/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit_test_sssdad.json
+++ b/vid-automation/src/main/resources/registration_to_simulator/search_for_service_instance/aai_named_query_for_view_edit_test_sssdad.json
@@ -55,6 +55,24 @@
                 },
                 "extra-properties": {
                 }
+              },
+              {
+                "model-name": "Proxy-Config-Instance",
+                "configuration": {
+                  "configuration-id": "9533-config-LB1114",
+                  "configuration-name": "dummy_instance_2",
+                  "configuration-type": "configuration-type-9533",
+                  "configuration-sub-type": "configuration-sub-type-9533",
+                  "model-invariant-id": "model-invariant-id-9533",
+                  "model-version-id": "model-version-id-9533",
+                  "orchestration-status": "PendingDelete",
+                  "operational-status": "",
+                  "configuration-selflink": "",
+                  "model-customization-id": "08a181aa-72eb-435f-9593-e88a3ad0a86b",
+                  "resource-version": "1504038855716"
+                },
+                "extra-properties": {
+                }
               }
             ]
           }