aboutsummaryrefslogtreecommitdiffstats
path: root/vid-automation/src/test/resources/VnfGroup
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-03-11 09:34:34 +0200
committerIttay Stern <ittay.stern@att.com>2019-03-17 17:02:43 +0200
commit66af8b9b391879be78660d6ccb0a1f1f9340b423 (patch)
treefc0d510f7ea28a437bcb1e3b950d1281ac88a4e4 /vid-automation/src/test/resources/VnfGroup
parent37ad0cc1d36ec6ff68ec39fcaaf2617eef7d08fe (diff)
Merge automation from ECOMP's repository
Reference commit in ECOMP: 8e92a8c6 Issue-ID: VID-378 Change-Id: Ia32f4813378ef95097f788246aa5b1172e20ca48 Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-automation/src/test/resources/VnfGroup')
-rw-r--r--vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json40
-rw-r--r--vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json204
-rw-r--r--vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json178
-rw-r--r--vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json139
-rw-r--r--vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json178
-rw-r--r--vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json114
-rw-r--r--vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json30
-rw-r--r--vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json65
-rw-r--r--vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json171
-rw-r--r--vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json123
-rw-r--r--vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json209
11 files changed, 1451 insertions, 0 deletions
diff --git a/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
new file mode 100644
index 000000000..08534ce49
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/ServiceWithVnfGroupsDeleteRequest.json
@@ -0,0 +1,40 @@
+{
+ "isDirty":true,
+ "vnfs": {},
+ "instanceParams": [],
+ "validationCounter": 0,
+ "existingNames": {
+ "wowservicewithvnfgroping": ""
+ },
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {},
+ "existingNetworksCounterMap": {},
+ "networks": {},
+ "vnfGroups": {},
+ "bulkSize": 1,
+ "instanceName": "wowServiceWithVnfGroping",
+ "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
+ "orchStatus": "ACTIVE",
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "owningEntityId": null,
+ "owningEntityName": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "tenantName": null,
+ "aicZoneId": null,
+ "aicZoneName": null,
+ "projectName": null,
+ "rollbackOnFailure": false,
+ "isALaCarte": true,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0"
+ },
+ "testApi": "VNF_API",
+ "action": "Delete"
+}
diff --git a/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
new file mode 100644
index 000000000..f1bbf1712
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/VnfGroupCreate1Delete1None1Request.json
@@ -0,0 +1,204 @@
+{
+ "action": "None",
+ "isDirty": true,
+ "vnfs": {},
+ "instanceParams": [],
+ "validationCounter": 0,
+ "existingNames": {
+ "service_instance_name": "",
+ "vnf_group3_instance_name": ""
+ },
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 3
+ },
+ "existingNetworksCounterMap": {},
+ "networks": {},
+ "vnfGroups": {
+ "VNF_GROUP1_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP1_INSTANCE_ID",
+ "instanceName": "VNF_GROUP1_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None_Delete",
+ "instanceId": "VNF_GROUP1_INSTANCE_ID",
+ "instanceType": "VNF_GROUP1_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs":{
+ "RELATED_VNF1_INSTANCE_ID":{
+ "action":"None_Delete",
+ "instanceName":"RELATED_VNF1_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF1_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "modelType":"vnf",
+ "modelName":"vf_vEPDG",
+ "modelVersion":"2.0"
+ },
+ "instanceType":"RELATED_VNF1_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF1_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF2_INSTANCE_ID":{
+ "action":"None_Delete",
+ "instanceName":"RELATED_VNF2_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF2_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF2_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF2_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF3_INSTANCE_ID":{
+ "action":"None_Delete",
+ "instanceName":"RELATED_VNF3_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF3_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF3_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF3_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ }
+ }
+ },
+ "VNF_GROUP2_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP2_INSTANCE_ID",
+ "instanceName": "VNF_GROUP2_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None",
+ "instanceId": "VNF_GROUP2_INSTANCE_ID",
+ "instanceType": "VNF_GROUP2_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "tenantId": null,
+ "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs": {}
+ },
+ "groupingservicefortest..ResourceInstanceGroup..0": {
+ "action": "Create",
+ "inMaint": false,
+ "rollbackOnFailure": "true",
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "isMissingData": false,
+ "trackById": "ag5aav86u4j",
+ "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceName": "VNF_GROUP3_INSTANCE_NAME",
+ "modelInfo": {
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "modelName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelVersion": "1",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelUniqueId": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "instanceParams": [{}
+ ],
+ "vnfs":{}
+ }
+ },
+ "bulkSize": 1,
+ "instanceName": "SERVICE_INSTANCE_NAME",
+
+ "instanceId": "service-instance-id",
+ "orchStatus": "GARBAGE DATA",
+ "globalSubscriberId": "global-customer-id",
+ "subscriptionServiceType": "service-instance-type",
+ "owningEntityId": null,
+ "owningEntityName": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "tenantName": null,
+ "aicZoneId": null,
+ "aicZoneName": null,
+ "projectName": null,
+ "rollbackOnFailure": false,
+ "isALaCarte": true,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0"
+ },
+
+ "testApi": "VNF_API"
+}
diff --git a/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
new file mode 100644
index 000000000..f43a1dd12
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/deleteServiceWith2VnfGroupsRequest_AndThreeGroupMembers.json
@@ -0,0 +1,178 @@
+{
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 2
+ },
+ "existingNetworksCounterMap": {},
+ "vnfs": {},
+ "vnfGroups": {
+ "VNF_GROUP1_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP1_INSTANCE_ID",
+ "instanceName": "VNF_GROUP1_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None_Delete",
+ "instanceId": "VNF_GROUP1_INSTANCE_ID",
+ "instanceType": "VNF_GROUP1_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs": {
+ "RELATED_VNF1_INSTANCE_ID": {
+ "action": "None_Delete",
+ "instanceName": "RELATED_VNF1_INSTANCE_NAME",
+ "instanceId": "RELATED_VNF1_INSTANCE_ID",
+ "orchStatus": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelVersionId": "7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "modelType": "vnf",
+ "modelName": "vf_vEPDG",
+ "modelVersion": "2.0"
+ },
+ "instanceType": "RELATED_VNF1_INSTANCE_TYPE",
+ "provStatus": null,
+ "inMaint": false,
+ "uuid": "7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "originalName": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "platformName": null,
+ "trackById": "RELATED_VNF1_INSTANCE_ID",
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantName": null
+ },
+ "RELATED_VNF2_INSTANCE_ID": {
+ "action": "None_Delete",
+ "instanceName": "RELATED_VNF2_INSTANCE_NAME",
+ "instanceId": "RELATED_VNF2_INSTANCE_ID",
+ "orchStatus": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType": "vnf"
+ },
+ "instanceType": "RELATED_VNF2_INSTANCE_TYPE",
+ "provStatus": null,
+ "inMaint": false,
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "platformName": null,
+ "trackById": "RELATED_VNF2_INSTANCE_ID",
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantName": null
+ },
+ "RELATED_VNF3_INSTANCE_ID": {
+ "action": "None_Delete",
+ "instanceName": "RELATED_VNF3_INSTANCE_NAME",
+ "instanceId": "RELATED_VNF3_INSTANCE_ID",
+ "orchStatus": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType": "vnf"
+ },
+ "instanceType": "RELATED_VNF3_INSTANCE_TYPE",
+ "provStatus": null,
+ "inMaint": false,
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "platformName": null,
+ "trackById": "RELATED_VNF3_INSTANCE_ID",
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantName": null
+ }
+ }
+ },
+ "VNF_GROUP2_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP2_INSTANCE_ID",
+ "instanceName": "VNF_GROUP2_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None_Delete",
+ "instanceId": "VNF_GROUP2_INSTANCE_ID",
+ "instanceType": "VNF_GROUP2_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "tenantId": null,
+ "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs": {}
+ }
+ },
+ "instanceParams": [],
+ "globalSubscriberId": "global-customer-id",
+ "subscriptionServiceType": "service-instance-type",
+ "projectName": null,
+ "owningEntityId": null,
+ "bulkSize": 1,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0"
+ },
+ "existingNames": {
+ "service_instance_name": ""
+ },
+ "instanceName": "SERVICE_INSTANCE_NAME",
+ "owningEntityName": null,
+ "rollbackOnFailure": false,
+ "testApi": "VNF_API",
+ "isALaCarte": true,
+ "action": "Delete",
+ "isDirty": true,
+ "instanceId": "service-instance-id",
+ "orchStatus": "GARBAGE DATA",
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "tenantName": null,
+ "aicZoneId": null,
+ "aicZoneName": null,
+ "networks": {},
+ "validationCounter": 0
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json
new file mode 100644
index 000000000..f83799308
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/groupingServiceRoleResponse.json
@@ -0,0 +1,139 @@
+{
+ "service": {
+ "vidNotions": {
+ "instantiationUI": "serviceWithVnfGrouping",
+ "modelCategory": "other",
+ "viewEditUI": "serviceWithVnfGrouping"
+ },
+ "uuid": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "invariantUuid": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "name": "Grouping Service for Test",
+ "version": "1.0",
+ "toscaModelURL": null,
+ "category": "Network L4+",
+ "serviceType": "INFRASTRUCTURE",
+ "serviceRole": "GROUPING",
+ "description": "xxx",
+ "serviceEcompNaming": "true",
+ "instantiationType": "A-La-Carte",
+ "inputs": {}
+ },
+ "vnfs": {},
+ "networks": {},
+ "collectionResource": {},
+ "configurations": {},
+ "fabricConfigurations": {},
+ "serviceProxies": {
+ "vDOROTHEA_svc_vprs_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
+ "name": "vDOROTHEA_Svc_vPRS Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274",
+ "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14",
+ "sourceModelName": "vDOROTHEA_Svc_vPRS"
+ },
+ "tsbc0001vm001_svc_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service tsbc0001vm001_Svc",
+ "name": "tsbc0001vm001_Svc Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "3d814462-30fb-4c62-b997-9aa360d27ead",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "28aeb8f6-5620-4148-8bfb-a5fb406f0309",
+ "sourceModelInvariant": "c989ab9a-33c7-46ec-b521-1b2daef5f047",
+ "sourceModelName": "tsbc0001vm001_Svc"
+ }
+ },
+ "vfModules": {},
+ "volumeGroups": {},
+ "pnfs": {},
+ "vnfGroups": {
+ "groupingservicefortest..ResourceInstanceGroup..0": {
+ "type": "VnfGroup",
+ "invariantUuid": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "version": "1",
+ "name": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "properties": {
+ "contained_resource_type": "VF",
+ "role": "SERVICE-ACCESS",
+ "function": "DATA",
+ "description": "DDD0",
+ "type": "LOAD-GROUP",
+ "ecomp_generated_naming": "true",
+ "quantity": 4
+ },
+ "members": {
+ "vDOROTHEA_svc_vprs_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service vDOROTHEA_Svc_vPRS",
+ "name": "vDOROTHEA_Svc_vPRS Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274",
+ "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14",
+ "sourceModelName": "vDOROTHEA_Svc_vPRS"
+ }
+ }
+ },
+ "groupingservicefortest..ResourceInstanceGroup..1": {
+ "type": "VnfGroup",
+ "invariantUuid": "a704112d-dbc6-4e56-8d4e-aec57e95ef9a",
+ "uuid": "c2b300e6-45de-4e5e-abda-3032bee2de56",
+ "version": "1",
+ "name": "groupingservicefortest..ResourceInstanceGroup..1",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..1",
+ "properties": {
+ "contained_resource_type": "VF",
+ "role": "SERVICE-ACCESS",
+ "function": "SIGNALING",
+ "description": "DDD1",
+ "type": "LOAD-GROUP",
+ "ecomp_generated_naming": "true",
+ "quantity": 3
+ },
+ "members": {
+ "tsbc0001vm001_svc_proxy 0": {
+ "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c",
+ "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc",
+ "description": "A Proxy for Service tsbc0001vm001_Svc",
+ "name": "tsbc0001vm001_Svc Service Proxy",
+ "version": "1.0",
+ "customizationUuid": "3d814462-30fb-4c62-b997-9aa360d27ead",
+ "inputs": {},
+ "commands": {},
+ "properties": {
+ "ecomp_generated_naming": "false"
+ },
+ "type": "Service Proxy",
+ "sourceModelUuid": "28aeb8f6-5620-4148-8bfb-a5fb406f0309",
+ "sourceModelInvariant": "c989ab9a-33c7-46ec-b521-1b2daef5f047",
+ "sourceModelName": "tsbc0001vm001_Svc"
+ }
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
new file mode 100644
index 000000000..734c13306
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/payloadTemplate1VnfGroupWith3MembersRequest.json
@@ -0,0 +1,178 @@
+{
+ "action": "None",
+ "isDirty": true,
+ "vnfs": {},
+ "instanceParams": [],
+ "validationCounter": 0,
+ "existingNames": {
+ "service_instance_name": ""
+ },
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 2
+ },
+ "existingNetworksCounterMap": {},
+ "networks": {},
+ "vnfGroups": {
+ "VNF_GROUP1_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP1_INSTANCE_ID",
+ "instanceName": "VNF_GROUP1_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "VNF_GROUP1_ACTION",
+ "instanceId": "VNF_GROUP1_INSTANCE_ID",
+ "instanceType": "VNF_GROUP1_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs": {
+ "RELATED_VNF1_INSTANCE_ID":{
+ "action":"RELATED_VNF1_ACTION",
+ "instanceName":"RELATED_VNF1_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF1_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "modelType":"vnf",
+ "modelName":"vf_vEPDG",
+ "modelVersion":"2.0"
+ },
+ "instanceType":"RELATED_VNF1_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF1_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF2_INSTANCE_ID":{
+ "action":"RELATED_VNF2_ACTION",
+ "instanceName":"RELATED_VNF2_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF2_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF2_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF2_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF3_INSTANCE_ID":{
+ "action":"None",
+ "instanceName":"RELATED_VNF3_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF3_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF3_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF3_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ }
+ }
+ },
+ "VNF_GROUP2_INSTANCE_ID": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "VNF_GROUP2_INSTANCE_ID",
+ "instanceName": "VNF_GROUP2_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None",
+ "instanceId": "VNF_GROUP2_INSTANCE_ID",
+ "instanceType": "VNF_GROUP2_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "tenantId": null,
+ "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "vnfs": {}
+ }
+ },
+ "bulkSize": 1,
+ "instanceName": "SERVICE_INSTANCE_NAME",
+ "instanceId": "service-instance-id",
+ "orchStatus": "GARBAGE DATA",
+ "globalSubscriberId": "global-customer-id",
+ "subscriptionServiceType": "service-instance-type",
+ "owningEntityId": null,
+ "owningEntityName": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "tenantName": null,
+ "aicZoneId": null,
+ "aicZoneName": null,
+ "projectName": null,
+ "rollbackOnFailure": false,
+ "isALaCarte": true,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0"
+ },
+ "testApi": "VNF_API"
+}
diff --git a/vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json b/vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json
new file mode 100644
index 000000000..e48e41c57
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json
@@ -0,0 +1,114 @@
+[
+ {
+ "action":"None",
+ "instanceName":"VNF1_INSTANCE_NAME",
+ "instanceId":"VNF1_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":"hvf23b",
+ "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenantName":"APPC-24595-T-IST-02C",
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "modelVersion":"2.0",
+ "modelName":"vf_vEPDG",
+ "modelType":"vnf"
+ },
+ "instanceType":"VNF1_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"VNF1_INSTANCE_ID",
+ "serviceInstanceId":"service-instance-id1",
+ "serviceInstanceName":"service-instance-name"
+ },
+ {
+ "action":"None",
+ "instanceName":"VNF2_INSTANCE_NAME",
+ "instanceId":"VNF2_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":"hvf23b",
+ "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenantName":"APPC-24595-T-IST-02C",
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"eb5f56bf-5855-4e61-bd00-3e19a953bf02",
+ "modelVersion":"1.0",
+ "modelName":"vf_vEPDG",
+ "modelType":"vnf"
+ },
+ "instanceType":"VNF2_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":true,
+ "uuid":"eb5f56bf-5855-4e61-bd00-3e19a953bf02",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"VNF2_INSTANCE_ID",
+ "serviceInstanceId":"service-instance-id2",
+ "serviceInstanceName":"service-instance-name"
+ },
+ {
+ "action":"None",
+ "instanceName":"VNF3_INSTANCE_NAME",
+ "instanceId":"VNF3_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":"hvf23b",
+ "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenantName":"APPC-24595-T-IST-02C",
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelVersion":"1.0",
+ "modelName":"Grouping Service for Test",
+ "modelType":"vnf"
+ },
+ "instanceType":"VNF3_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"VNF3_INSTANCE_ID",
+ "serviceInstanceId":"service-instance-id1",
+ "serviceInstanceName":"service-instance-name"
+ },
+ {
+ "action":"None",
+ "instanceName":"VNF4_INSTANCE_NAME",
+ "instanceId":"VNF4_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":"hvf23b",
+ "tenantId":"3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenantName":"APPC-24595-T-IST-02C",
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"b7f2e8fb-ac71-4ea0-a801-06ef1479ea84",
+ "modelVersion":"4.0",
+ "modelName":"vf_vEPDG",
+ "modelType":"vnf"
+ },
+ "instanceType":"VNF4_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":true,
+ "uuid":"b7f2e8fb-ac71-4ea0-a801-06ef1479ea84",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"VNF4_INSTANCE_ID",
+ "serviceInstanceId":"service-instance-id2",
+ "serviceInstanceName":"service-instance-name"
+ }
+] \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json
new file mode 100644
index 000000000..be4bfe428
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroping_serviceInstance.json
@@ -0,0 +1,30 @@
+{
+ "instanceName":"wowServiceWithVnfGroping",
+ "instanceId":"f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
+ "orchStatus":"ACTIVE",
+ "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType":"TYLER SILVIA",
+ "owningEntityId":null,
+ "owningEntityName":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "tenantName":null,
+ "aicZoneId":null,
+ "aicZoneName":null,
+ "projectName":null,
+ "rollbackOnFailure":null,
+ "isALaCarte":true,
+ "modelInfo":{
+ "modelInvariantId":"7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName":"Grouping Service for Test",
+ "modelType":"service",
+ "modelVersion":"1.0"
+ },
+ "vnfs":{},
+ "networks":{},
+ "validationCounter":0,
+ "existingVNFCounterMap":{},
+ "existingNetworksCounterMap":{}
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
new file mode 100644
index 000000000..0f4bc3fa3
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupCreateRequest.json
@@ -0,0 +1,65 @@
+{
+ "existingVNFCounterMap": {
+ },
+ "existingVnfGroupCounterMap": {
+ "c2b300e6-45de-4e5e-abda-3032bee2de56": 1
+ },
+ "existingNetworksCounterMap": {
+ },
+ "vnfs":{},
+ "vnfGroups": {
+ "groupingservicefortest..ResourceInstanceGroup..1": {
+ "action": "Create",
+ "inMaint": false,
+ "rollbackOnFailure": "true",
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..1",
+ "isMissingData": false,
+ "trackById": "tv2mmg4erg",
+ "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..1",
+ "instanceName": "ABC",
+ "instanceParams": [
+ {
+ }
+ ],
+ "modelInfo": {
+ "modelInvariantId": "a704112d-dbc6-4e56-8d4e-aec57e95ef9a",
+ "modelVersionId": "c2b300e6-45de-4e5e-abda-3032bee2de56",
+ "modelName": "groupingservicefortest..ResourceInstanceGroup..1",
+ "modelVersion": "1",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..1",
+ "modelUniqueId" : "c2b300e6-45de-4e5e-abda-3032bee2de56",
+ "uuid": "c2b300e6-45de-4e5e-abda-3032bee2de56"
+ },
+ "uuid": "c2b300e6-45de-4e5e-abda-3032bee2de56",
+ "vnfs":{}
+ }
+ },
+ "instanceParams": [
+ {
+ "2017488_PASQUALEvpe0_ASN": "AV_vPE"
+ }
+ ],
+ "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+ "subscriptionServiceType": "TYLER SILVIA",
+ "projectName": "WATKINS",
+ "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+ "bulkSize": 1,
+ "modelInfo": {
+ "modelType": "service",
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelVersion": "1.0"
+ },
+ "existingNames": {
+ "abc": ""
+ },
+ "instanceName": "Grouping_Service_Instance",
+ "subscriberName": "SILVIA ROBBINS",
+ "owningEntityName": "WayneHolland",
+ "rollbackOnFailure": true,
+ "testApi": "VNF_API",
+ "isALaCarte": true,
+ "isDirty":true,
+ "action": "Create"
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json
new file mode 100644
index 000000000..42af8a789
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/serviceWithVnfGroupsChildren_serviceInstance.json
@@ -0,0 +1,171 @@
+{
+ "instanceName":"SERVICE_INSTANCE_NAME",
+ "action": "None",
+ "instanceId":"service-instance-id",
+ "orchStatus":"GARBAGE DATA",
+ "globalSubscriberId":"global-customer-id",
+ "subscriptionServiceType":"service-instance-type",
+ "owningEntityId":null,
+ "owningEntityName":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "tenantName":null,
+ "aicZoneId":null,
+ "aicZoneName":null,
+ "projectName":null,
+ "rollbackOnFailure":null,
+ "isALaCarte":true,
+ "modelInfo":{
+ "modelInvariantId":"7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName":"Grouping Service for Test",
+ "modelType":"service",
+ "modelVersion":"1.0"
+ },
+ "vnfs":{},
+ "networks":{},
+ "vnfGroups":{
+ "VNF_GROUP1_INSTANCE_ID":{
+ "originalName":"groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById":"VNF_GROUP1_INSTANCE_ID",
+ "instanceName":"VNF_GROUP1_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None",
+ "instanceId":"VNF_GROUP1_INSTANCE_ID",
+ "instanceType":"VNF_GROUP1_INSTANCE_TYPE",
+ "orchStatus":null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "inMaint":false,
+ "modelInfo":{
+ "modelType":"instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId":"4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceGroupRole":"VNF_GROUP1_INSTANCE_ROLE",
+ "instanceGroupFunction":"vTSBC Customer Landing Network Collection",
+ "vnfs":{
+ "RELATED_VNF1_INSTANCE_ID":{
+ "action":"None",
+ "instanceName":"RELATED_VNF1_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF1_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "modelType":"vnf",
+ "modelName":"vf_vEPDG",
+ "modelVersion":"2.0"
+ },
+ "instanceType":"RELATED_VNF1_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF1_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF2_INSTANCE_ID":{
+ "action":"None",
+ "instanceName":"RELATED_VNF2_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF2_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF2_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF2_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ },
+ "RELATED_VNF3_INSTANCE_ID":{
+ "action":"None",
+ "instanceName":"RELATED_VNF3_INSTANCE_NAME",
+ "instanceId":"RELATED_VNF3_INSTANCE_ID",
+ "orchStatus":null,
+ "productFamilyId":null,
+ "lcpCloudRegionId":null,
+ "tenantId":null,
+ "modelInfo":{
+ "modelInvariantId":"vnf-instance-model-invariant-id",
+ "modelVersionId":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "modelType":"vnf"
+ },
+ "instanceType":"RELATED_VNF3_INSTANCE_TYPE",
+ "provStatus":null,
+ "inMaint":false,
+ "uuid":"d6557200-ecf2-4641-8094-5393ae3aae60",
+ "originalName":null,
+ "legacyRegion":null,
+ "lineOfBusiness":null,
+ "platformName":null,
+ "trackById":"RELATED_VNF3_INSTANCE_ID",
+ "serviceInstanceId":null,
+ "serviceInstanceName":null,
+ "tenantName":null
+ }
+ }
+ },
+ "VNF_GROUP2_INSTANCE_ID":{
+ "originalName":"groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById":"VNF_GROUP2_INSTANCE_ID",
+ "instanceName":"VNF_GROUP2_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None",
+ "instanceId":"VNF_GROUP2_INSTANCE_ID",
+ "instanceType":"VNF_GROUP2_INSTANCE_TYPE",
+ "orchStatus":null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "inMaint":false,
+ "modelInfo":{
+ "modelType":"instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId":"4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "tenantId": null,
+ "instanceGroupRole":"VNF_GROUP2_INSTANCE_ROLE",
+ "instanceGroupFunction":"vTSBC Customer Landing Network Collection",
+ "vnfs": {}
+ }
+ },
+ "validationCounter":0,
+ "existingVNFCounterMap":{},
+ "existingVnfGroupCounterMap":{
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 2
+ },
+ "existingNetworksCounterMap":{}
+} \ No newline at end of file
diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json
new file mode 100644
index 000000000..2e0f85ee4
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupCreate1VnfGroupAndDelete2VnfGroupsRequest.json
@@ -0,0 +1,123 @@
+{
+ "action": "None",
+ "isDirty": true,
+ "vnfs": {},
+ "instanceParams": [],
+ "validationCounter": 0,
+ "existingNames": {
+ "service_instance_name": "",
+ "vnf_group3_instance_name": ""
+ },
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 3
+ },
+ "existingNetworksCounterMap": {},
+ "networks": {},
+ "vnfGroups": {
+ "groupingservicefortest..ResourceInstanceGroup..0:001": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "groupingservicefortest..ResourceInstanceGroup..0:001",
+ "instanceName": "VNF_GROUP1_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "rollbackOnFailure": "false",
+ "action": "None_Delete",
+ "instanceId": "VNF_GROUP1_INSTANCE_ID",
+ "instanceType": "VNF_GROUP1_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection"
+ },
+ "groupingservicefortest..ResourceInstanceGroup..0:002": {
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "trackById": "groupingservicefortest..ResourceInstanceGroup..0:002",
+ "instanceName": "VNF_GROUP2_INSTANCE_NAME",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "action": "None_Delete",
+ "instanceId": "VNF_GROUP2_INSTANCE_ID",
+ "instanceType": "VNF_GROUP2_INSTANCE_TYPE",
+ "orchStatus": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "inMaint": false,
+ "modelInfo": {
+ "modelType": "instanceGroup",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "tenantId": null,
+ "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE",
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection"
+ },
+ "groupingservicefortest..ResourceInstanceGroup..0": {
+ "action": "Create",
+ "inMaint": false,
+ "rollbackOnFailure": "true",
+
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "isMissingData": false,
+ "trackById": "ag5aav86u4j",
+ "vnfGroupStoreKey": "groupingservicefortest..ResourceInstanceGroup..0",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "instanceName": "VNF_GROUP3_INSTANCE_NAME",
+
+
+ "modelInfo": {
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "modelName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelVersion": "1",
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "instanceParams": [{}
+ ]
+ }
+ },
+ "bulkSize": 1,
+ "instanceName": "SERVICE_INSTANCE_NAME",
+
+ "instanceId": "service-instance-id",
+ "orchStatus": "GARBAGE DATA",
+ "globalSubscriberId": "global-customer-id",
+ "subscriptionServiceType": "service-instance-type",
+ "owningEntityId": null,
+ "owningEntityName": null,
+ "productFamilyId": null,
+ "lcpCloudRegionId": null,
+ "tenantId": null,
+ "tenantName": null,
+ "aicZoneId": null,
+ "aicZoneName": null,
+ "projectName": null,
+ "rollbackOnFailure": false,
+ "isALaCarte": true,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0"
+ },
+
+ "testApi": "VNF_API"
+}
diff --git a/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
new file mode 100644
index 000000000..da9727e89
--- /dev/null
+++ b/vid-automation/src/test/resources/VnfGroup/vnfGroupWithExistingAndNewVnfMembers.json
@@ -0,0 +1,209 @@
+{
+ "action": "None",
+ "aicZoneId": null,
+ "aicZoneName": null,
+ "bulkSize": 1,
+ "existingNames": {
+ "service_instance_name": ""
+ },
+ "existingNetworksCounterMap": {},
+ "existingVNFCounterMap": {},
+ "existingVnfGroupCounterMap": {
+ "daeb6568-cef8-417f-9075-ed259ce59f48": 2,
+ "c2b300e6-45de-4e5e-abda-3032bee2de56": 0
+ },
+ "globalSubscriberId": "global-customer-id",
+ "instanceId": "service-instance-id",
+ "instanceName": "SERVICE_INSTANCE_NAME",
+ "instanceParams": [],
+ "isALaCarte": true,
+ "isDirty": true,
+ "lcpCloudRegionId": null,
+ "modelInfo": {
+ "modelInvariantId": "7ee41ce4-4827-44b0-a48e-2707a59905d2",
+ "modelName": "Grouping Service for Test",
+ "modelType": "service",
+ "modelVersion": "1.0",
+ "modelVersionId": "4117a0b6-e234-467d-b5b9-fe2f68c8b0fc"
+ },
+ "networks": {},
+ "orchStatus": "GARBAGE DATA",
+ "owningEntityId": null,
+ "owningEntityName": null,
+ "productFamilyId": null,
+ "projectName": null,
+ "rollbackOnFailure": false,
+ "subscriptionServiceType": "service-instance-type",
+ "tenantId": null,
+ "tenantName": null,
+ "testApi": "VNF_API",
+ "validationCounter": 0,
+ "vnfGroups": {
+ "VNF_GROUP1_INSTANCE_ID": {
+ "action": "None",
+ "inMaint": false,
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "instanceGroupRole": "VNF_GROUP1_INSTANCE_ROLE",
+ "instanceId": "VNF_GROUP1_INSTANCE_ID",
+ "instanceName": "VNF_GROUP1_INSTANCE_NAME",
+ "instanceType": "VNF_GROUP1_INSTANCE_TYPE",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelType": "instanceGroup",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "orchStatus": null,
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "trackById": "VNF_GROUP1_INSTANCE_ID",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "vnfs": {
+ "RELATED_VNF1_INSTANCE_ID": {
+ "action": "None",
+ "inMaint": false,
+ "instanceId": "RELATED_VNF1_INSTANCE_ID",
+ "instanceName": "RELATED_VNF1_INSTANCE_NAME",
+ "instanceType": "RELATED_VNF1_INSTANCE_TYPE",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelName": "vf_vEPDG",
+ "modelType": "vnf",
+ "modelVersion": "2.0",
+ "modelVersionId": "7a6ee536-f052-46fa-aa7e-2fca9d674c44"
+ },
+ "orchStatus": null,
+ "originalName": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantId": null,
+ "tenantName": null,
+ "trackById": "RELATED_VNF1_INSTANCE_ID",
+ "uuid": "7a6ee536-f052-46fa-aa7e-2fca9d674c44"
+ },
+ "RELATED_VNF2_INSTANCE_ID": {
+ "action": "None",
+ "inMaint": false,
+ "instanceId": "RELATED_VNF2_INSTANCE_ID",
+ "instanceName": "RELATED_VNF2_INSTANCE_NAME",
+ "instanceType": "RELATED_VNF2_INSTANCE_TYPE",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelType": "vnf",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60"
+ },
+ "orchStatus": null,
+ "originalName": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantId": null,
+ "tenantName": null,
+ "trackById": "RELATED_VNF2_INSTANCE_ID",
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60"
+ },
+ "RELATED_VNF3_INSTANCE_ID": {
+ "action": "None",
+ "inMaint": false,
+ "instanceId": "RELATED_VNF3_INSTANCE_ID",
+ "instanceName": "RELATED_VNF3_INSTANCE_NAME",
+ "instanceType": "RELATED_VNF3_INSTANCE_TYPE",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelType": "vnf",
+ "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60"
+ },
+ "orchStatus": null,
+ "originalName": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "serviceInstanceId": null,
+ "serviceInstanceName": null,
+ "tenantId": null,
+ "tenantName": null,
+ "trackById": "RELATED_VNF3_INSTANCE_ID",
+ "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60"
+ },
+ "VNF1_INSTANCE_ID": {
+ "action": "Create",
+ "inMaint": false,
+ "instanceId": "VNF1_INSTANCE_ID",
+ "instanceName": "VNF1_INSTANCE_NAME",
+ "instanceType": "VNF1_INSTANCE_TYPE",
+ "isSelected": true,
+ "lcpCloudRegionId": "hvf23b",
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelInvariantId": "vnf-instance-model-invariant-id",
+ "modelName": "vf_vEPDG",
+ "modelType": "vnf",
+ "modelVersion": "2.0",
+ "modelVersionId": "7a6ee536-f052-46fa-aa7e-2fca9d674c44"
+ },
+ "orchStatus": null,
+ "originalName": null,
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "serviceInstanceId": "service-instance-id1",
+ "serviceInstanceName": "service-instance-name",
+ "tenantId": "3e9a20a3e89e45f884e09df0cc2d2d2a",
+ "tenantName": "APPC-24595-T-IST-02C",
+ "trackById": "VNF1_INSTANCE_ID",
+ "uuid": "7a6ee536-f052-46fa-aa7e-2fca9d674c44",
+ "vnfStoreKey": "VNF1_INSTANCE_ID"
+ }
+ }
+ },
+ "VNF_GROUP2_INSTANCE_ID": {
+ "action": "None",
+ "inMaint": false,
+ "instanceGroupFunction": "vTSBC Customer Landing Network Collection",
+ "instanceGroupRole": "VNF_GROUP2_INSTANCE_ROLE",
+ "instanceId": "VNF_GROUP2_INSTANCE_ID",
+ "instanceName": "VNF_GROUP2_INSTANCE_NAME",
+ "instanceType": "VNF_GROUP2_INSTANCE_TYPE",
+ "lcpCloudRegionId": null,
+ "legacyRegion": null,
+ "lineOfBusiness": null,
+ "modelInfo": {
+ "modelCustomizationName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "modelInvariantId": "4bb2e27e-ddab-4790-9c6d-1f731bc14a45",
+ "modelType": "instanceGroup",
+ "modelVersionId": "daeb6568-cef8-417f-9075-ed259ce59f48"
+ },
+ "orchStatus": null,
+ "originalName": "groupingservicefortest..ResourceInstanceGroup..0",
+ "platformName": null,
+ "productFamilyId": null,
+ "provStatus": null,
+ "tenantId": null,
+ "trackById": "VNF_GROUP2_INSTANCE_ID",
+ "uuid": "daeb6568-cef8-417f-9075-ed259ce59f48",
+ "vnfs": {}
+ }
+ },
+ "vnfs": {}
+} \ No newline at end of file