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>

1 files changed, 204 insertions, 0 deletions

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"
+}