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>

3 files changed, 929 insertions, 0 deletions

diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json
new file mode 100644
index 000000000..a95573558
--- /dev/null
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceInstance.json
@@ -0,0 +1,274 @@
+{
+  "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":false,
+  "modelInfo":{
+    "modelInvariantId":"d27e42cf-087e-4d31-88ac-6c4b7585f800",
+    "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+    "modelName":"vf_vEPDG",
+    "modelType":"service",
+    "modelVersion":"5.0"
+  },
+  "vnfs": {
+    "VNF1_INSTANCE_ID": {
+      "originalName": null,
+      "trackById": "VNF1_INSTANCE_ID",
+      "instanceName": "VNF1_INSTANCE_NAME",
+      "action": "None",
+      "instanceId": "VNF1_INSTANCE_ID",
+      "instanceType": "VNF1_INSTANCE_TYPE",
+      "orchStatus": null,
+      "provStatus": null,
+      "inMaint": false,
+      "modelInfo": {
+        "modelInvariantId": "vnf-instance-model-invariant-id",
+        "modelVersionId": "vnf-instance-model-version-id",
+        "modelCustomizationId": "vnf-instance-model-customization-id",
+        "modelType": "vnf"
+      },
+      "uuid": "vnf-instance-model-version-id",
+      "productFamilyId": null,
+      "lcpCloudRegionId": null,
+      "legacyRegion": null,
+      "tenantId": null,
+      "lineOfBusiness": null,
+      "platformName": null,
+      "vfModules": {},
+      "networks": {
+        "NETWORK1_INSTANCE_ID": {
+          "originalName": null,
+          "trackById": "NETWORK1_INSTANCE_ID",
+          "instanceName": "NETWORK1_INSTANCE_NAME",
+          "action": "None",
+          "instanceId": "NETWORK1_INSTANCE_ID",
+          "instanceType": "CONTRAIL30_BASIC",
+          "orchStatus": "Assigned",
+          "provStatus": "prov",
+          "inMaint": false,
+          "modelInfo": {
+            "modelInvariantId": "network-instance-model-invariant-id",
+            "modelVersionId": "network-instance-model-version-id",
+            "modelCustomizationId": "network-instance-model-customization-id",
+            "modelType": "network"
+          },
+          "uuid": "network-instance-model-version-id",
+          "productFamilyId": null,
+          "lcpCloudRegionId": null,
+          "legacyRegion": null,
+          "tenantId": null,
+          "lineOfBusiness": null,
+          "platformName": null
+        },
+        "NETWORK2_INSTANCE_ID": {
+          "originalName": null,
+          "trackById": "NETWORK2_INSTANCE_ID",
+          "instanceName": "NETWORK2_INSTANCE_NAME",
+          "action": "None",
+          "instanceId": "NETWORK2_INSTANCE_ID",
+          "instanceType": "CONTRAIL30_BASIC",
+          "orchStatus": "Created",
+          "provStatus": "prov",
+          "inMaint": false,
+          "modelInfo": {
+            "modelInvariantId": "network-instance-model-invariant-id",
+            "modelVersionId": "network-instance-model-version-id",
+            "modelCustomizationId": "network-instance-model-customization-id",
+            "modelType": "network"
+          },
+          "uuid": "network-instance-model-version-id",
+          "productFamilyId": null,
+          "lcpCloudRegionId": null,
+          "legacyRegion": null,
+          "tenantId": null,
+          "lineOfBusiness": null,
+          "platformName": null
+        }
+      }
+    },
+    "VNF2_INSTANCE_ID": {
+      "originalName": "VF_vGeraldine 0",
+      "trackById": "VNF2_INSTANCE_ID",
+      "instanceName": "VNF2_INSTANCE_NAME",
+      "action": "None",
+      "instanceId": "VNF2_INSTANCE_ID",
+      "instanceType": "VNF2_INSTANCE_TYPE",
+      "orchStatus": null,
+      "provStatus": null,
+      "inMaint": true,
+      "modelInfo": {
+        "modelCustomizationName": "VF_vGeraldine 0",
+        "modelInvariantId": "vnf-instance-model-invariant-id",
+        "modelVersionId": "d6557200-ecf2-4641-8094-5393ae3aae60",
+        "modelCustomizationId": "91415b44-753d-494c-926a-456a9172bbb9",
+        "modelType": "vnf"
+      },
+      "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+      "productFamilyId": null,
+      "lcpCloudRegionId": null,
+      "legacyRegion": null,
+      "tenantId": null,
+      "lineOfBusiness": null,
+      "platformName": null,
+      "vfModules": {
+        "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+          "2c1ca484-cbc2-408b-ab86-25a2c15ce280": {
+            "originalName": "VfVgeraldine..vflorence_vlc..module-1",
+            "trackById": "2c1ca484-cbc2-408b-ab86-25a2c15ce280",
+            "instanceName": "ss820f_0918_db",
+            "action": "None",
+            "instanceId": "2c1ca484-cbc2-408b-ab86-25a2c15ce280",
+            "instanceType": null,
+            "orchStatus": "deleted",
+            "provStatus": null,
+            "inMaint": true,
+            "modelInfo": {
+              "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+              "modelCustomizationId": "55b1be94-671a-403e-a26c-667e9c47d091",
+              "modelInvariantId": "09edc9ef-85d0-4b26-80de-1f569d49e750",
+              "modelVersionId": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+              "modelType": "vfModule"
+            },
+            "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+            "productFamilyId": null,
+            "lcpCloudRegionId": null,
+            "legacyRegion": null,
+            "tenantId": null,
+            "lineOfBusiness": null,
+            "platformName": null,
+            "isBase": false,
+            "volumeGroupName": null
+          }
+        },
+        "dc229cd8-c132-4455-8517-5c1787c18b14": {
+          "3ef042c4-259f-45e0-9aba-0989bd8d1cc5": {
+            "originalName": null,
+            "trackById": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5",
+            "instanceName": "ss820f_0918_base",
+            "action": "None",
+            "instanceId": "3ef042c4-259f-45e0-9aba-0989bd8d1cc5",
+            "instanceType": null,
+            "orchStatus": "Assigned",
+            "provStatus": null,
+            "inMaint": false,
+            "modelInfo": {
+              "modelCustomizationId": "8ad8670b-0541-4499-8101-275bbd0e8b6a",
+              "modelInvariantId": "1e463c9c-404d-4056-ba56-28fd102608de",
+              "modelVersionId": "dc229cd8-c132-4455-8517-5c1787c18b14",
+              "modelType": "vfModule"
+            },
+            "uuid": "dc229cd8-c132-4455-8517-5c1787c18b14",
+            "productFamilyId": null,
+            "lcpCloudRegionId": null,
+            "legacyRegion": null,
+            "tenantId": null,
+            "lineOfBusiness": null,
+            "platformName": null,
+            "isBase": true,
+            "volumeGroupName": null
+          }
+        }
+      },
+      "networks": {}
+    }
+  },
+  "networks": {
+    "NETWORK3_INSTANCE_ID": {
+      "originalName": "ExtVL 0",
+      "trackById": "NETWORK3_INSTANCE_ID",
+      "instanceName": "NETWORK3_INSTANCE_NAME",
+      "action": "None",
+      "instanceId": "NETWORK3_INSTANCE_ID",
+      "instanceType": "CONTRAIL30_BASIC",
+      "orchStatus": "Assigned",
+      "provStatus": "nvtprov",
+      "inMaint": false,
+      "modelInfo": {
+        "modelCustomizationName": "ExtVL 0",
+        "modelInvariantId": "network-instance-model-invariant-id",
+        "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+        "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+        "modelType": "network"
+      },
+      "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+      "productFamilyId": null,
+      "lcpCloudRegionId": null,
+      "legacyRegion": null,
+      "tenantId": null,
+      "lineOfBusiness": null,
+      "platformName": null
+    },
+    "NETWORK4_INSTANCE_ID": {
+      "originalName": "ExtVL 0",
+      "trackById": "NETWORK4_INSTANCE_ID",
+      "instanceName": "NETWORK4_INSTANCE_NAME",
+      "action": "None",
+      "instanceId": "NETWORK4_INSTANCE_ID",
+      "instanceType": "CONTRAIL30_HIMELGUARD",
+      "orchStatus": "Created",
+      "provStatus": "preprov",
+      "inMaint": false,
+      "modelInfo": {
+        "modelCustomizationName": "ExtVL 0",
+        "modelInvariantId": "network-instance-model-invariant-id",
+        "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+        "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+        "modelType": "network"
+      },
+      "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+      "productFamilyId": null,
+      "lcpCloudRegionId": null,
+      "legacyRegion": null,
+      "tenantId": null,
+      "lineOfBusiness": null,
+      "platformName": null
+    }
+  },
+  "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": false,
+  "modelInfo": {
+    "modelInvariantId": "d27e42cf-087e-4d31-88ac-6c4b7585f800",
+    "modelVersionId": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+    "modelName": "vf_vEPDG",
+    "modelType": "service",
+    "modelVersion": "5.0"
+  },
+  "validationCounter": 0,
+  "vnfGroups": {},
+  "existingVNFCounterMap": {
+    "91415b44-753d-494c-926a-456a9172bbb9": 1,
+    "vnf-instance-model-customization-id": 1
+  },
+  "existingNetworksCounterMap": {
+    "94fdd893-4a36-4d70-b16a-ec29c54c184f": 2
+  },
+  "existingVnfGroupCounterMap": {}
+}
\ No newline at end of file
diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json
new file mode 100644
index 000000000..0fbf83070
--- /dev/null
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/ServiceTreeWithMultipleChildren_serviceModel.json
@@ -0,0 +1,392 @@
+{
+  "service": {
+    "uuid": "6e59c5de-f052-46fa-aa7e-2fca9d674c44",
+    "invariantUuid": "d27e42cf-087e-4d31-88ac-6c4b7585f800",
+    "name": "ComplexService",
+    "version": "1.0",
+    "toscaModelURL": null,
+    "category": "Emanuel",
+    "serviceType": "",
+    "serviceRole": "",
+    "description": "ComplexService",
+    "serviceEcompNaming": "true",
+    "instantiationType": "Macro",
+    "inputs": {},
+    "vidNotions": {
+      "instantiationUI": "legacy",
+      "modelCategory": "other",
+      "viewEditUI": "legacy"
+    }
+  },
+  "vnfs": {
+    "VF_vGeraldine 0": {
+      "uuid": "d6557200-ecf2-4641-8094-5393ae3aae60",
+      "invariantUuid": "4160458e-f648-4b30-a176-43881ffffe9e",
+      "description": "VSP_vGeraldine",
+      "name": "VF_vGeraldine",
+      "version": "2.0",
+      "customizationUuid": "91415b44-753d-494c-926a-456a9172bbb9",
+      "inputs": {},
+      "commands": {},
+      "properties": {
+        "gpb2_Internal2_mac": "00:11:22:EF:AC:DF",
+        "sctp-b-ipv6-egress_src_start_port": "0",
+        "sctp-a-ipv6-egress_rule_application": "any",
+        "Internal2_allow_transit": "true",
+        "sctp-b-IPv6_ethertype": "IPv6",
+        "sctp-a-egress_rule_application": "any",
+        "sctp-b-ingress_action": "pass",
+        "sctp-b-ingress_rule_protocol": "icmp",
+        "ncb2_Internal1_mac": "00:11:22:EF:AC:DF",
+        "sctp-b-ipv6-ingress-src_start_port": "0.0",
+        "ncb1_Internal2_mac": "00:11:22:EF:AC:DF",
+        "fsb_volume_size_0": "320.0",
+        "sctp-b-egress_src_addresses": "local",
+        "sctp-a-ipv6-ingress_ethertype": "IPv4",
+        "sctp-a-ipv6-ingress-dst_start_port": "0",
+        "sctp-b-ipv6-ingress_rule_application": "any",
+        "domain_name": "default-domain",
+        "sctp-a-ingress_rule_protocol": "icmp",
+        "sctp-b-egress-src_start_port": "0.0",
+        "sctp-a-egress_src_addresses": "local",
+        "sctp-b-display_name": "epc-sctp-b-ipv4v6-sec-group",
+        "sctp-a-egress-src_start_port": "0.0",
+        "sctp-a-ingress_ethertype": "IPv4",
+        "sctp-b-ipv6-ingress-dst_end_port": "65535",
+        "sctp-b-dst_subnet_prefix_v6": "::",
+        "nf_naming": "{ecomp_generated_naming=true}",
+        "sctp-a-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
+        "sctp-b-egress-dst_start_port": "0.0",
+        "ncb_flavor_name": "nv.c20r64d1",
+        "gpb1_Internal1_mac": "00:11:22:EF:AC:DF",
+        "sctp-b-egress_dst_subnet_prefix_len": "0.0",
+        "Internal2_net_cidr": "10.0.0.10",
+        "sctp-a-ingress-dst_start_port": "0.0",
+        "sctp-a-egress-dst_start_port": "0.0",
+        "fsb1_Internal2_mac": "00:11:22:EF:AC:DF",
+        "sctp-a-egress_ethertype": "IPv4",
+        "vlc_st_service_mode": "in-network-nat",
+        "sctp-a-ipv6-egress_ethertype": "IPv4",
+        "sctp-a-egress-src_end_port": "65535.0",
+        "sctp-b-ipv6-egress_rule_application": "any",
+        "sctp-b-egress_action": "pass",
+        "sctp-a-ingress-src_subnet_prefix_len": "0.0",
+        "sctp-b-ipv6-ingress-src_end_port": "65535.0",
+        "sctp-b-name": "epc-sctp-b-ipv4v6-sec-group",
+        "fsb2_Internal1_mac": "00:11:22:EF:AC:DF",
+        "sctp-a-ipv6-ingress-src_start_port": "0.0",
+        "sctp-b-ipv6-egress_ethertype": "IPv4",
+        "Internal1_net_cidr": "10.0.0.10",
+        "sctp-a-egress_dst_subnet_prefix": "0.0.0.0",
+        "fsb_flavor_name": "nv.c20r64d1",
+        "sctp_rule_protocol": "132",
+        "sctp-b-ipv6-ingress_src_subnet_prefix_len": "0",
+        "sctp-a-ipv6-ingress_rule_application": "any",
+        "ecomp_generated_naming": "true",
+        "sctp-a-IPv6_ethertype": "IPv6",
+        "vlc2_Internal1_mac": "00:11:22:EF:AC:DF",
+        "vlc_st_virtualization_type": "virtual-machine",
+        "sctp-b-ingress-dst_start_port": "0.0",
+        "sctp-b-ingress-dst_end_port": "65535.0",
+        "sctp-a-ipv6-ingress-src_end_port": "65535.0",
+        "sctp-a-display_name": "epc-sctp-a-ipv4v6-sec-group",
+        "sctp-b-ingress_rule_application": "any",
+        "int2_sec_group_name": "int2-sec-group",
+        "vlc_flavor_name": "nd.c16r64d1",
+        "sctp-b-ipv6-egress_src_addresses": "local",
+        "vlc_st_interface_type_int1": "other1",
+        "sctp-b-egress-src_end_port": "65535.0",
+        "sctp-a-ipv6-egress-dst_start_port": "0",
+        "vlc_st_interface_type_int2": "other2",
+        "sctp-a-ipv6-egress_rule_protocol": "any",
+        "Internal2_shared": "false",
+        "sctp-a-ipv6-egress_dst_subnet_prefix_len": "0",
+        "Internal2_rpf": "disable",
+        "vlc1_Internal1_mac": "00:11:22:EF:AC:DF",
+        "sctp-b-ipv6-egress_src_end_port": "65535",
+        "sctp-a-ipv6-egress_src_addresses": "local",
+        "sctp-a-ingress-dst_end_port": "65535.0",
+        "sctp-a-ipv6-egress_src_end_port": "65535",
+        "Internal1_forwarding_mode": "l2",
+        "Internal2_dhcp": "false",
+        "sctp-a-dst_subnet_prefix_v6": "::",
+        "pxe_image_name": "MME_PXE-Boot_16ACP04_GA.qcow2",
+        "vlc_st_interface_type_gtp": "other0",
+        "ncb1_Internal1_mac": "00:11:22:EF:AC:DF",
+        "sctp-b-src_subnet_prefix_v6": "::",
+        "sctp-a-egress_dst_subnet_prefix_len": "0.0",
+        "int1_sec_group_name": "int1-sec-group",
+        "Internal1_dhcp": "false",
+        "sctp-a-ipv6-egress_dst_end_port": "65535",
+        "Internal2_forwarding_mode": "l2",
+        "fsb2_Internal2_mac": "00:11:22:EF:AC:DF",
+        "sctp-b-egress_dst_subnet_prefix": "0.0.0.0",
+        "Internal1_net_cidr_len": "17",
+        "gpb2_Internal1_mac": "00:11:22:EF:AC:DF",
+        "sctp-b-ingress-src_subnet_prefix_len": "0.0",
+        "sctp-a-ingress_dst_addresses": "local",
+        "sctp-a-egress_action": "pass",
+        "fsb_volume_type_0": "SF-Default-SSD",
+        "ncb2_Internal2_mac": "00:11:22:EF:AC:DF",
+        "vlc_st_interface_type_sctp_a": "left",
+        "vlc_st_interface_type_sctp_b": "right",
+        "sctp-a-src_subnet_prefix_v6": "::",
+        "vlc_st_version": "2",
+        "sctp-b-egress_ethertype": "IPv4",
+        "sctp-a-ingress_rule_application": "any",
+        "gpb1_Internal2_mac": "00:11:22:EF:AC:DF",
+        "instance_ip_family_v6": "v6",
+        "sctp-a-ipv6-egress_src_start_port": "0",
+        "sctp-b-ingress-src_start_port": "0.0",
+        "sctp-b-ingress_dst_addresses": "local",
+        "fsb1_Internal1_mac": "00:11:22:EF:AC:DF",
+        "vlc_st_interface_type_oam": "management",
+        "multi_stage_design": "false",
+        "oam_sec_group_name": "oam-sec-group",
+        "Internal2_net_gateway": "10.0.0.10",
+        "sctp-a-ipv6-ingress-dst_end_port": "65535",
+        "sctp-b-ipv6-egress-dst_start_port": "0",
+        "Internal1_net_gateway": "10.0.0.10",
+        "sctp-b-ipv6-egress_rule_protocol": "any",
+        "gtp_sec_group_name": "gtp-sec-group",
+        "sctp-a-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
+        "sctp-b-ipv6-egress_dst_subnet_prefix_len": "0",
+        "sctp-a-ipv6-ingress_dst_addresses": "local",
+        "sctp-a-egress_rule_protocol": "icmp",
+        "sctp-b-ipv6-egress_action": "pass",
+        "sctp-a-ipv6-egress_action": "pass",
+        "Internal1_shared": "false",
+        "sctp-b-ipv6-ingress_rule_protocol": "any",
+        "Internal2_net_cidr_len": "17",
+        "sctp-a-name": "epc-sctp-a-ipv4v6-sec-group",
+        "sctp-a-ingress-src_end_port": "65535.0",
+        "sctp-b-ipv6-ingress_src_subnet_prefix": "0.0.0.0",
+        "sctp-a-egress-dst_end_port": "65535.0",
+        "sctp-a-ingress_action": "pass",
+        "sctp-b-egress_rule_protocol": "icmp",
+        "sctp-b-ipv6-ingress_action": "pass",
+        "vlc_st_service_type": "firewall",
+        "sctp-b-ipv6-egress_dst_end_port": "65535",
+        "sctp-b-ipv6-ingress-dst_start_port": "0",
+        "vlc2_Internal2_mac": "00:11:22:EF:AC:DF",
+        "vlc_st_availability_zone": "true",
+        "fsb_volume_image_name_1": "MME_FSB2_16ACP04_GA.qcow2",
+        "sctp-b-ingress-src_subnet_prefix": "0.0.0.0",
+        "sctp-a-ipv6-ingress_src_subnet_prefix_len": "0",
+        "Internal1_allow_transit": "true",
+        "gpb_flavor_name": "nv.c20r64d1",
+        "availability_zone_max_count": "1",
+        "fsb_volume_image_name_0": "MME_FSB1_16ACP04_GA.qcow2",
+        "sctp-b-ipv6-ingress_dst_addresses": "local",
+        "sctp-b-ipv6-egress_dst_subnet_prefix": "0.0.0.0",
+        "sctp-b-ipv6-ingress_ethertype": "IPv4",
+        "vlc1_Internal2_mac": "00:11:22:EF:AC:DF",
+        "sctp-a-ingress-src_subnet_prefix": "0.0.0.0",
+        "sctp-a-ipv6-ingress_action": "pass",
+        "Internal1_rpf": "disable",
+        "sctp-b-ingress_ethertype": "IPv4",
+        "sctp-b-egress_rule_application": "any",
+        "sctp-b-ingress-src_end_port": "65535.0",
+        "sctp-a-ipv6-ingress_rule_protocol": "any",
+        "sctp-a-ingress-src_start_port": "0.0",
+        "sctp-b-egress-dst_end_port": "65535.0"
+      },
+      "type": "VF",
+      "modelCustomizationName": "VF_vGeraldine 0",
+      "vfModules": {
+        "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+          "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+          "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
+          "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
+          "description": null,
+          "name": "VfVgeraldine..vflorence_vlc..module-1",
+          "version": "2",
+          "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+          "properties": {
+            "minCountInstances": 0,
+            "maxCountInstances": null,
+            "initialCount": 0,
+            "vfModuleLabel": "vflorence_vlc",
+            "baseModule": false
+          },
+          "inputs": {},
+          "volumeGroupAllowed": false
+        },
+        "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
+          "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
+          "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
+          "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
+          "description": null,
+          "name": "VfVgeraldine..vflorence_gpb..module-2",
+          "version": "2",
+          "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
+          "properties": {
+            "minCountInstances": 0,
+            "maxCountInstances": null,
+            "initialCount": 0,
+            "vfModuleLabel": "vflorence_gpb",
+            "baseModule": false
+          },
+          "inputs": {},
+          "volumeGroupAllowed": false
+        },
+        "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+          "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+          "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+          "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+          "description": null,
+          "name": "VfVgeraldine..base_vflorence..module-0",
+          "version": "2",
+          "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+          "properties": {
+            "minCountInstances": 1,
+            "maxCountInstances": 1,
+            "initialCount": 1,
+            "vfModuleLabel": "base_vflorence",
+            "baseModule": true
+          },
+          "inputs": {},
+          "volumeGroupAllowed": true
+        }
+      },
+      "volumeGroups": {
+        "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+          "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+          "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+          "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+          "description": null,
+          "name": "VfVgeraldine..base_vflorence..module-0",
+          "version": "2",
+          "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+          "properties": {
+            "minCountInstances": 1,
+            "maxCountInstances": 1,
+            "initialCount": 1,
+            "vfModuleLabel": "base_vflorence",
+            "baseModule": true
+          },
+          "inputs": {}
+        }
+      },
+      "vfcInstanceGroups": {}
+    }
+  },
+  "networks": {
+    "ExtVL 0": {
+      "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+      "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c",
+      "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks",
+      "name": "ExtVL",
+      "version": "37.0",
+      "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+      "inputs": {},
+      "commands": {},
+      "properties": {
+        "network_role" : "network role 1, network role 2",
+        "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
+        "exVL_naming": "{ecomp_generated_naming=true}",
+        "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+        "network_homing": "{ecomp_selected_instance_node_target=false}"
+      },
+      "type": "VL",
+      "modelCustomizationName": "ExtVL 0"
+    }
+  },
+  "collectionResource": {},
+  "configurations": {
+    "Port Mirroring Configuration By Policy 0": {
+      "uuid": "b4398538-e89d-4f13-b33d-ca323434ba50",
+      "invariantUuid": "6ef0ca40-f366-4897-951f-abd65d25f6f7",
+      "description": "A port mirroring configuration by policy object",
+      "name": "Port Mirroring Configuration By Policy",
+      "version": "27.0",
+      "customizationUuid": "3c3b7b8d-8669-4b3b-8664-61970041fad2",
+      "inputs": {},
+      "commands": {},
+      "properties": {},
+      "type": "Configuration",
+      "modelCustomizationName": "Port Mirroring Configuration By Policy 0",
+      "sourceNodes": [],
+      "collectorNodes": null,
+      "configurationByPolicy": false
+    }
+  },
+  "fabricConfigurations": {},
+  "serviceProxies": {},
+  "vfModules": {
+    "vf_vgeraldine0..VfVgeraldine..vflorence_vlc..module-1": {
+      "uuid": "522159d5-d6e0-4c2a-aa44-5a542a12a830",
+      "invariantUuid": "98a7c88b-b577-476a-90e4-e25a5871e02b",
+      "customizationUuid": "55b1be94-671a-403e-a26c-667e9c47d091",
+      "description": null,
+      "name": "VfVgeraldine..vflorence_vlc..module-1",
+      "version": "2",
+      "modelCustomizationName": "VfVgeraldine..vflorence_vlc..module-1",
+      "properties": {
+        "minCountInstances": 0,
+        "maxCountInstances": null,
+        "initialCount": 0,
+        "vfModuleLabel": "vflorence_vlc",
+        "baseModule": false
+      },
+      "inputs": {},
+      "volumeGroupAllowed": false
+    },
+    "vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2": {
+      "uuid": "41708296-e443-4c71-953f-d9a010f059e1",
+      "invariantUuid": "1cca90b8-3490-495e-87da-3f3e4c57d5b9",
+      "customizationUuid": "6add59e0-7fe1-4bc4-af48-f8812422ae7c",
+      "description": null,
+      "name": "VfVgeraldine..vflorence_gpb..module-2",
+      "version": "2",
+      "modelCustomizationName": "VfVgeraldine..vflorence_gpb..module-2",
+      "properties": {
+        "minCountInstances": 0,
+        "maxCountInstances": null,
+        "initialCount": 0,
+        "vfModuleLabel": "vflorence_gpb",
+        "baseModule": false
+      },
+      "inputs": {},
+      "volumeGroupAllowed": false
+    },
+    "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+      "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+      "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+      "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+      "description": null,
+      "name": "VfVgeraldine..base_vflorence..module-0",
+      "version": "2",
+      "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+      "properties": {
+        "minCountInstances": 1,
+        "maxCountInstances": 1,
+        "initialCount": 1,
+        "vfModuleLabel": "base_vflorence",
+        "baseModule": true
+      },
+      "inputs": {},
+      "volumeGroupAllowed": true
+    }
+  },
+  "volumeGroups": {
+    "vf_vgeraldine0..VfVgeraldine..base_vflorence..module-0": {
+      "uuid": "a27f5cfc-7f12-4f99-af08-0af9c3885c87",
+      "invariantUuid": "a6f9e51a-2b35-416a-ae15-15e58d61f36d",
+      "customizationUuid": "f8c040f1-7e51-4a11-aca8-acf256cfd861",
+      "description": null,
+      "name": "VfVgeraldine..base_vflorence..module-0",
+      "version": "2",
+      "modelCustomizationName": "VfVgeraldine..base_vflorence..module-0",
+      "properties": {
+        "minCountInstances": 1,
+        "maxCountInstances": 1,
+        "initialCount": 1,
+        "vfModuleLabel": "base_vflorence",
+        "baseModule": true
+      },
+      "inputs": {}
+    }
+  },
+  "pnfs": {}
+}
\ No newline at end of file
diff --git a/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json
new file mode 100644
index 000000000..b2ba2c7e9
--- /dev/null
+++ b/vid-automation/src/test/resources/aaiGetInstanceTopology/getServiceInstanceTopologyResult.json
@@ -0,0 +1,263 @@
+{
+  "networks": {
+    "ExtVL 0": {
+      "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986",
+      "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c",
+      "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks",
+      "name": "ExtVL",
+      "version": "37.0",
+      "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f",
+      "inputs": {},
+      "commands": {},
+      "modelInfo": {
+        "modelVersionId": "12345-5858-6565",
+        "modelName": "modelForNetwork"
+      },
+      "properties": {
+        "min_instances": 1,
+        "max_instances": 10,
+        "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}",
+        "exVL_naming": "{ecomp_generated_naming=true}",
+        "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}",
+        "network_homing": "{ecomp_selected_instance_node_target=false}"
+      },
+      "type": "VL",
+      "instanceName" : "NetInstance",
+      "modelCustomizationName": "ExtVL 0",
+      "isFailed": true
+    }
+  },
+  "vnfs": {
+    "2017-388_PASQUALE-vPE 0": {
+      "vfModules": {},
+      "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168",
+      "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+      "lcpCloudRegionId": "JANET25",
+      "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+      "lineOfBusiness": "ONAP",
+      "platformName": "platform",
+      "modelInfo": {
+        "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "modelVersionId": "afacccf6-397d-45d6-b5ae-94c39734b168",
+        "modelName": "2017-388_PASQUALE-vPE",
+        "modelVersion": "4.0",
+        "modelCustomizationId": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c",
+        "modelCustomizationName": "2017-388_PASQUALE-vPE 0",
+        "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168"
+      },
+      "instanceName": "2017388_PASQUALEvPEmCaNkinstanceName",
+      "action": "None",
+      "legacyRegion": "some legacy region"
+    },
+    "2017-488_PASQUALE-vPE 0": {
+      "vfModules": {
+        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
+            "instanceName": "VFinstancenameZERO",
+            "action": "None",
+            "modelInfo": {
+              "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+              "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+              "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelVersion": "5",
+              "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
+            },
+            "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+            "provStatus": "Prov Status",
+            "orchStatus": "Active",
+            "inMaint": true,
+            "lcpCloudRegionId": "JANET25",
+            "tenantId": "092eb9e8e4b7412e8787dd091bc58e86"
+          }
+        },
+        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": {
+            "instanceName": "VFinstancename",
+            "action": "None",
+            "volumeGroupName": "VFinstancename_vol_abc",
+            "orchStatus": "Create",
+            "provStatus": "Prov Status",
+            "inMaint": false,
+            "lcpCloudRegionId": "JANET25",
+            "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+            "modelInfo": {
+              "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
+              "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
+              "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelVersion": "6",
+              "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+            },
+            "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+          }
+        }
+      },
+      "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+      "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+      "lcpCloudRegionId": "JANET25",
+      "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+      "lineOfBusiness": "ONAP",
+      "platformName": "platform",
+      "modelInfo": {
+        "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+        "modelName": "2017-488_PASQUALE-vPE",
+        "modelVersion": "5.0",
+        "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+        "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+        "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+      },
+      "orchStatus": "Created",
+      "inMaint": false,
+      "instanceName": "2017488_PASQUALEvPEVNFinstancename",
+      "action": "None",
+      "legacyRegion": "some legacy region"
+    },
+    "2017-488_PASQUALE-vPE 0:0001": {
+      "vfModules": {
+        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
+            "instanceName": "VFinstancenameZERO_001",
+            "action": "None",
+            "provStatus": "Prov Status",
+            "inMaint": true,
+            "modelInfo": {
+              "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+              "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+              "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelVersion": "5",
+              "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
+            },
+            "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
+          }
+        },
+        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": {
+            "instanceName": "VFinstancename_001",
+            "action": "None",
+            "volumeGroupName": "VFinstancename_vol_abc_001",
+            "modelInfo": {
+              "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
+              "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
+              "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelVersion": "6",
+              "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+            },
+            "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+          }
+        }
+      },
+
+      "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+      "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+      "lcpCloudRegionId": "JANET25",
+      "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+      "lineOfBusiness": "ONAP",
+      "platformName": "platform",
+      "modelInfo": {
+        "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+        "modelName": "2017-488_PASQUALE-vPE",
+        "modelVersion": "5.0",
+        "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+        "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+        "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+      },
+      "instanceName": "2017488_PASQUALEvPEVNFinstancename_001",
+      "action": "None",
+      "legacyRegion": "some legacy region"
+    },
+    "2017-488_PASQUALE-vPE 0:0002": {
+      "vfModules": {
+        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0": {
+          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0uvfot": {
+            "instanceName": "VFinstancenameZERO_002",
+            "action": "None",
+            "modelInfo": {
+              "modelInvariantId": "b34833bb-6aa9-4ad6-a831-70b06367a091",
+              "modelVersionId": "f8360508-3f17-4414-a2ed-6bc71161e8db",
+              "modelName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "modelVersion": "5",
+              "modelCustomizationId": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3",
+              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0",
+              "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
+            },
+            "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db"
+          }
+        },
+        "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1": {
+          "2017488_PASQUALEvpe0..2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1fshmc": {
+            "instanceName": "VFinstancename_002",
+            "action": "None",
+            "volumeGroupName": "VFinstancename_vol_abc_002",
+            "modelInfo": {
+              "modelInvariantId": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1",
+              "modelVersionId": "25284168-24bb-4698-8cb4-3f509146eca5",
+              "modelName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "modelVersion": "6",
+              "modelCustomizationId": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401",
+              "modelCustomizationName": "2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1",
+              "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+            },
+            "uuid": "25284168-24bb-4698-8cb4-3f509146eca5"
+          }
+        }
+      },
+      "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+      "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+      "lcpCloudRegionId": "JANET25",
+      "tenantId": "092eb9e8e4b7412e8787dd091bc58e86",
+      "lineOfBusiness": "ONAP",
+      "platformName": "platform",
+      "modelInfo": {
+        "modelInvariantId": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "modelVersionId": "69e09f68-8b63-4cc9-b9ff-860960b5db09",
+        "modelName": "2017-488_PASQUALE-vPE",
+        "modelVersion": "5.0",
+        "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45",
+        "modelCustomizationName": "2017-488_PASQUALE-vPE 0",
+        "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09"
+      },
+      "instanceName": "2017488_PASQUALEvPEVNFinstancename_002",
+      "action": "None",
+      "legacyRegion": "some legacy region"
+    }
+  },
+  "validationCounter": 0,
+  "existingVNFCounterMap": {
+    "afacccf6-397d-45d6-b5ae-94c39734b168": 1,
+    "69e09f68-8b63-4cc9-b9ff-860960b5db09": 3
+  },
+  "existingNetworksCounterMap": {},
+  "instanceName": "mCaNkinstancename",
+  "action": "None",
+  "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89",
+  "subscriptionServiceType": "TYLER SILVIA",
+  "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc",
+  "productFamilyId": "e433710f-9217-458d-a79d-1c7aff376d89",
+  "lcpCloudRegionId": "hvf6",
+  "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054",
+  "aicZoneId": "NFT1",
+  "projectName": "WATKINS",
+  "rollbackOnFailure": "true",
+  "aicZoneName": "NFTJSSSS-NFT1",
+  "owningEntityName": "WayneHolland",
+  "tenantName": "AIN Web Tool-15-D-testalexandria",
+  "modelInfo": {
+    "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+    "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450",
+    "modelName": "action-data",
+    "modelVersion": "1.0",
+    "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450"
+  },
+  "isALaCarte": false,
+  "orchStatus": "Active",
+  "modelInavariantId": "6b528779-44a3-4472-bdff-9cd15ec93450"
+}
\ No newline at end of file