Merge from ecomp 718fd196 - Integration Tests

Issue-ID: VID-378

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

7 files changed, 54 insertions, 6 deletions

diff --git a/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
index 08534ce49..d1a777028 100644
--- a/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
+++ b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
@@ -1,12 +1,14 @@
 {
   "isDirty":true,
   "vnfs": {},
+  "vrfs": {},
   "instanceParams": [],
   "validationCounter": 0,
   "existingNames": {
     "wowservicewithvnfgroping": ""
   },
   "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingVnfGroupCounterMap": {},
   "existingNetworksCounterMap": {},
   "networks": {},
@@ -28,6 +30,12 @@
   "projectName": null,
   "rollbackOnFailure": false,
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "modelInfo": {
     "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
     "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
diff --git a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
index f1bbf1712..cb2f2011c 100644
--- a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
+++ b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
@@ -2,6 +2,7 @@
   "action": "None",
   "isDirty": true,
   "vnfs": {},
+  "vrfs": {},
   "instanceParams": [],
   "validationCounter": 0,
   "existingNames": {
@@ -9,6 +10,7 @@
     "vnf_group3_instance_name": ""
   },
   "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingVnfGroupCounterMap": {
     "daeb6568-cef8-417f-9075-ed259ce59f48": 3
   },
@@ -192,6 +194,12 @@
   "projectName": null,
   "rollbackOnFailure": false,
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "modelInfo": {
     "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
     "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
diff --git a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
index f43a1dd12..b7c6dc2a5 100644
--- a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
+++ b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
@@ -1,10 +1,12 @@
 {
   "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingVnfGroupCounterMap": {
     "daeb6568-cef8-417f-9075-ed259ce59f48": 2
   },
   "existingNetworksCounterMap": {},
   "vnfs": {},
+  "vrfs": {},
   "vnfGroups": {
     "VNF_GROUP1_INSTANCE_ID": {
       "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
@@ -163,6 +165,12 @@
   "rollbackOnFailure": false,
   "testApi": "VNF_API",
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "action": "Delete",
   "isDirty": true,
   "instanceId": "service-instance-id",
diff --git a/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json
index f83799308..7f4aca906 100644
--- a/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json
+++ b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json
@@ -3,7 +3,8 @@
     "vidNotions": {
       "instantiationUI": "serviceWithVnfGrouping",
       "modelCategory": "other",
-      "viewEditUI": "serviceWithVnfGrouping"
+      "viewEditUI": "serviceWithVnfGrouping",
+      "instantiationType": "ALaCarte"
     },
     "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
     "invariantUuid": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
@@ -19,12 +20,13 @@
     "inputs": {}
   },
   "vnfs": {},
+  "vrfs": {},
   "networks": {},
-  "collectionResource": {},
+  "collectionResources": {},
   "configurations": {},
   "fabricConfigurations": {},
   "serviceProxies": {
-    "vDOROTHEA_svc_vprs_proxy 0": {
+    "vdorothea_svc_vprs_proxy 0": {
       "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
       "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
       "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
@@ -80,7 +82,7 @@
         "quantity": 4
       },
       "members": {
-        "vDOROTHEA_svc_vprs_proxy 0": {
+        "vdorothea_svc_vprs_proxy 0": {
           "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
           "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
           "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
diff --git a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
index 734c13306..d6cf636de 100644
--- a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
+++ b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
@@ -2,12 +2,14 @@
   "action": "None",
   "isDirty": true,
   "vnfs": {},
+  "vrfs": {},
   "instanceParams": [],
   "validationCounter": 0,
   "existingNames": {
     "service_instance_name": ""
   },
   "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingVnfGroupCounterMap": {
     "daeb6568-cef8-417f-9075-ed259ce59f48": 2
   },
@@ -167,6 +169,12 @@
   "projectName": null,
   "rollbackOnFailure": false,
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "modelInfo": {
     "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
     "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
index 0f4bc3fa3..bb0334b7a 100644
--- a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
+++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
@@ -36,7 +36,7 @@
   },
   "instanceParams": [
     {
-      "2017488_PASQUALEvpe0_ASN": "AV_vPE"
+      "2017488_pasqualevpe0_ASN": "AV_vPE"
     }
   ],
   "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
@@ -51,6 +51,12 @@
     "modelName": "Grouping Service for Test",
     "modelVersion": "1.0"
   },
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "existingNames": {
     "abc": ""
   },
diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
index da9727e89..cabdbca38 100644
--- a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
+++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
@@ -8,6 +8,7 @@
   },
   "existingNetworksCounterMap": {},
   "existingVNFCounterMap": {},
+  "existingVRFCounterMap": {},
   "existingVnfGroupCounterMap": {
     "daeb6568-cef8-417f-9075-ed259ce59f48": 2,
     "c2b300e6-45de-4e5e-abda-3032bee2de56": 0
@@ -17,6 +18,12 @@
   "instanceName": "SERVICE_INSTANCE_NAME",
   "instanceParams": [],
   "isALaCarte": true,
+  "vidNotions": {
+    "instantiationUI": "serviceWithVnfGrouping",
+    "modelCategory": "other",
+    "viewEditUI": "serviceWithVnfGrouping",
+    "instantiationType": "ALaCarte"
+  },
   "isDirty": true,
   "lcpCloudRegionId": null,
   "modelInfo": {
@@ -205,5 +212,6 @@
       "vnfs": {}
     }
   },
-  "vnfs": {}
+  "vnfs": {},
+  "vrfs": {}
 }
\ No newline at end of file