Merge from ecomp 718fd196 - Integration Tests

Issue-ID: VID-378

Change-Id: Icc0bdb9ef37b1d429d47c2070f76d1ee63ad7489
Signed-off-by: Ittay Stern <ittay.stern@att.com>

2 files changed, 12 insertions, 12 deletions

diff --git a/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json b/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json
index ac62bb1e7..44f5766e6 100644
--- a/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json
+++ b/vid-automation/src/main/resources/presets_templates/PresetAAIGetSubDetailsGet.json
@@ -12,7 +12,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",
@@ -22,7 +22,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",
@@ -1755,13 +1755,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",
@@ -1771,7 +1771,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",
@@ -1781,7 +1781,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",
@@ -1801,7 +1801,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",
@@ -1811,7 +1811,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",
@@ -1821,7 +1821,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",
@@ -1831,7 +1831,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",
diff --git a/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json b/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json
index 0653899bf..039d2d558 100644
--- a/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json
+++ b/vid-automation/src/main/resources/presets_templates/PresetAAIGetTenants.json
@@ -5,7 +5,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",
@@ -13,7 +13,7 @@
           },
           {
             "relationship-key": "cloud-region.cloud-region-id",
-            "relationship-value": "JANET25"
+            "relationship-value": "AAIAIC25"
           },
           {
             "relationship-key": "tenant.tenant-id",