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>

2 files changed, 89 insertions, 0 deletions

diff --git a/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json
new file mode 100644
index 000000000..1bbddc11c
--- /dev/null
+++ b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksToVlansByServiceInstance.json
@@ -0,0 +1,31 @@
+{
+  "serviceNetworks": [
+    {
+      "networkId": "7989a6d2-ba10-4a5d-8f15-4520bc833090",
+      "name": "DDDEEEFFF",
+      "nodeType": "Provider Network",
+      "nodeStatus": "Failed",
+      "vlans": [
+        {
+          "vlanIdOuter": "34612"
+        },
+        {
+          "vlanIdOuter": "8568012"
+        }
+      ]
+    },
+    {
+      "networkId": "e8e2332e-1f84-4237-bc97-3b5b842f52e4",
+      "name": "GGGHHHIII",
+      "nodeType": "Network",
+      "nodeStatus": "Assigned",
+      "vlans": [
+        {
+          "vlanIdOuter": "4"
+        }
+      ]
+    }
+  ],
+  "vnfNetworks": [
+  ]
+}
diff --git a/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json
new file mode 100644
index 000000000..952e36e3e
--- /dev/null
+++ b/vid-automation/src/test/resources/serviceWithNetwork/aaiGetNetworksWithVlansToVnfByServiceInstance.json
@@ -0,0 +1,58 @@
+{
+  "serviceNetworks": [
+  ],
+  "vnfNetworks": [
+    {
+      "vnfId": "c015cc0f-0f37-4488-aabf-53795fd93cd3",
+      "networks": [
+        {
+          "networkId": "36517f3d-2bc2-48f5-aaf8-418520c54330",
+          "name": "AAAAABBBBCCCC",
+          "nodeType": "Provider Network",
+          "nodeStatus": "Assigned",
+          "vlans": [
+            {
+              "vlanIdOuter": "34123"
+            },
+            {
+              "vlanIdOuter": "65540"
+            }
+          ]
+        },
+        {
+          "networkId": "12347f3d-2bc2-48f5-aaf8-418520c54330",
+          "name": "DDDEEEE",
+          "nodeType": "Provider Network",
+          "nodeStatus": "Created",
+          "vlans": [
+            {
+              "vlanIdOuter": "12345"
+            },
+            {
+              "vlanIdOuter": "67890"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "vnfId": "c55da606-cf38-42c7-bc3c-be8e23b19299",
+      "networks": [
+        {
+          "networkId": "12aa7f3d-2bc2-48f5-aaf8-418520c54330",
+          "name": "XXXYYYZZZ",
+          "nodeType": "Network",
+          "nodeStatus": "Created",
+          "vlans": [
+            {
+              "vlanIdOuter": "417695"
+            },
+            {
+              "vlanIdOuter": "783243"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}