From 56ed84193a0caf8cab1e5cee9c698cbfcd9c7f01 Mon Sep 17 00:00:00 2001
From: "ramu.n" <ramu.n@huawei.com>
Date: Wed, 18 Oct 2017 23:26:10 +0530
Subject: [PATCH] Fix overlay DG testing issues

*Fix json template context variable name
*Get network-id by querying AAI using network-name
*temporarily removed checkRequiredL2Parameters, as it is currently failing

Change-Id: I9faa51d601e4df882309872f890696b96f5236ca
Issue-Id: SDNC-113
Signed-off-by: Ramu N <ramu.n@huawei.com>

Former-commit-id: 653308418e0ef55ee66ae7e57c2203afbff86ece
---
 ...nnects-network-topology-operation-activate.json | 1511 +++++++++--------
 ..._validate-overlay-network-input-parameters.json | 1741 ++++++++++----------
 ...onnects-network-topology-operation-activate.xml |   50 +-
 ...I_validate-overlay-network-input-parameters.xml |   16 +-
 4 files changed, 1749 insertions(+), 1569 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
index 80aaa6be..dfdf0b41 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "4c36e56f.956e94",
+    "id": "c1f029b8.a1e58",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 91.49996948242188,
-    "y": 73,
-    "z": "cf1e958c.7fbef8",
+    "x": 102,
+    "y": 62,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "38e1188a.f9fef"
+        "ef85c5fd.ef823"
       ]
     ]
   },
   {
-    "id": "38e1188a.f9fef",
+    "id": "ef85c5fd.ef823",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,1911 +22,2106 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 307.9999694824219,
-    "y": 135.5,
-    "z": "cf1e958c.7fbef8",
+    "x": 318.5,
+    "y": 124.5,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "be128d6c.f677e"
+        "515c9604.c78fc8"
       ]
     ]
   },
   {
-    "id": "be128d6c.f677e",
+    "id": "515c9604.c78fc8",
     "type": "method",
     "name": "method dci-connects-network-topology-operation-activate",
     "xml": "<method rpc='dci-connects-network-topology-operation-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 216,
-    "y": 230.49998474121094,
-    "z": "cf1e958c.7fbef8",
+    "x": 226.50003051757812,
+    "y": 219.49998474121094,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "bf628732.ed9c68"
+        "6260ef3c.117e18"
       ]
     ]
   },
   {
-    "id": "bf628732.ed9c68",
+    "id": "6260ef3c.117e18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 513.8333129882812,
-    "y": 238.3333282470703,
-    "z": "cf1e958c.7fbef8",
+    "x": 524.3333435058594,
+    "y": 227.3333282470703,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "1a1ab9fe.172d5e",
-        "c91abe90.b09f18",
-        "24a12c20.3823c4",
-        "56f7544c.7d9984",
-        "168e5d62.705303"
+        "9c5e659e.5a8468",
+        "14efaf2d.582f39",
+        "e96c5239.cc3f4",
+        "edee7e9.f5684",
+        "c1d82a9d.7debd"
       ]
     ]
   },
   {
-    "id": "c91abe90.b09f18",
+    "id": "14efaf2d.582f39",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 903.8333129882812,
-    "y": 103.33332824707031,
-    "z": "cf1e958c.7fbef8",
+    "x": 914.3333435058594,
+    "y": 92.33332824707031,
+    "z": "e441b8db.02f6b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "ee9e843c.f2eaa8",
+    "id": "11728db1.0b1f22",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1421.8336029052734,
-    "y": 376.333389043808,
-    "z": "cf1e958c.7fbef8",
+    "x": 1432.3336334228516,
+    "y": 365.333389043808,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "6ecca6a7.b330b8"
+        "62d2a561.8055cc"
       ]
     ]
   },
   {
-    "id": "6ecca6a7.b330b8",
+    "id": "62d2a561.8055cc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1668.833511352539,
-    "y": 374.33335852622986,
-    "z": "cf1e958c.7fbef8",
+    "x": 1679.3335418701172,
+    "y": 363.33335852622986,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "7ec2f156.31bad8",
-        "e570d5e6.8d7958",
-        "2fe6f50.ba2558c",
-        "320c6219.91f19e",
-        "88a16009.d8acd",
-        "69aad884.29b65",
-        "d425399b.6eb9d",
-        "9c7489c7.684fa",
-        "2e60a059.b3e188"
+        "bb31f713.0d193",
+        "c9b81c0f.b35a2",
+        "972db21e.7bfc",
+        "d4313d46.0ad918",
+        "4fee8f3d.149ad",
+        "5a1f2e0e.d48708",
+        "c19cf751.1eed5",
+        "132409b3.4b71ee",
+        "cd65a796.961288"
       ]
     ]
   },
   {
-    "id": "7ec2f156.31bad8",
+    "id": "bb31f713.0d193",
     "type": "switchNode",
     "name": "switch id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2155.833869934082,
-    "y": 250.33347511291504,
-    "z": "cf1e958c.7fbef8",
+    "x": 2166.33390045166,
+    "y": 239.33347511291504,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "aa4e7849.32cd9"
+        "a76462ff.b835d8"
       ]
     ]
   },
   {
-    "id": "e570d5e6.8d7958",
+    "id": "c9b81c0f.b35a2",
     "type": "switchNode",
     "name": "switch description",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_description'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2183.833869934082,
-    "y": 304.3334608078003,
-    "z": "cf1e958c.7fbef8",
+    "x": 2194.33390045166,
+    "y": 293.3334608078003,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "8223ea44.b877"
+        "57a46fca.b19958"
       ]
     ]
   },
   {
-    "id": "2fe6f50.ba2558c",
+    "id": "972db21e.7bfc",
     "type": "switchNode",
     "name": "switch routerId",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2172.833656311035,
-    "y": 435.333420753479,
-    "z": "cf1e958c.7fbef8",
+    "x": 2183.3336868286133,
+    "y": 424.333420753479,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "b9d7a29d.1fc0a8"
+        "30ca3831.cb43e8"
       ]
     ]
   },
   {
-    "id": "320c6219.91f19e",
+    "id": "d4313d46.0ad918",
     "type": "switchNode",
     "name": "switch importRT1",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2181.1193923950195,
-    "y": 496.6191740036011,
-    "z": "cf1e958c.7fbef8",
+    "x": 2191.6194229125977,
+    "y": 485.6191740036011,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "db18baa3.a37308"
+        "b3e5d4ae.a3dda"
       ]
     ]
   },
   {
-    "id": "88a16009.d8acd",
+    "id": "4fee8f3d.149ad",
     "type": "switchNode",
     "name": "switch exportRT1",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2182.119453430176,
-    "y": 560.6191447973251,
-    "z": "cf1e958c.7fbef8",
+    "x": 2192.619483947754,
+    "y": 549.6191447973251,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "7071fdd7.40f6bc"
+        "8c2ed6a8.d98208"
       ]
     ]
   },
   {
-    "id": "69aad884.29b65",
+    "id": "5a1f2e0e.d48708",
     "type": "switchNode",
     "name": "switch vni",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2153.1194229125977,
-    "y": 623.619176864624,
-    "z": "cf1e958c.7fbef8",
+    "x": 2163.619453430176,
+    "y": 612.619176864624,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "62dcb995.73bbd"
+        "b1cfec26.3ec6b"
       ]
     ]
   },
   {
-    "id": "aa4e7849.32cd9",
+    "id": "a76462ff.b835d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2370.833869934082,
-    "y": 249.33347511291504,
-    "z": "cf1e958c.7fbef8",
+    "x": 2381.33390045166,
+    "y": 238.33347511291504,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "13456a67.fe8996"
+        "c92e65bb.5b6848"
       ]
     ]
   },
   {
-    "id": "8223ea44.b877",
+    "id": "57a46fca.b19958",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2381.833869934082,
-    "y": 304.3334608078003,
-    "z": "cf1e958c.7fbef8",
+    "x": 2392.33390045166,
+    "y": 293.3334608078003,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "dd206567.023688"
+        "f358b487.1305d8"
       ]
     ]
   },
   {
-    "id": "b9d7a29d.1fc0a8",
+    "id": "30ca3831.cb43e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2377.833656311035,
-    "y": 434.333420753479,
-    "z": "cf1e958c.7fbef8",
+    "x": 2388.3336868286133,
+    "y": 423.333420753479,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "b00c15e3.57b258"
+        "508f3269.7b7274"
       ]
     ]
   },
   {
-    "id": "db18baa3.a37308",
+    "id": "b3e5d4ae.a3dda",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2383.1193923950195,
-    "y": 495.6191740036011,
-    "z": "cf1e958c.7fbef8",
+    "x": 2393.6194229125977,
+    "y": 484.6191740036011,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "b67dfe0e.da3b68"
+        "b0552f88.544ae8"
       ]
     ]
   },
   {
-    "id": "7071fdd7.40f6bc",
+    "id": "8c2ed6a8.d98208",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2378.119453430176,
-    "y": 557.6191447973251,
-    "z": "cf1e958c.7fbef8",
+    "x": 2388.619483947754,
+    "y": 546.6191447973251,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "8e66a40c.ada548"
+        "caf135a5.75dfb"
       ]
     ]
   },
   {
-    "id": "62dcb995.73bbd",
+    "id": "b1cfec26.3ec6b",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2359.1194229125977,
-    "y": 623.619176864624,
-    "z": "cf1e958c.7fbef8",
+    "x": 2369.619453430176,
+    "y": 612.619176864624,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "3d1ad610.f82f92"
+        "9fed6f8d.3cc17"
       ]
     ]
   },
   {
-    "id": "dd206567.023688",
+    "id": "f358b487.1305d8",
     "type": "set",
     "name": "set description",
     "xml": "<set>\n<parameter name='prop.dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2563.833869934082,
-    "y": 297.3334608078003,
-    "z": "cf1e958c.7fbef8",
+    "x": 2574.33390045166,
+    "y": 286.3334608078003,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "b00c15e3.57b258",
+    "id": "508f3269.7b7274",
     "type": "set",
     "name": "set router_id",
     "xml": "<set>\n<parameter name='prop.dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2568.8338775634766,
-    "y": 427.3335075378418,
-    "z": "cf1e958c.7fbef8",
+    "x": 2579.3339080810547,
+    "y": 416.3335075378418,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "3d1ad610.f82f92",
+    "id": "9fed6f8d.3cc17",
     "type": "set",
     "name": "set vni",
     "xml": "<set>\n<parameter name='prop.dci-connects.vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2529.1194229125977,
-    "y": 615.619176864624,
-    "z": "cf1e958c.7fbef8",
+    "x": 2539.619453430176,
+    "y": 604.619176864624,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "1a1ab9fe.172d5e",
+    "id": "9c5e659e.5a8468",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 737.119140625,
-    "y": 1201.0477294921875,
-    "z": "cf1e958c.7fbef8",
+    "x": 747.6191711425781,
+    "y": 1190.0477294921875,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "d425399b.6eb9d",
+    "id": "c19cf751.1eed5",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2167.00040435791,
-    "y": 191.50010681152344,
-    "z": "cf1e958c.7fbef8",
+    "x": 2177.5004348754883,
+    "y": 180.50010681152344,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "b5fa6ca4.bca08"
+        "d75f53ba.27ad98"
       ]
     ]
   },
   {
-    "id": "b5fa6ca4.bca08",
+    "id": "d75f53ba.27ad98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2365.00040435791,
-    "y": 191.50010681152344,
-    "z": "cf1e958c.7fbef8",
+    "x": 2375.5004348754883,
+    "y": 180.50010681152344,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "8c66be71.462ad"
+        "be2d314a.29948"
       ]
     ]
   },
   {
-    "id": "8c66be71.462ad",
+    "id": "be2d314a.29948",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.dci-connects.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2547.00040435791,
-    "y": 184.50010681152344,
-    "z": "cf1e958c.7fbef8",
+    "x": 2557.5004348754883,
+    "y": 173.50010681152344,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "9c7489c7.684fa",
+    "id": "132409b3.4b71ee",
     "type": "switchNode",
     "name": "switch networkName",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2190.5001907348633,
-    "y": 370.5000467300415,
-    "z": "cf1e958c.7fbef8",
+    "x": 2201.0002212524414,
+    "y": 359.5000467300415,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "cc2233ba.9a0b28"
+        "b22fe3e2.4a61a"
       ]
     ]
   },
   {
-    "id": "cc2233ba.9a0b28",
+    "id": "b22fe3e2.4a61a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2388.5001907348633,
-    "y": 370.5000467300415,
-    "z": "cf1e958c.7fbef8",
+    "x": 2399.0002212524414,
+    "y": 359.5000467300415,
+    "z": "e441b8db.02f6b8",
     "wires": [
-      []
+      [
+        "6eecda19.439af4"
+      ]
     ]
   },
   {
-    "id": "24a12c20.3823c4",
+    "id": "e96c5239.cc3f4",
     "type": "block",
     "name": "block : execute",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 737.4999008178711,
-    "y": 611.5000457763672,
-    "z": "cf1e958c.7fbef8",
+    "x": 747.9999313354492,
+    "y": 600.5000457763672,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "37a31ee0.24b852",
-        "23165d49.4901aa",
-        "5c1bffb4.63e308"
+        "284e1b18.dbac04",
+        "550986c4.f40138",
+        "861b73d2.7c3dc"
       ]
     ]
   },
   {
-    "id": "37a31ee0.24b852",
+    "id": "284e1b18.dbac04",
     "type": "block",
     "name": "block : executeSite1",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1029.9999618530273,
-    "y": 436.0000219345093,
-    "z": "cf1e958c.7fbef8",
+    "x": 1040.4999923706055,
+    "y": 425.0000219345093,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "ee9e843c.f2eaa8",
-        "9f9de06d.e9691"
+        "11728db1.0b1f22",
+        "82851975.f9c43"
       ]
     ]
   },
   {
-    "id": "23165d49.4901aa",
+    "id": "550986c4.f40138",
     "type": "block",
     "name": "block : executeSite2",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1047.0000076293945,
-    "y": 952.0000047683716,
-    "z": "cf1e958c.7fbef8",
+    "x": 1057.5000381469727,
+    "y": 941.0000047683716,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "70a4ded.49d87a",
-        "9f9de06d.e9691"
+        "ef1d071a.3ba078",
+        "82851975.f9c43"
       ]
     ]
   },
   {
-    "id": "3d56dd00.415eac",
+    "id": "d7d72f5f.7a7ce",
     "type": "switchNode",
     "name": "switch id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2141.500213623047,
-    "y": 770.9999389648438,
-    "z": "cf1e958c.7fbef8",
+    "x": 2152.000244140625,
+    "y": 759.9999389648438,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "e78901da.ff61b8"
+        "d63e1652.f569d"
       ]
     ]
   },
   {
-    "id": "fe2e1517.a2ac7",
+    "id": "dec2ce36.a7d0b8",
     "type": "switchNode",
     "name": "switch description",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_description'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2165.5005645751953,
-    "y": 829.999945640564,
-    "z": "cf1e958c.7fbef8",
+    "x": 2176.0005950927734,
+    "y": 818.999945640564,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "2d58a544.c935ea",
-        "8505b154.9fb048"
+        "1dec5f83.486278",
+        "2b5e6af5.fa1be6"
       ]
     ]
   },
   {
-    "id": "4147e9a8.080da",
+    "id": "98740756.5a0698",
     "type": "switchNode",
     "name": "switch routerId",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2174.499954223633,
-    "y": 1025.9999113082886,
-    "z": "cf1e958c.7fbef8",
+    "x": 2184.999984741211,
+    "y": 1014.9999113082886,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "f5bf01a7.290cc"
+        "526a88c5.c1e6f"
       ]
     ]
   },
   {
-    "id": "aef1e9ce.a6ab3",
+    "id": "cf346f91.adf2b8",
     "type": "switchNode",
     "name": "switch importRT1",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2182.785690307617,
-    "y": 1087.2856645584106,
-    "z": "cf1e958c.7fbef8",
+    "x": 2193.2857208251953,
+    "y": 1076.2856645584106,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "2d67d7d8.2296d"
+        "fa93b7e1.ca525"
       ]
     ]
   },
   {
-    "id": "360441dc.77ddb6",
+    "id": "ef96aea9.bb52b8",
     "type": "switchNode",
     "name": "switch exportRT1",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_exportRT1'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2183.7857513427734,
-    "y": 1151.2856353521347,
-    "z": "cf1e958c.7fbef8",
+    "x": 2194.2857818603516,
+    "y": 1140.2856353521347,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "fb49f623.4e5d48"
+        "3dfa7241.2277c6"
       ]
     ]
   },
   {
-    "id": "2c78d4f1.048ee4",
+    "id": "38b0bb00.7d39e6",
     "type": "switchNode",
     "name": "switch vni",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2154.7857208251953,
-    "y": 1214.2856674194336,
-    "z": "cf1e958c.7fbef8",
+    "x": 2165.2857513427734,
+    "y": 1203.2856674194336,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "dd227859.e75bf8"
+        "4f915472.693e64"
       ]
     ]
   },
   {
-    "id": "e78901da.ff61b8",
+    "id": "d63e1652.f569d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2356.500213623047,
-    "y": 769.9999389648438,
-    "z": "cf1e958c.7fbef8",
+    "x": 2367.000244140625,
+    "y": 758.9999389648438,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "f1dbc88c.9a5b98"
+        "fa875aed.c34ac"
       ]
     ]
   },
   {
-    "id": "2d58a544.c935ea",
+    "id": "1dec5f83.486278",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2363.5005645751953,
-    "y": 829.999945640564,
-    "z": "cf1e958c.7fbef8",
+    "x": 2374.0005950927734,
+    "y": 818.999945640564,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "432bb78.173bc48"
+        "33fd7326.698864"
       ]
     ]
   },
   {
-    "id": "f5bf01a7.290cc",
+    "id": "526a88c5.c1e6f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2379.499954223633,
-    "y": 1024.9999113082886,
-    "z": "cf1e958c.7fbef8",
+    "x": 2389.999984741211,
+    "y": 1013.9999113082886,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "f3e93f46.78cae8"
+        "d17959a.97f2aa8"
       ]
     ]
   },
   {
-    "id": "2d67d7d8.2296d",
+    "id": "fa93b7e1.ca525",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2384.785690307617,
-    "y": 1086.2856645584106,
-    "z": "cf1e958c.7fbef8",
+    "x": 2395.2857208251953,
+    "y": 1075.2856645584106,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "e5ced29d.00d08"
+        "5dc95384.4ed664"
       ]
     ]
   },
   {
-    "id": "fb49f623.4e5d48",
+    "id": "3dfa7241.2277c6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2379.7857513427734,
-    "y": 1148.2856353521347,
-    "z": "cf1e958c.7fbef8",
+    "x": 2390.2857818603516,
+    "y": 1137.2856353521347,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "199235cd.b410ca"
+        "c2766476.fb709"
       ]
     ]
   },
   {
-    "id": "dd227859.e75bf8",
+    "id": "4f915472.693e64",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2360.7857208251953,
-    "y": 1214.2856674194336,
-    "z": "cf1e958c.7fbef8",
+    "x": 2371.2857513427734,
+    "y": 1203.2856674194336,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "6a38de12.5b185"
+        "6837898c.7c5d88"
       ]
     ]
   },
   {
-    "id": "432bb78.173bc48",
+    "id": "33fd7326.698864",
     "type": "set",
     "name": "set description",
     "xml": "<set>\n<parameter name='prop.dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2545.5005645751953,
-    "y": 822.999945640564,
-    "z": "cf1e958c.7fbef8",
+    "x": 2556.0005950927734,
+    "y": 811.999945640564,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "f3e93f46.78cae8",
+    "id": "d17959a.97f2aa8",
     "type": "set",
     "name": "set router_id",
     "xml": "<set>\n<parameter name='prop.dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2570.500175476074,
-    "y": 1017.9999980926514,
-    "z": "cf1e958c.7fbef8",
+    "x": 2581.0002059936523,
+    "y": 1006.9999980926514,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "6a38de12.5b185",
+    "id": "6837898c.7c5d88",
     "type": "set",
     "name": "set vni",
     "xml": "<set>\n<parameter name='prop.dci-connects.vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2530.7857208251953,
-    "y": 1206.2856674194336,
-    "z": "cf1e958c.7fbef8",
+    "x": 2541.2857513427734,
+    "y": 1195.2856674194336,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "15d71463.8bcfa4",
+    "id": "70524c4e.0bccac",
     "type": "switchNode",
     "name": "switch networkName",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2192.166488647461,
-    "y": 961.1665372848511,
-    "z": "cf1e958c.7fbef8",
+    "x": 2202.666519165039,
+    "y": 950.1665372848511,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "8641ca6f.8854e"
+        "4079fe10.73712"
       ]
     ]
   },
   {
-    "id": "8641ca6f.8854e",
+    "id": "4079fe10.73712",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2390.166488647461,
-    "y": 961.1665372848511,
-    "z": "cf1e958c.7fbef8",
+    "x": 2400.666519165039,
+    "y": 950.1665372848511,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "c4b84815.27de5"
+        "b289aa17.d6ea6"
       ]
     ]
   },
   {
-    "id": "415cf18c.8dc438",
+    "id": "280833fe.9bdbb4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1660.4996643066406,
-    "y": 892.9998967647552,
-    "z": "cf1e958c.7fbef8",
+    "x": 1670.9996948242188,
+    "y": 881.9998967647552,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "3d56dd00.415eac",
-        "fe2e1517.a2ac7",
-        "4147e9a8.080da",
-        "aef1e9ce.a6ab3",
-        "360441dc.77ddb6",
-        "2c78d4f1.048ee4",
-        "15d71463.8bcfa4"
+        "d7d72f5f.7a7ce",
+        "dec2ce36.a7d0b8",
+        "98740756.5a0698",
+        "cf346f91.adf2b8",
+        "ef96aea9.bb52b8",
+        "38b0bb00.7d39e6",
+        "70524c4e.0bccac"
       ]
     ]
   },
   {
-    "id": "70a4ded.49d87a",
+    "id": "ef1d071a.3ba078",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1413.499755859375,
-    "y": 894.9999272823334,
-    "z": "cf1e958c.7fbef8",
+    "x": 1423.9997863769531,
+    "y": 883.9999272823334,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "415cf18c.8dc438"
+        "280833fe.9bdbb4"
       ]
     ]
   },
   {
-    "id": "13456a67.fe8996",
+    "id": "c92e65bb.5b6848",
     "type": "set",
     "name": "set id",
     "xml": "<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2552.5002517700195,
-    "y": 243.00002479553223,
-    "z": "cf1e958c.7fbef8",
+    "x": 2563.0002822875977,
+    "y": 232.00002479553223,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "2e60a059.b3e188",
+    "id": "cd65a796.961288",
     "type": "switchNode",
     "name": "switch tunnelType",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2171.999969482422,
-    "y": 692.9999389648438,
-    "z": "cf1e958c.7fbef8",
+    "x": 2182.5,
+    "y": 681.9999389648438,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "4b99b834.6c111"
+        "1fce8229.b61736"
       ]
     ]
   },
   {
-    "id": "4b99b834.6c111",
+    "id": "1fce8229.b61736",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2377.999969482422,
-    "y": 692.9999389648438,
-    "z": "cf1e958c.7fbef8",
+    "x": 2388.5,
+    "y": 681.9999389648438,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "1995f2e4.a2f79d"
+        "868e249c.157cd8"
       ]
     ]
   },
   {
-    "id": "1995f2e4.a2f79d",
+    "id": "868e249c.157cd8",
     "type": "set",
     "name": "set tunnelType",
     "xml": "<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2547.999969482422,
-    "y": 684.9999389648438,
-    "z": "cf1e958c.7fbef8",
+    "x": 2558.5,
+    "y": 673.9999389648438,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "9f9de06d.e9691",
+    "id": "82851975.f9c43",
     "type": "block",
     "name": "block : sendRequest",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1325.9999885559082,
-    "y": 1452.4999446868896,
-    "z": "cf1e958c.7fbef8",
+    "x": 1336.5000190734863,
+    "y": 1441.4999446868896,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "4abf4c0.6ba8234",
-        "f7dfb0f6.24b96",
-        "9eb66fb5.27033"
+        "2e5b4bbb.d3f49c",
+        "cc5ac5d8.cd6108",
+        "fdf840a9.0444e8"
       ]
     ]
   },
   {
-    "id": "13c2385e.c3283",
+    "id": "a91c0c9d.68d8d8",
     "type": "execute",
     "name": "execute RestApiCallNode Activate Vxlan Tunnel",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir +'/l3-dci-connects-template.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2134.0002632141113,
-    "y": 1515.4998998641968,
-    "z": "cf1e958c.7fbef8",
+    "x": 2144.5002937316895,
+    "y": 1504.4998998641968,
+    "z": "e441b8db.02f6b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "cd3c6fdb.337a48",
+    "id": "dc2e27d2.f3149",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1812.4999465942383,
-    "y": 1223.499531507492,
-    "z": "cf1e958c.7fbef8",
+    "x": 1822.9999771118164,
+    "y": 1212.499531507492,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "9de2e39e.9d2c88"
+        "7ff9492b.841e"
       ]
     ]
   },
   {
-    "id": "e94227c8.8ebae",
+    "id": "ac70e961.9619e8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1819.4999465942383,
-    "y": 1261.499531507492,
-    "z": "cf1e958c.7fbef8",
+    "x": 1829.9999771118164,
+    "y": 1250.499531507492,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "2833f620.7533ba"
+        "eb823b4e.91d25"
       ]
     ]
   },
   {
-    "id": "2d9e1f4a.03602",
+    "id": "ca05e8cb.5f4ec",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1811.4999465942383,
-    "y": 1303.499531507492,
-    "z": "cf1e958c.7fbef8",
+    "x": 1821.9999771118164,
+    "y": 1292.499531507492,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "ddb11f26.1e1f6"
+        "85a36612.a37bb8"
       ]
     ]
   },
   {
-    "id": "2833f620.7533ba",
+    "id": "eb823b4e.91d25",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1976.4999465942383,
-    "y": 1265.499531507492,
-    "z": "cf1e958c.7fbef8",
+    "x": 1986.9999771118164,
+    "y": 1254.499531507492,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "ddb11f26.1e1f6",
+    "id": "85a36612.a37bb8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1969.4999465942383,
-    "y": 1312.499531507492,
-    "z": "cf1e958c.7fbef8",
+    "x": 1979.9999771118164,
+    "y": 1301.499531507492,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "4abf4c0.6ba8234",
+    "id": "fdf840a9.0444e8",
     "type": "get-resource",
     "name": "get-resource esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1593.730827331543,
-    "y": 1262.8072967529297,
-    "z": "cf1e958c.7fbef8",
+    "x": 1604.230857849121,
+    "y": 1251.8072967529297,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "cd3c6fdb.337a48",
-        "e94227c8.8ebae",
-        "2d9e1f4a.03602"
+        "dc2e27d2.f3149",
+        "ac70e961.9619e8",
+        "ca05e8cb.5f4ec"
       ]
     ]
   },
   {
-    "id": "9de2e39e.9d2c88",
+    "id": "7ff9492b.841e",
     "type": "set",
     "name": "set controller data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n",
     "comments": "",
-    "x": 1986.9998779296875,
-    "y": 1219.99951171875,
-    "z": "cf1e958c.7fbef8",
+    "x": 1997.4999084472656,
+    "y": 1208.99951171875,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "f7dfb0f6.24b96",
+    "id": "2e5b4bbb.d3f49c",
     "type": "switchNode",
     "name": "switch tunnelType",
     "xml": "<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1596.9997215270996,
-    "y": 1539.9994106292725,
-    "z": "cf1e958c.7fbef8",
+    "x": 1607.4997520446777,
+    "y": 1528.9994106292725,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "88dd7f05.8bf64",
-        "ffc3e991.fbb298"
+        "3befe90d.b29476",
+        "aa631529.b7acf8"
       ]
     ]
   },
   {
-    "id": "88dd7f05.8bf64",
+    "id": "3befe90d.b29476",
     "type": "outcomeTrue",
     "name": "L3-DCI",
     "xml": "<outcome value='L3-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1809.9998512268066,
-    "y": 1519.9994106292725,
-    "z": "cf1e958c.7fbef8",
+    "x": 1820.4998817443848,
+    "y": 1508.9994106292725,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "13c2385e.c3283"
+        "a91c0c9d.68d8d8"
       ]
     ]
   },
   {
-    "id": "ffc3e991.fbb298",
+    "id": "aa631529.b7acf8",
     "type": "outcomeTrue",
     "name": "L2-DCI",
     "xml": "<outcome value='L2-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1807.9996719360352,
-    "y": 1591.9994106292725,
-    "z": "cf1e958c.7fbef8",
+    "x": 1818.4997024536133,
+    "y": 1580.9994106292725,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "c8efabdf.31825"
+        "acdaaf2d.3fa418"
       ]
     ]
   },
   {
-    "id": "f1dbc88c.9a5b98",
+    "id": "fa875aed.c34ac",
     "type": "set",
     "name": "set id",
     "xml": "<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2530.500186920166,
-    "y": 764.9999914169312,
-    "z": "cf1e958c.7fbef8",
+    "x": 2541.000217437744,
+    "y": 753.9999914169312,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "c8efabdf.31825",
+    "id": "acdaaf2d.3fa418",
     "type": "execute",
     "name": "execute RestApiCallNode Activate Vxlan Tunnel",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir +'/l2-dci-connects-template.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2128.000217437744,
-    "y": 1592.4998359680176,
-    "z": "cf1e958c.7fbef8",
+    "x": 2138.5002479553223,
+    "y": 1581.4998359680176,
+    "z": "e441b8db.02f6b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "8505b154.9fb048",
+    "id": "2b5e6af5.fa1be6",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2362.000144958496,
-    "y": 888.9999752044678,
-    "z": "cf1e958c.7fbef8",
+    "x": 2372.500175476074,
+    "y": 877.9999752044678,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "ccff44a9.224988"
+        "57bbffac.8097a"
       ]
     ]
   },
   {
-    "id": "ccff44a9.224988",
+    "id": "57bbffac.8097a",
     "type": "set",
     "name": "set description",
     "xml": "<set>\n<parameter name='prop.dci-connects.description' value='' />\n",
     "comments": "",
-    "x": 2543.000213623047,
-    "y": 883.9999160766602,
-    "z": "cf1e958c.7fbef8",
+    "x": 2553.500244140625,
+    "y": 872.9999160766602,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "b67dfe0e.da3b68",
+    "id": "b0552f88.544ae8",
     "type": "block",
     "name": "block setEvpnIrts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2564.999725341797,
-    "y": 497.5155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 2575.499755859375,
+    "y": 486.5155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "3c4bea54.b82856",
-        "8b9a2579.97c4d8"
+        "a0835968.abab58",
+        "29e92f82.7e48a"
       ]
     ]
   },
   {
-    "id": "3c4bea54.b82856",
+    "id": "a0835968.abab58",
     "type": "set",
     "name": "set evpn_irts",
     "xml": "<set>\n<parameter name='tmp.dci-connects.evpn_irts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2810.999725341797,
-    "y": 448.5155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 2821.499755859375,
+    "y": 437.5155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "8b9a2579.97c4d8",
+    "id": "29e92f82.7e48a",
     "type": "execute",
     "name": "split evpn_irts",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_irts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_irts\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2839.999725341797,
-    "y": 500.5155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 2850.499755859375,
+    "y": 489.5155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "6faf57d4.2b98a",
-        "39a28639.e8be62"
+        "8e45a14f.6987e8",
+        "7d8c23d3.29c044"
       ]
     ]
   },
   {
-    "id": "39a28639.e8be62",
+    "id": "7d8c23d3.29c044",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3056.999725341797,
-    "y": 426.5155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 3067.499755859375,
+    "y": 415.5155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "d250c5a8.c94c48"
+        "c173e280.2c1e9"
       ]
     ]
   },
   {
-    "id": "6faf57d4.2b98a",
+    "id": "8e45a14f.6987e8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3057.999725341797,
-    "y": 492.5155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 3068.499755859375,
+    "y": 481.5155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "1a465074.76a89"
+        "3e58258.775a2da"
       ]
     ]
   },
   {
-    "id": "1a465074.76a89",
+    "id": "3e58258.775a2da",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3238.999725341797,
-    "y": 490.5155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 3249.499755859375,
+    "y": 479.5155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "93246b40.56e6f",
+    "id": "beca6511.f65ce8",
     "type": "set",
     "name": "set evpn_erts",
     "xml": "<set>\n<parameter name='tmp.dci-connects.evpn_erts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2807.499725341797,
-    "y": 591.0156269073486,
-    "z": "cf1e958c.7fbef8",
+    "x": 2817.999755859375,
+    "y": 580.0156269073486,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "1e83de39.311f02",
+    "id": "5c8c8ec.d68a17",
     "type": "execute",
     "name": "split evpn_erts",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_erts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_erts\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2836.499725341797,
-    "y": 643.0156269073486,
-    "z": "cf1e958c.7fbef8",
+    "x": 2846.999755859375,
+    "y": 632.0156269073486,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "f9ddad4a.598dd",
-        "2c373294.e4fa2e"
+        "f785906c.f11148",
+        "cf6bfe81.a42eb"
       ]
     ]
   },
   {
-    "id": "2c373294.e4fa2e",
+    "id": "cf6bfe81.a42eb",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3053.499725341797,
-    "y": 569.0156269073486,
-    "z": "cf1e958c.7fbef8",
+    "x": 3063.999755859375,
+    "y": 558.0156269073486,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "20631aad.356246"
+        "22c92a4e.65d95e"
       ]
     ]
   },
   {
-    "id": "f9ddad4a.598dd",
+    "id": "f785906c.f11148",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3054.499725341797,
-    "y": 635.0156269073486,
-    "z": "cf1e958c.7fbef8",
+    "x": 3064.999755859375,
+    "y": 624.0156269073486,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "52741d12.107614"
+        "e7b8be46.c3f6f8"
       ]
     ]
   },
   {
-    "id": "52741d12.107614",
+    "id": "e7b8be46.c3f6f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3235.499725341797,
-    "y": 633.0156269073486,
-    "z": "cf1e958c.7fbef8",
+    "x": 3245.999755859375,
+    "y": 622.0156269073486,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "8e66a40c.ada548",
+    "id": "caf135a5.75dfb",
     "type": "block",
     "name": "block setEvpnErts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2558.4996185302734,
-    "y": 553.0156841278076,
-    "z": "cf1e958c.7fbef8",
+    "x": 2568.9996490478516,
+    "y": 542.0156841278076,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "93246b40.56e6f",
-        "1e83de39.311f02"
+        "beca6511.f65ce8",
+        "5c8c8ec.d68a17"
       ]
     ]
   },
   {
-    "id": "d250c5a8.c94c48",
+    "id": "c173e280.2c1e9",
     "type": "for",
     "name": "for each evpn_irts",
     "xml": "<for index='idx' start='0' end='`$tmp.dci-connects.evpn_irts_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3259.4998893737793,
-    "y": 426.0156364440918,
-    "z": "cf1e958c.7fbef8",
+    "x": 3269.9999198913574,
+    "y": 415.0156364440918,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "45b9f14c.5a8a78"
+        "a51d665a.022ac"
       ]
     ]
   },
   {
-    "id": "45b9f14c.5a8a78",
+    "id": "a51d665a.022ac",
     "type": "set",
     "name": "set evpn_irt",
     "xml": "<set>\n<parameter name='prop.dci-connects.evpn_irts[$idx]' value='`$tmp.dci-connects.evpn_irts[$idx]`' />\n",
     "comments": "",
-    "x": 3471.5003814697266,
-    "y": 426.0157890319824,
-    "z": "cf1e958c.7fbef8",
+    "x": 3482.0004119873047,
+    "y": 415.0157890319824,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "20631aad.356246",
+    "id": "22c92a4e.65d95e",
     "type": "for",
     "name": "for each evpn_erts",
     "xml": "<for index='idx' start='0' end='`$tmp.dci-connects.evpn_erts_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3252.999725341797,
-    "y": 565.0156269073486,
-    "z": "cf1e958c.7fbef8",
+    "x": 3263.499755859375,
+    "y": 554.0156269073486,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "f124e02f.c76418"
+        "aa48125e.46af68"
       ]
     ]
   },
   {
-    "id": "f124e02f.c76418",
+    "id": "aa48125e.46af68",
     "type": "set",
     "name": "set evpn_ert",
     "xml": "<set>\n<parameter name='prop.dci-connects.evpn_erts[$idx]' value='`$tmp.dci-connects.evpn_erts[$idx]`' />\n",
     "comments": "",
-    "x": 3465.000217437744,
-    "y": 565.0157794952393,
-    "z": "cf1e958c.7fbef8",
+    "x": 3475.5002479553223,
+    "y": 554.0157794952393,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "796a7af8.8352e4",
+    "id": "df48b455.f78358",
     "type": "set",
     "name": "set evpn_irts",
     "xml": "<set>\n<parameter name='tmp.dci-connects.evpn_irts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2823.999725341797,
-    "y": 1031.5155658721924,
-    "z": "cf1e958c.7fbef8",
+    "x": 2834.499755859375,
+    "y": 1020.5155658721924,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "60fc19ba.39f018",
+    "id": "4671089c.4065d",
     "type": "execute",
     "name": "split evpn_irts",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_irts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_irts\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2852.999725341797,
-    "y": 1083.5155658721924,
-    "z": "cf1e958c.7fbef8",
+    "x": 2863.499755859375,
+    "y": 1072.5155658721924,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "e9500a31.e6d9b8",
-        "6c399572.83feec"
+        "c07a8fe4.eee06",
+        "b25e01c2.b4c498"
       ]
     ]
   },
   {
-    "id": "6c399572.83feec",
+    "id": "b25e01c2.b4c498",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3069.999725341797,
-    "y": 1009.5155658721924,
-    "z": "cf1e958c.7fbef8",
+    "x": 3080.499755859375,
+    "y": 998.5155658721924,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "db50f835.531508"
+        "fd6137f0.99036"
       ]
     ]
   },
   {
-    "id": "e9500a31.e6d9b8",
+    "id": "c07a8fe4.eee06",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3070.999725341797,
-    "y": 1075.5155658721924,
-    "z": "cf1e958c.7fbef8",
+    "x": 3081.499755859375,
+    "y": 1064.5155658721924,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "344af43b.bbfec4"
+        "ae803047.be9f4"
       ]
     ]
   },
   {
-    "id": "344af43b.bbfec4",
+    "id": "ae803047.be9f4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3251.999725341797,
-    "y": 1073.5155658721924,
-    "z": "cf1e958c.7fbef8",
+    "x": 3262.499755859375,
+    "y": 1062.5155658721924,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "a47eee0a.4ca01",
+    "id": "dca9a5fc.c2dd7",
     "type": "set",
     "name": "set evpn_erts",
     "xml": "<set>\n<parameter name='tmp.dci-connects.evpn_erts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2820.499725341797,
-    "y": 1174.0155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 2830.999755859375,
+    "y": 1163.0155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "ccdb12e8.f8f76",
+    "id": "d09c4d61.8c28a8",
     "type": "execute",
     "name": "split evpn_erts",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_erts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_erts\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2849.499725341797,
-    "y": 1226.0155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 2859.999755859375,
+    "y": 1215.0155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "15b778b0.8c6747",
-        "1bc5be40.aeed72"
+        "16d5f80f.face6",
+        "d6e6a1c9.8aba28"
       ]
     ]
   },
   {
-    "id": "1bc5be40.aeed72",
+    "id": "d6e6a1c9.8aba28",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3066.499725341797,
-    "y": 1152.0155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 3076.999755859375,
+    "y": 1141.0155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "281922c5.76ef56"
+        "1e8c72ef.2dadbd"
       ]
     ]
   },
   {
-    "id": "15b778b0.8c6747",
+    "id": "16d5f80f.face6",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3067.499725341797,
-    "y": 1218.0155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 3077.999755859375,
+    "y": 1207.0155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "1917da37.456156"
+        "a59e780.8734808"
       ]
     ]
   },
   {
-    "id": "1917da37.456156",
+    "id": "a59e780.8734808",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3248.499725341797,
-    "y": 1216.0155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 3258.999755859375,
+    "y": 1205.0155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "db50f835.531508",
+    "id": "fd6137f0.99036",
     "type": "for",
     "name": "for each evpn_irts",
     "xml": "<for index='idx' start='0' end='`$tmp.dci-connects.evpn_irts_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3272.4998893737793,
-    "y": 1009.0156059265137,
-    "z": "cf1e958c.7fbef8",
+    "x": 3282.9999198913574,
+    "y": 998.0156059265137,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "de76e6b5.db4778"
+        "3366154b.09f69a"
       ]
     ]
   },
   {
-    "id": "de76e6b5.db4778",
+    "id": "3366154b.09f69a",
     "type": "set",
     "name": "set evpn_irt",
     "xml": "<set>\n<parameter name='prop.dci-connects.evpn_irts[$idx]' value='`$tmp.dci-connects.evpn_irts[$idx]`' />\n",
     "comments": "",
-    "x": 3484.5003814697266,
-    "y": 1009.0157585144043,
-    "z": "cf1e958c.7fbef8",
+    "x": 3495.0004119873047,
+    "y": 998.0157585144043,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "281922c5.76ef56",
+    "id": "1e8c72ef.2dadbd",
     "type": "for",
     "name": "for each evpn_erts",
     "xml": "<for index='idx' start='0' end='`$tmp.dci-connects.evpn_erts_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3265.999725341797,
-    "y": 1148.0155963897705,
-    "z": "cf1e958c.7fbef8",
+    "x": 3276.499755859375,
+    "y": 1137.0155963897705,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "2d79e6ba.6ac452"
+        "83278032.925b58"
       ]
     ]
   },
   {
-    "id": "2d79e6ba.6ac452",
+    "id": "83278032.925b58",
     "type": "set",
     "name": "set evpn_ert",
     "xml": "<set>\n<parameter name='prop.dci-connects.evpn_erts[$idx]' value='`$tmp.dci-connects.evpn_erts[$idx]`' />\n",
     "comments": "",
-    "x": 3478.000217437744,
-    "y": 1148.0157489776611,
-    "z": "cf1e958c.7fbef8",
+    "x": 3488.5002479553223,
+    "y": 1137.0157489776611,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "e5ced29d.00d08",
+    "id": "5dc95384.4ed664",
     "type": "block",
     "name": "block setEvpnIrts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2577.999725341797,
-    "y": 1080.5155658721924,
-    "z": "cf1e958c.7fbef8",
+    "x": 2588.499755859375,
+    "y": 1069.5155658721924,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "796a7af8.8352e4",
-        "60fc19ba.39f018"
+        "df48b455.f78358",
+        "4671089c.4065d"
       ]
     ]
   },
   {
-    "id": "199235cd.b410ca",
+    "id": "c2766476.fb709",
     "type": "block",
     "name": "block setEvpnErts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2571.4996185302734,
-    "y": 1136.0156536102295,
-    "z": "cf1e958c.7fbef8",
+    "x": 2581.9996490478516,
+    "y": 1125.0156536102295,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "a47eee0a.4ca01",
-        "ccdb12e8.f8f76"
+        "dca9a5fc.c2dd7",
+        "d09c4d61.8c28a8"
       ]
     ]
   },
   {
-    "id": "243e5ea1.666f7a",
-    "type": "comment",
-    "name": "TODO",
-    "info": "Get information from VFC team about the A&AI location where name to network mapping will be available.",
-    "comments": "",
-    "x": 2552.9999771118164,
-    "y": 365.5156421661377,
-    "z": "cf1e958c.7fbef8",
-    "wires": []
-  },
-  {
-    "id": "ab97722c.5d4ce",
+    "id": "a8dbfcec.d67fe8",
     "type": "execute",
     "name": "execute generate-overlay-network-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.dci.network-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1383.1666793823242,
-    "y": 1616.3334283828735,
-    "z": "cf1e958c.7fbef8",
+    "x": 1393.6667098999023,
+    "y": 1605.3334283828735,
+    "z": "e441b8db.02f6b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "9ef95f17.a0015",
+    "id": "c861a6a.2bad4d8",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1375.1666946411133,
-    "y": 1686.3334347009659,
-    "z": "cf1e958c.7fbef8",
+    "x": 1385.6667251586914,
+    "y": 1675.3334347009659,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "43323e6.68001c",
-        "e3dee700.85526"
+        "ec47d113.88981",
+        "a4b7938c.8397d8"
       ]
     ]
   },
   {
-    "id": "43323e6.68001c",
+    "id": "ec47d113.88981",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1648.9762649536133,
-    "y": 1655.2858272790909,
-    "z": "cf1e958c.7fbef8",
+    "x": 1659.4762954711914,
+    "y": 1644.2858272790909,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "b3ef8065.c2b5f"
+        "1ffb3be3.659b34"
       ]
     ]
   },
   {
-    "id": "e3dee700.85526",
+    "id": "a4b7938c.8397d8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1643.8334426879883,
-    "y": 1701.0001217126846,
-    "z": "cf1e958c.7fbef8",
+    "x": 1654.3334732055664,
+    "y": 1690.0001217126846,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "4d22c774.611da8"
+        "b8b2072e.0d1078"
       ]
     ]
   },
   {
-    "id": "b3ef8065.c2b5f",
+    "id": "1ffb3be3.659b34",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1801.9762649536133,
-    "y": 1654.8572384119034,
-    "z": "cf1e958c.7fbef8",
+    "x": 1812.4762954711914,
+    "y": 1643.8572384119034,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "4d22c774.611da8",
+    "id": "b8b2072e.0d1078",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1803.4048538208008,
-    "y": 1699.8572994470596,
-    "z": "cf1e958c.7fbef8",
+    "x": 1813.904884338379,
+    "y": 1688.8572994470596,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "651071ce.194a2",
+    "id": "a90e8a48.4fa9a8",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name=\"service-data.networks.network[$nidx].network-id\" value='`$prop.dci.network-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n<parameter name=\"service-data.networks.network_length\" value='`$nidx+1`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n\n\n",
     "comments": "",
-    "x": 1347.1666793823242,
-    "y": 1758.3334369659424,
-    "z": "cf1e958c.7fbef8",
+    "x": 1357.6667098999023,
+    "y": 1747.3334369659424,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "5c1bffb4.63e308",
+    "id": "861b73d2.7c3dc",
     "type": "block",
     "name": "block : saveNetworkData",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1043.4999313354492,
-    "y": 1597.6666278839111,
-    "z": "cf1e958c.7fbef8",
+    "x": 1053.9999618530273,
+    "y": 1586.6666278839111,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "ab97722c.5d4ce",
-        "9ef95f17.a0015",
-        "651071ce.194a2",
-        "9eebec9d.2f3c9"
+        "a8dbfcec.d67fe8",
+        "c861a6a.2bad4d8",
+        "a90e8a48.4fa9a8",
+        "b943b7ea.3454d"
       ]
     ]
   },
   {
-    "id": "9eebec9d.2f3c9",
+    "id": "b943b7ea.3454d",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$prop.dci.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.dci.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 1379.4999313354492,
-    "y": 1828.0000019073486,
-    "z": "cf1e958c.7fbef8",
+    "x": 1389.9999618530273,
+    "y": 1817.0000019073486,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "9eb66fb5.27033",
+    "id": "cc5ac5d8.cd6108",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"dci-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"dci-connects.name\"/>\n<parameter name=\"field4\" value=\"`$prop.dci-connects.name`\" />\n<parameter name=\"field5\" value=\"dci-connects.id\"/>\n<parameter name=\"field6\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1561.833724975586,
-    "y": 1456.6667127609253,
-    "z": "cf1e958c.7fbef8",
+    "x": 1572.333755493164,
+    "y": 1445.6667127609253,
+    "z": "e441b8db.02f6b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "d334df3b.7e75d8",
+    "id": "7460e970.19e46",
     "type": "comment",
     "name": "TODO",
     "info": "Currently activate is done without assignment, later divide in two phases.",
     "comments": "",
-    "x": 1338.4999313354492,
-    "y": 90.66666603088379,
-    "z": "cf1e958c.7fbef8",
+    "x": 1348.9999618530273,
+    "y": 79.66666603088379,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "c4b84815.27de5",
+    "id": "b289aa17.d6ea6",
     "type": "block",
     "name": "block setLocalNetworks",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2561,
-    "y": 960,
-    "z": "cf1e958c.7fbef8",
+    "x": 2571.500030517578,
+    "y": 949,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "fd7ef12a.af13a8",
-        "431dac78.a25634"
+        "f627cda3.14a76",
+        "25c7d846.4b2ee8"
       ]
     ]
   },
   {
-    "id": "fd7ef12a.af13a8",
+    "id": "f627cda3.14a76",
     "type": "set",
     "name": "set local_networks",
     "xml": "<set>\n<parameter name='tmp.dci-connects.local_networks.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2764,
-    "y": 895,
-    "z": "cf1e958c.7fbef8",
+    "x": 2774.500030517578,
+    "y": 884,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "431dac78.a25634",
+    "id": "25c7d846.4b2ee8",
     "type": "execute",
     "name": "split local_networks",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.local_networks.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.local_networks\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2793,
-    "y": 947,
-    "z": "cf1e958c.7fbef8",
+    "x": 2803.500030517578,
+    "y": 936,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "b26744aa.5ef5f8",
-        "4f0191d.7bcab7"
+        "fc4b2239.ad95e",
+        "b78d8584.51d7a"
       ]
     ]
   },
   {
-    "id": "b26744aa.5ef5f8",
+    "id": "fc4b2239.ad95e",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2990,
-    "y": 882,
-    "z": "cf1e958c.7fbef8",
+    "x": 3000.500030517578,
+    "y": 871,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "7b77b046.9a18c"
+        "967e5828.2a4"
       ]
     ]
   },
   {
-    "id": "4f0191d.7bcab7",
+    "id": "b78d8584.51d7a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2991,
-    "y": 948,
-    "z": "cf1e958c.7fbef8",
+    "x": 3001.500030517578,
+    "y": 937,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "5dbbe62.d3c5198"
+        "daabf19.5290e1"
       ]
     ]
   },
   {
-    "id": "5dbbe62.d3c5198",
+    "id": "daabf19.5290e1",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3172,
-    "y": 946,
-    "z": "cf1e958c.7fbef8",
+    "x": 3182.500030517578,
+    "y": 935,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "7b77b046.9a18c",
+    "id": "967e5828.2a4",
     "type": "for",
     "name": "for each local_networks",
     "xml": "<for index='idx' start='0' end='`$tmp.dci-connects.local_networks_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3192.5001640319824,
-    "y": 881.5000400543213,
-    "z": "cf1e958c.7fbef8",
+    "x": 3203.0001945495605,
+    "y": 870.5000400543213,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "481aa367.49438c"
+        "fc475635.0ecc7"
       ]
     ]
   },
   {
-    "id": "481aa367.49438c",
+    "id": "fc475635.0ecc7",
     "type": "get-resource",
     "name": "get-resource l3-network",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-network\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.dci-connects.local_networks[$idx] AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.l3-network' local-only='false' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3465,
-    "y": 880,
-    "z": "cf1e958c.7fbef8",
+    "x": 3475.500030517578,
+    "y": 869,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "f9f232d0.230d9",
-        "ec03fafa.3b0368",
-        "9c02da41.94b9a"
+        "3713fed6.e8a612",
+        "948581dc.359b18",
+        "a5fff0f8.ef0de"
       ]
     ]
   },
   {
-    "id": "f9f232d0.230d9",
+    "id": "3713fed6.e8a612",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3683.7691192626953,
-    "y": 840.6922347545624,
-    "z": "cf1e958c.7fbef8",
+    "x": 3694.2691497802734,
+    "y": 829.6922347545624,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "a65e1ab.dd1dde8"
+        "74fe93ab.32caec"
       ]
     ]
   },
   {
-    "id": "ec03fafa.3b0368",
+    "id": "948581dc.359b18",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3690.7691192626953,
-    "y": 878.6922347545624,
-    "z": "cf1e958c.7fbef8",
+    "x": 3701.2691497802734,
+    "y": 867.6922347545624,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "2c2a4f31.2b7338"
+        "3de46cb6.4664a4"
       ]
     ]
   },
   {
-    "id": "9c02da41.94b9a",
+    "id": "a5fff0f8.ef0de",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3682.7691192626953,
-    "y": 920.6922347545624,
-    "z": "cf1e958c.7fbef8",
+    "x": 3693.2691497802734,
+    "y": 909.6922347545624,
+    "z": "e441b8db.02f6b8",
     "wires": [
       [
-        "ae479c4c.16ee9"
+        "16b5935a.976ded"
       ]
     ]
   },
   {
-    "id": "2c2a4f31.2b7338",
+    "id": "3de46cb6.4664a4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3847.7691192626953,
-    "y": 882.6922347545624,
-    "z": "cf1e958c.7fbef8",
+    "x": 3858.2691497802734,
+    "y": 871.6922347545624,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "ae479c4c.16ee9",
+    "id": "16b5935a.976ded",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3840.7691192626953,
-    "y": 929.6922347545624,
-    "z": "cf1e958c.7fbef8",
+    "x": 3851.2691497802734,
+    "y": 918.6922347545624,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "a65e1ab.dd1dde8",
+    "id": "74fe93ab.32caec",
     "type": "set",
     "name": "set network-id",
     "xml": "<set>\n<parameter name='prop.dci-connects.local_networks[$idx]' value=\"`$tmp.aai.l3-network.network-id`\" />\n",
     "comments": "",
-    "x": 3858.2690505981445,
-    "y": 837.1922149658203,
-    "z": "cf1e958c.7fbef8",
+    "x": 3868.7690811157227,
+    "y": 826.1922149658203,
+    "z": "e441b8db.02f6b8",
     "wires": []
   },
   {
-    "id": "56f7544c.7d9984",
+    "id": "edee7e9.f5684",
     "type": "save",
     "name": "save overlay configuration in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $prop.dci.network-id' >\n<parameter name='configuration-id' value='`$prop.dci.network-id`' />\n<parameter name='configuration-type' value='overlay' />\n<parameter name='orchestration-status' value='Created' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.dci.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 794,
-    "y": 1031,
-    "z": "cf1e958c.7fbef8",
+    "x": 853.5,
+    "y": 1023,
+    "z": "e441b8db.02f6b8",
     "wires": [
       []
     ]
   },
   {
-    "id": "168e5d62.705303",
+    "id": "c1d82a9d.7debd",
     "type": "save",
     "name": "save service relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-id' >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"/network/configurations/configuration\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.dci.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"configuration.configuration-type\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"overlay\" />",
     "comments": "",
     "outputs": 1,
-    "x": 801,
-    "y": 1113,
-    "z": "cf1e958c.7fbef8",
+    "x": 811.5000305175781,
+    "y": 1102,
+    "z": "e441b8db.02f6b8",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "6eecda19.439af4",
+    "type": "block",
+    "name": "block setLocalNetworks",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2602,
+    "y": 356,
+    "z": "e441b8db.02f6b8",
+    "wires": [
+      [
+        "bdc08c35.1283",
+        "394dfa49.7d183e"
+      ]
+    ]
+  },
+  {
+    "id": "bdc08c35.1283",
+    "type": "set",
+    "name": "set local_networks",
+    "xml": "<set>\n<parameter name='tmp.dci-connects.local_networks.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 2805,
+    "y": 291,
+    "z": "e441b8db.02f6b8",
+    "wires": []
+  },
+  {
+    "id": "394dfa49.7d183e",
+    "type": "execute",
+    "name": "split local_networks",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.local_networks.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.local_networks\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2834,
+    "y": 343,
+    "z": "e441b8db.02f6b8",
+    "wires": [
+      [
+        "60eb5396.78be9c",
+        "4332c294.3fe73c"
+      ]
+    ]
+  },
+  {
+    "id": "60eb5396.78be9c",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3031,
+    "y": 278,
+    "z": "e441b8db.02f6b8",
+    "wires": [
+      [
+        "1db92507.15d47b"
+      ]
+    ]
+  },
+  {
+    "id": "4332c294.3fe73c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3032,
+    "y": 344,
+    "z": "e441b8db.02f6b8",
+    "wires": [
+      [
+        "8c77dee5.f45208"
+      ]
+    ]
+  },
+  {
+    "id": "8c77dee5.f45208",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
+    "comments": "",
+    "x": 3213,
+    "y": 342,
+    "z": "e441b8db.02f6b8",
+    "wires": []
+  },
+  {
+    "id": "1db92507.15d47b",
+    "type": "for",
+    "name": "for each local_networks",
+    "xml": "<for index='idx' start='0' end='`$tmp.dci-connects.local_networks_length`' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3233.5001640319824,
+    "y": 277.5000400543213,
+    "z": "e441b8db.02f6b8",
+    "wires": [
+      [
+        "5d5e8ee8.e594e8"
+      ]
+    ]
+  },
+  {
+    "id": "5d5e8ee8.e594e8",
+    "type": "get-resource",
+    "name": "get-resource l3-network",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-network\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.dci-connects.local_networks[$idx] AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.l3-network' local-only='false' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3506,
+    "y": 276,
+    "z": "e441b8db.02f6b8",
+    "wires": [
+      [
+        "9eecd85b.9e0378",
+        "f0b90daa.70ba48",
+        "c26d74dd.826c88"
+      ]
+    ]
+  },
+  {
+    "id": "c26d74dd.826c88",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3723.7691192626953,
+    "y": 316.6922347545624,
+    "z": "e441b8db.02f6b8",
+    "wires": [
+      [
+        "19ff7603.327b32"
+      ]
+    ]
+  },
+  {
+    "id": "f0b90daa.70ba48",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3731.7691192626953,
+    "y": 274.6922347545624,
+    "z": "e441b8db.02f6b8",
+    "wires": [
+      [
+        "283dc5a8.944bea"
+      ]
+    ]
+  },
+  {
+    "id": "9eecd85b.9e0378",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3724.7691192626953,
+    "y": 236.69223475456238,
+    "z": "e441b8db.02f6b8",
+    "wires": [
+      [
+        "974d7763.cd52a8"
+      ]
+    ]
+  },
+  {
+    "id": "974d7763.cd52a8",
+    "type": "set",
+    "name": "set network-id",
+    "xml": "<set>\n<parameter name='prop.dci-connects.local_networks[$idx]' value=\"`$tmp.aai.l3-network.network-id`\" />\n",
+    "comments": "",
+    "x": 3899.2690505981445,
+    "y": 233.1922149658203,
+    "z": "e441b8db.02f6b8",
+    "wires": []
+  },
+  {
+    "id": "283dc5a8.944bea",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3888.7691192626953,
+    "y": 278.6922347545624,
+    "z": "e441b8db.02f6b8",
+    "wires": []
+  },
+  {
+    "id": "19ff7603.327b32",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3881.7691192626953,
+    "y": 325.6922347545624,
+    "z": "e441b8db.02f6b8",
+    "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.json
index a4469c98..18620a0e 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.json
@@ -1,1166 +1,1125 @@
 [
   {
-    "id":"ba95087e.92b9a8",
-    "type":"for",
-    "name":"for each network-input-parameters",
-    "xml":"<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":727.3197174072266,
-    "y":129.1666979789734,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "9f219372.913768",
+    "type": "for",
+    "name": "for each network-input-parameters",
+    "xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 668.4999923706055,
+    "y": 168.1666979789734,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "ae14dcf0.2fa2"
+        "c6e32fd5.f0b0e8"
       ]
     ]
   },
   {
-    "id":"28487c0a.d2f1d4",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":950.3197402954102,
-    "y":259.16665744781494,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "9a6aa573.d146f8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 891.5000152587891,
+    "y": 298.16665744781494,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "ad2f29e4.7e0148",
-        "3e9c0ee8.789922",
-        "c68a818d.6aada",
-        "d2dc6063.75e3d",
-        "5b5e1852.3a7938",
-        "ebff3dbb.cb64",
-        "b517b557.2b1c88",
-        "4b1e3c3c.1ae2b4",
-        "293c94ec.7eed0c",
-        "d912bc7a.af608",
-        "6132d023.70902",
-        "137f7cf2.c3ab93",
-        "1d0ed859.af0d08",
-        "5509cc69.b39b94"
+        "3a308602.317a3a",
+        "7cd5cf0f.95b3f",
+        "45a9c65b.98f57",
+        "4bd8b08b.c1b738",
+        "9a98ee2f.fae35",
+        "dcb54754.c1fae",
+        "5c71ff90.d2893",
+        "8d7e8ee4.f68c68",
+        "6c08b0b1.cee048",
+        "e9f73529.8b85b",
+        "c3f8c7a7.7f35b",
+        "d4c4bfc9.13974",
+        "91da961a.6a0548",
+        "a53aefb0.e64608"
       ]
     ]
   },
   {
-    "id":"657025f9.1e55dc",
-    "type":"execute",
-    "name":"checkRequiredL2Parameters",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"`$validate.dci-connects.name`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site1_id`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site2_id`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site1_networkName`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site2_networkName`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site1_importRT1`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site2_importRT1`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site1_exportRT1`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site2_exportRT1`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site1_vni`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site2_vni`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.tunnelType`\" value=\"\"/>\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":763.9864959716797,
-    "y":396.6666667461395,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-      [
-
-      ]
+    "id": "b85e62e3.2a64b",
+    "type": "execute",
+    "name": "checkRequiredL2Parameters",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"`$validate.dci-connects.name`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site1_id`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site2_id`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site1_networkName`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site2_networkName`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site1_importRT1`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site2_importRT1`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site1_exportRT1`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site2_exportRT1`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site1_vni`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.site2_vni`\" value=\"\"/>\n<parameter name=\"`$validate.dci-connects.tunnelType`\" value=\"\"/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 705.1667709350586,
+    "y": 435.6666667461395,
+    "z": "351ad0a0.4f274",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"bea84f00.558f5",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":122.3197250366211,
-    "y":55.99998092651367,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "df5ee9c0.82be5",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 97.5,
+    "y": 80.99998474121094,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "10709a4.e272a66"
+        "75544d6c.5343cc"
       ]
     ]
   },
   {
-    "id":"10709a4.e272a66",
-    "type":"service-logic",
-    "name":"GENERIC-RESOURCE-API ${project.version}",
-    "module":"GENERIC-RESOURCE-API",
-    "version":"${project.version}",
-    "comments":"",
-    "xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-    "outputs":1,
-    "x":367.6054382324219,
-    "y":55.238059997558594,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "75544d6c.5343cc",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "outputs": 1,
+    "x": 403.78570556640625,
+    "y": 90.23806762695312,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "6b6d13a7.c62a8c"
+        "b5a29630.ea65"
       ]
     ]
   },
   {
-    "id":"6b6d13a7.c62a8c",
-    "type":"method",
-    "name":"method validate-network-input-parameters",
-    "xml":"<method rpc='validate-overlay-network-input-parameters' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":325.23641204833984,
-    "y":130.25299835205078,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "b5a29630.ea65",
+    "type": "method",
+    "name": "method validate-overlay-network-input-parameters",
+    "xml": "<method rpc='validate-overlay-network-input-parameters' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 266.41668701171875,
+    "y": 169.25299835205078,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "ba95087e.92b9a8"
+        "9f219372.913768"
       ]
     ]
   },
   {
-    "id":"62808866.b25cf8",
-    "type":"execute",
-    "name":"checkAdditionalL3Parameters",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"`$network-topology-operation-input.network-request-input.network-input-parameters.site1_routerId`\" value=\"\"/>\n<parameter name=\"`$network-topology-operation-input.network-request-input.network-input-parameters.site2_routerId`\" value=\"\"/>\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":904.3197479248047,
-    "y":491.9999694824219,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-      [
-
-      ]
+    "id": "f8089d03.596d98",
+    "type": "execute",
+    "name": "checkAdditionalL3Parameters",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"`$network-topology-operation-input.network-request-input.network-input-parameters.site1_routerId`\" value=\"\"/>\n<parameter name=\"`$network-topology-operation-input.network-request-input.network-input-parameters.site2_routerId`\" value=\"\"/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 845.5000228881836,
+    "y": 530.9999694824219,
+    "z": "351ad0a0.4f274",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"766e54f6.c89c1c",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.tunnelType`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":503.3197326660156,
-    "y":554.9999351501465,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "17ab0223.d06dfe",
+    "type": "switchNode",
+    "name": "switch value",
+    "xml": "<switch test=\"`$validate.dci-connects.tunnelType`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 444.50000762939453,
+    "y": 593.9999351501465,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "63292a9d.15ee34",
-        "319f787e.f84698",
-        "43d71a57.0cfe24"
+        "9fd00c16.5964d8",
+        "7a55ea17.14f894",
+        "cf1a5339.585298"
       ]
     ]
   },
   {
-    "id":"63292a9d.15ee34",
-    "type":"outcome",
-    "name":"L3-DCI",
-    "xml":"<outcome value='L3-DCI'>",
-    "comments":"",
-    "outputs":1,
-    "x":683.6530685424805,
-    "y":490.99977684020996,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "9fd00c16.5964d8",
+    "type": "outcome",
+    "name": "L3-DCI",
+    "xml": "<outcome value='L3-DCI'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 624.8333435058594,
+    "y": 529.99977684021,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "62808866.b25cf8"
+        "f8089d03.596d98"
       ]
     ]
   },
   {
-    "id":"319f787e.f84698",
-    "type":"outcome",
-    "name":"L2-DCI",
-    "xml":"<outcome value='L2-DCI'>",
-    "comments":"",
-    "outputs":1,
-    "x":681.6529541015625,
-    "y":563.9997224807739,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-      [
-
-      ]
+    "id": "7a55ea17.14f894",
+    "type": "outcome",
+    "name": "L2-DCI",
+    "xml": "<outcome value='L2-DCI'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 622.8332290649414,
+    "y": 602.9997224807739,
+    "z": "351ad0a0.4f274",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"43d71a57.0cfe24",
-    "type":"outcome",
-    "name":"other",
-    "xml":"<outcome value='other'>",
-    "comments":"",
-    "outputs":1,
-    "x":679.6530704498291,
-    "y":645.6664152145386,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "cf1a5339.585298",
+    "type": "outcome",
+    "name": "other",
+    "xml": "<outcome value='other'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 620.833345413208,
+    "y": 684.6664152145386,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "f6f6f732.6fe428"
+        "63752135.dc4c5"
       ]
     ]
   },
   {
-    "id":"f6f6f732.6fe428",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n",
-    "comments":"",
-    "x":893.0815925598145,
-    "y":645.6664419174194,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ad2f29e4.7e0148",
-    "type":"switchNode",
-    "name":"switch site1_id",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1237.3199844360352,
-    "y":145.16679191589355,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "63752135.dc4c5",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n",
+    "comments": "",
+    "x": 834.2618675231934,
+    "y": 684.6664419174194,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "3a308602.317a3a",
+    "type": "switchNode",
+    "name": "switch site1_id",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1178.500259399414,
+    "y": 184.16679191589355,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "f33cf253.17a49"
+        "31a93e6d.2e7752"
       ]
     ]
   },
   {
-    "id":"3e9c0ee8.789922",
-    "type":"switchNode",
-    "name":"switch site1_importRT1",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1238.9646034240723,
-    "y":553.2989673614502,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "7cd5cf0f.95b3f",
+    "type": "switchNode",
+    "name": "switch site1_importRT1",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1180.1448783874512,
+    "y": 592.2989673614502,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "5eac7584.6d267c"
+        "2cd0c93b.b6480e"
       ]
     ]
   },
   {
-    "id":"c68a818d.6aada",
-    "type":"switchNode",
-    "name":"switch site1_exportRT1",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1233.887710571289,
-    "y":689.9144258499146,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "45a9c65b.98f57",
+    "type": "switchNode",
+    "name": "switch site1_exportRT1",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1175.067985534668,
+    "y": 728.9144258499146,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "e98038fe.3bc7a8"
+        "8fb3fb93.820628"
       ]
     ]
   },
   {
-    "id":"d2dc6063.75e3d",
-    "type":"switchNode",
-    "name":"switch site1_vni",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1206.1955490112305,
-    "y":808.9145526885986,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "4bd8b08b.c1b738",
+    "type": "switchNode",
+    "name": "switch site1_vni",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1147.3758239746094,
+    "y": 847.9145526885986,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "7c71225a.f8d93c"
+        "df9c18d3.30517"
       ]
     ]
   },
   {
-    "id":"f33cf253.17a49",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1452.3199844360352,
-    "y":144.16679191589355,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "31a93e6d.2e7752",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1393.500259399414,
+    "y": 183.16679191589355,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "479be6ca.797c48"
+        "d34f2601.68068"
       ]
     ]
   },
   {
-    "id":"5eac7584.6d267c",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1440.9646034240723,
-    "y":552.2989673614502,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "2cd0c93b.b6480e",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1382.1448783874512,
+    "y": 591.2989673614502,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "8e2e8c1d.89a89"
+        "93ca887a.7521e"
       ]
     ]
   },
   {
-    "id":"e98038fe.3bc7a8",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1429.887710571289,
-    "y":686.9144258499146,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "8fb3fb93.820628",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1371.067985534668,
+    "y": 725.9144258499146,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "53264553.d1234c"
+        "3466521c.eba27e"
       ]
     ]
   },
   {
-    "id":"7c71225a.f8d93c",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1405.1955451965332,
-    "y":808.914571762085,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "df9c18d3.30517",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1346.375820159912,
+    "y": 847.914571762085,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "a5b17398.c8fe9"
+        "db8cdcad.df6ab"
       ]
     ]
   },
   {
-    "id":"5b5e1852.3a7938",
-    "type":"switchNode",
-    "name":"switch name",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1234.4865493774414,
-    "y":86.33342361450195,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "9a98ee2f.fae35",
+    "type": "switchNode",
+    "name": "switch name",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1175.6668243408203,
+    "y": 125.33342361450195,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "1557c16b.13de0f"
+        "256e4cfe.021fac"
       ]
     ]
   },
   {
-    "id":"1557c16b.13de0f",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1454.1791381835938,
-    "y":85.56419563293457,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "256e4cfe.021fac",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1395.3594131469727,
+    "y": 124.56419563293457,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "da60451d.6b55f8"
+        "7c5aad0d.29a82c"
       ]
     ]
   },
   {
-    "id":"1db7b8be.899e57",
-    "type":"set",
-    "name":"set name",
-    "xml":"<set>\n<parameter name='validate.dci-connects.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1842.4868621826172,
-    "y":86.41035079956055,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ebff3dbb.cb64",
-    "type":"switchNode",
-    "name":"switch site1_networkName",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1270.03755569458,
-    "y":274.3334674835205,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "83313a72.423f8",
+    "type": "set",
+    "name": "set name",
+    "xml": "<set>\n<parameter name='validate.dci-connects.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1783.667137145996,
+    "y": 125.41035079956055,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "dcb54754.c1fae",
+    "type": "switchNode",
+    "name": "switch site1_networkName",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1211.217830657959,
+    "y": 313.3334674835205,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "92423844.76f288"
+        "a3f3c6f5.a3b188"
       ]
     ]
   },
   {
-    "id":"92423844.76f288",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1468.03755569458,
-    "y":274.3334674835205,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "a3f3c6f5.a3b188",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1409.217830657959,
+    "y": 313.3334674835205,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "360a973d.9d1cc8"
+        "18eaf51a.eed2f3"
       ]
     ]
   },
   {
-    "id":"96044bd5.858c28",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2098.370994567871,
-    "y":518.3846913799644,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "5dc2f27e.565d54",
+    "type": "switchNode",
+    "name": "switch value",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2039.55126953125,
+    "y": 557.3846913799644,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "d3d16a56.8a9738"
+        "30db59f5.f579be"
       ]
     ]
   },
   {
-    "id":"d3d16a56.8a9738",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":2265.3712005615234,
-    "y":518.0110122188926,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "30db59f5.f579be",
+    "type": "outcome",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
+    "comments": "",
+    "outputs": 1,
+    "x": 2206.5514755249023,
+    "y": 557.0110122188926,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "ee6eab17.fc7618"
+        "1746319b.debb2e"
       ]
     ]
   },
   {
-    "id":"ee6eab17.fc7618",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n",
-    "comments":"",
-    "x":2433.1845703125,
-    "y":518.0109936222434,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"f8ed6bb4.b05df8",
-    "type":"set",
-    "name":"set site1_id",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site1_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1851.243019104004,
-    "y":143.6922788619995,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"b517b557.2b1c88",
-    "type":"switchNode",
-    "name":"switch site2_id",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1235.935214996338,
-    "y":207.692289352417,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "1746319b.debb2e",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n",
+    "comments": "",
+    "x": 2374.364845275879,
+    "y": 557.0109936222434,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "bf0183c0.c3f948",
+    "type": "set",
+    "name": "set site1_id",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site1_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1792.4232940673828,
+    "y": 182.6922788619995,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "5c71ff90.d2893",
+    "type": "switchNode",
+    "name": "switch site2_id",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1177.1154899597168,
+    "y": 246.692289352417,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "417631c9.904ff"
+        "7d482c7a.518ac4"
       ]
     ]
   },
   {
-    "id":"417631c9.904ff",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1450.935214996338,
-    "y":206.692289352417,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "7d482c7a.518ac4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1392.1154899597168,
+    "y": 245.692289352417,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "d9eecf1d.5da05"
+        "ebf7b268.e89158"
       ]
     ]
   },
   {
-    "id":"54871b70.cd0a24",
-    "type":"set",
-    "name":"set site2_id",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site2_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1842.9352684020996,
-    "y":205.14089107513428,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"4ef856dd.ae2728",
-    "type":"set",
-    "name":"set site1_networkName",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site1_networkName' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1874.1148681640625,
-    "y":278.0769100189209,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"4b1e3c3c.1ae2b4",
-    "type":"switchNode",
-    "name":"switch site2_networkName",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1261.5761260986328,
-    "y":339.153790473938,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "57f3029c.b145e4",
+    "type": "set",
+    "name": "set site2_id",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site2_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1784.1155433654785,
+    "y": 244.14089107513428,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "8f2baefa.0b0398",
+    "type": "set",
+    "name": "set site1_networkName",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site1_networkName' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1815.2951431274414,
+    "y": 317.0769100189209,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "8d7e8ee4.f68c68",
+    "type": "switchNode",
+    "name": "switch site2_networkName",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1202.7564010620117,
+    "y": 378.153790473938,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "9f5a1ec2.9dcc9"
+        "8aa85325.daef28"
       ]
     ]
   },
   {
-    "id":"9f5a1ec2.9dcc9",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1459.5761260986328,
-    "y":339.153790473938,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "8aa85325.daef28",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1400.7564010620117,
+    "y": 378.153790473938,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "822ee2d3.48c3c"
+        "e0ee66d1.d362e8"
       ]
     ]
   },
   {
-    "id":"ad54b8c9.7da448",
-    "type":"set",
-    "name":"set site1_networkName",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site2_networkName' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1867.9607391357422,
-    "y":339.8202781677246,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"293c94ec.7eed0c",
-    "type":"switchNode",
-    "name":"switch site1_routerId",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1238.44775390625,
-    "y":404.3978147506714,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "8af7e0d6.1420c8",
+    "type": "set",
+    "name": "set site1_networkName",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site2_networkName' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1809.141014099121,
+    "y": 378.8202781677246,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "6c08b0b1.cee048",
+    "type": "switchNode",
+    "name": "switch site1_routerId",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1179.628028869629,
+    "y": 443.3978147506714,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "bd102392.9272f"
+        "9ed44258.9c6b6"
       ]
     ]
   },
   {
-    "id":"bd102392.9272f",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1443.44775390625,
-    "y":403.3978147506714,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "9ed44258.9c6b6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1384.628028869629,
+    "y": 442.3978147506714,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "e3a432d7.d3122"
+        "80d0f7bd.e811b8"
       ]
     ]
   },
   {
-    "id":"aa160e34.e4b32",
-    "type":"set",
-    "name":"set site1_routerId",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site1_routerId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1847.601577758789,
-    "y":402.2564105987549,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"5509cc69.b39b94",
-    "type":"switchNode",
-    "name":"switch site2_routerId",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1235.986557006836,
-    "y":475.79493522644043,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "99f4b465.d49818",
+    "type": "set",
+    "name": "set site1_routerId",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site1_routerId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1788.781852722168,
+    "y": 441.2564105987549,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "a53aefb0.e64608",
+    "type": "switchNode",
+    "name": "switch site2_routerId",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1177.1668319702148,
+    "y": 514.7949352264404,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "6e0eb7d7.46a9d8"
+        "66d18baa.c968bc"
       ]
     ]
   },
   {
-    "id":"6e0eb7d7.46a9d8",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1440.986557006836,
-    "y":474.79493522644043,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "66d18baa.c968bc",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1382.1668319702148,
+    "y": 513.7949352264404,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "82d1be44.e3709"
+        "380642df.690c06"
       ]
     ]
   },
   {
-    "id":"6301c339.b9a5ac",
-    "type":"set",
-    "name":"set site2_routerId",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site2_routerId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1868.9871444702148,
-    "y":475.19210052490234,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"56ed96a3.41ee28",
-    "type":"set",
-    "name":"set site2_routerId",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site1_importRT1' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1860.8328247070312,
-    "y":552.410285949707,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d912bc7a.af608",
-    "type":"switchNode",
-    "name":"switch site2_importRT1",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1238.653060913086,
-    "y":621.5128269195557,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "b7d41b0c.08bfa8",
+    "type": "set",
+    "name": "set site2_routerId",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site2_routerId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1810.1674194335938,
+    "y": 514.1921005249023,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "1ca7dab1.a54e05",
+    "type": "set",
+    "name": "set site2_routerId",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site1_importRT1' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1802.0130996704102,
+    "y": 591.410285949707,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "e9f73529.8b85b",
+    "type": "switchNode",
+    "name": "switch site2_importRT1",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1179.8333358764648,
+    "y": 660.5128269195557,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "767cef4c.87c12"
+        "a58493be.2ce148"
       ]
     ]
   },
   {
-    "id":"767cef4c.87c12",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1440.653060913086,
-    "y":620.5128269195557,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "a58493be.2ce148",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1381.8333358764648,
+    "y": 659.5128269195557,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "774128e9.097e98"
+        "a43a1ae.20bc9e8"
       ]
     ]
   },
   {
-    "id":"1fe27c7.2dcc584",
-    "type":"set",
-    "name":"set site2_importRT1",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site2_importRT1' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1862.8285751342773,
-    "y":620.6240797042847,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"addc94d5.935028",
-    "type":"set",
-    "name":"set site1_exportRT1",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site1_exportRT1' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1844.9608268737793,
-    "y":682.8463268280029,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"6132d023.70902",
-    "type":"switchNode",
-    "name":"switch site1_exportRT2",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT2'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1230.9609603881836,
-    "y":747.7693099975586,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "1e7c8c00.4966a4",
+    "type": "set",
+    "name": "set site2_importRT1",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site2_importRT1' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1804.0088500976562,
+    "y": 659.6240797042847,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "de34e1a6.830c3",
+    "type": "set",
+    "name": "set site1_exportRT1",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site1_exportRT1' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1786.1411018371582,
+    "y": 721.8463268280029,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "c3f8c7a7.7f35b",
+    "type": "switchNode",
+    "name": "switch site1_exportRT2",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT2'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1172.1412353515625,
+    "y": 786.7693099975586,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "feb35a24.cd3648"
+        "92633b48.8edfc8"
       ]
     ]
   },
   {
-    "id":"feb35a24.cd3648",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1426.9609603881836,
-    "y":744.7693099975586,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "92633b48.8edfc8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1368.1412353515625,
+    "y": 783.7693099975586,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "4b3b20e7.2b2fe"
+        "e12fce67.94699"
       ]
     ]
   },
   {
-    "id":"c9f8c3ab.70b24",
-    "type":"set",
-    "name":"set site1_exportRT2",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site1_exportRT2' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1840.4958572387695,
-    "y":740.7011775970459,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"a5dc4d63.d58b1",
-    "type":"set",
-    "name":"set site1_vni",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site1_vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1812.9096298217773,
-    "y":807.6412315368652,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"137f7cf2.c3ab93",
-    "type":"switchNode",
-    "name":"switch site2_vni",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1203.6532287597656,
-    "y":873.3337364196777,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "a36a5b8d.4b041",
+    "type": "set",
+    "name": "set site1_exportRT2",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site1_exportRT2' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1781.6761322021484,
+    "y": 779.7011775970459,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "b733fef3.0537f8",
+    "type": "set",
+    "name": "set site1_vni",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site1_vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1754.0899047851562,
+    "y": 846.6412315368652,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "d4c4bfc9.13974",
+    "type": "switchNode",
+    "name": "switch site2_vni",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1144.8335037231445,
+    "y": 912.3337364196777,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "79ded29d.4ddd9c"
+        "47be4985.18f7a"
       ]
     ]
   },
   {
-    "id":"79ded29d.4ddd9c",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1402.6532249450684,
-    "y":873.3337554931641,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "47be4985.18f7a",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1343.8334999084473,
+    "y": 912.3337554931641,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "d0c7e690.e8d078"
+        "2db61809.1d037"
       ]
     ]
   },
   {
-    "id":"8a4479c0.ee42f8",
-    "type":"set",
-    "name":"set site2_vni",
-    "xml":"<set>\n<parameter name='validate.dci-connects.site2_vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1807.2905578613281,
-    "y":871.2911982536316,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"1d0ed859.af0d08",
-    "type":"switchNode",
-    "name":"switch tunnelType",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1207.5376205444336,
-    "y":940.372227191925,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "1f72f8d2.8122a7",
+    "type": "set",
+    "name": "set site2_vni",
+    "xml": "<set>\n<parameter name='validate.dci-connects.site2_vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1748.470832824707,
+    "y": 910.2911982536316,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "91da961a.6a0548",
+    "type": "switchNode",
+    "name": "switch tunnelType",
+    "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1148.7178955078125,
+    "y": 979.372227191925,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "5540f5e2.10ecbc"
+        "def5c126.9ef6f8"
       ]
     ]
   },
   {
-    "id":"5540f5e2.10ecbc",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1413.5376205444336,
-    "y":940.372227191925,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "def5c126.9ef6f8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1354.7178955078125,
+    "y": 979.372227191925,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "f2527f65.6836f"
+        "ba2db426.9389f"
       ]
     ]
   },
   {
-    "id":"99b782e.ba8658",
-    "type":"set",
-    "name":"set tunnelType",
-    "xml":"<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1812.8451919555664,
-    "y":935.9876976013184,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"a101c9de.bfa5c8",
-    "type":"comment",
-    "name":"TODO: optimize the activate by using parameter assignment here",
-    "info":"",
-    "comments":"",
-    "x":1100.3197479248047,
-    "y":20,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ae14dcf0.2fa2",
-    "type":"block",
-    "name":"block validate",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":575.3197402954102,
-    "y":261.9999895095825,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "3ad5245d.41b07c",
+    "type": "set",
+    "name": "set tunnelType",
+    "xml": "<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1754.0254669189453,
+    "y": 974.9876976013184,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "cf5014dc.f97bc8",
+    "type": "comment",
+    "name": "TODO: optimize the activate by using parameter assignment here",
+    "info": "",
+    "comments": "",
+    "x": 1041.5000228881836,
+    "y": 59,
+    "z": "351ad0a0.4f274",
+    "wires": []
+  },
+  {
+    "id": "c6e32fd5.f0b0e8",
+    "type": "block",
+    "name": "block validate",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 516.5000152587891,
+    "y": 300.9999895095825,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "28487c0a.d2f1d4",
-        "657025f9.1e55dc",
-        "766e54f6.c89c1c"
+        "9a6aa573.d146f8",
+        "17ab0223.d06dfe"
       ]
     ]
   },
   {
-    "id":"da60451d.6b55f8",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1625.0120544433594,
-    "y":86.55049514770508,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "7c5aad0d.29a82c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1566.1923294067383,
+    "y": 125.55049514770508,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "1db7b8be.899e57",
-        "96044bd5.858c28"
+        "83313a72.423f8",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"479be6ca.797c48",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1624.242691040039,
-    "y":144.2427978515625,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "d34f2601.68068",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1565.422966003418,
+    "y": 183.2427978515625,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "f8ed6bb4.b05df8",
-        "96044bd5.858c28"
+        "bf0183c0.c3f948",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"d9eecf1d.5da05",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1616.5506019592285,
-    "y":205.78127479553223,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "ebf7b268.e89158",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1557.7308769226074,
+    "y": 244.78127479553223,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "54871b70.cd0a24",
-        "96044bd5.858c28"
+        "57f3029c.b145e4",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"360a973d.9d1cc8",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1615.0120849609375,
-    "y":275.78126430511475,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "18eaf51a.eed2f3",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1556.1923599243164,
+    "y": 314.78126430511475,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "4ef856dd.ae2728",
-        "96044bd5.858c28"
+        "8f2baefa.0b0398",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"822ee2d3.48c3c",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1606.550521850586,
-    "y":338.858193397522,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "e0ee66d1.d362e8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1547.7307968139648,
+    "y": 377.858193397522,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "ad54b8c9.7da448",
-        "96044bd5.858c28"
+        "8af7e0d6.1420c8",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"e3a432d7.d3122",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1596.5502471923828,
-    "y":403.1658983230591,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "80d0f7bd.e811b8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1537.7305221557617,
+    "y": 442.1658983230591,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "aa160e34.e4b32",
-        "96044bd5.858c28"
+        "99f4b465.d49818",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"82d1be44.e3709",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1587.319839477539,
-    "y":477.3197727203369,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "380642df.690c06",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1528.500114440918,
+    "y": 516.3197727203369,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "6301c339.b9a5ac",
-        "96044bd5.858c28"
+        "b7d41b0c.08bfa8",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"8e2e8c1d.89a89",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1588.08890914917,
-    "y":553.8582248687744,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "93ca887a.7521e",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1529.2691841125488,
+    "y": 592.8582248687744,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "56ed96a3.41ee28",
-        "96044bd5.858c28"
+        "1ca7dab1.a54e05",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"774128e9.097e98",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1592.704360961914,
-    "y":621.5506038665771,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "a43a1ae.20bc9e8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1533.884635925293,
+    "y": 660.5506038665771,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "1fe27c7.2dcc584",
-        "96044bd5.858c28"
+        "1e7c8c00.4966a4",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"53264553.d1234c",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1582.7043190002441,
-    "y":686.166033744812,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "3466521c.eba27e",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1523.884593963623,
+    "y": 725.166033744812,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "addc94d5.935028",
-        "96044bd5.858c28"
+        "de34e1a6.830c3",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"4b3b20e7.2b2fe",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1584.2429733276367,
-    "y":744.6275215148926,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "e12fce67.94699",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1525.4232482910156,
+    "y": 783.6275215148926,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "c9f8c3ab.70b24",
-        "96044bd5.858c28"
+        "a36a5b8d.4b041",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"a5b17398.c8fe9",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1574.242935180664,
-    "y":813.8583087921143,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "db8cdcad.df6ab",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1515.423210144043,
+    "y": 852.8583087921143,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "a5dc4d63.d58b1",
-        "96044bd5.858c28"
+        "b733fef3.0537f8",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"d0c7e690.e8d078",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1567.319580078125,
-    "y":879.243043422699,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "2db61809.1d037",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1508.499855041504,
+    "y": 918.243043422699,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "8a4479c0.ee42f8",
-        "96044bd5.858c28"
+        "1f72f8d2.8122a7",
+        "5dc2f27e.565d54"
       ]
     ]
   },
   {
-    "id":"f2527f65.6836f",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1574.2429809570312,
-    "y":939.2429823875427,
-    "z":"b32ccb5b.ff5d48",
-    "wires":[
+    "id": "ba2db426.9389f",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1515.4232559204102,
+    "y": 978.2429823875427,
+    "z": "351ad0a0.4f274",
+    "wires": [
       [
-        "99b782e.ba8658",
-        "96044bd5.858c28"
+        "3ad5245d.41b07c",
+        "5dc2f27e.565d54"
       ]
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index 55ff8644..4dba808f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -29,7 +29,47 @@
                                 </outcome>
                             </switch>
                             <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`">
-                                <outcome value="true" />
+                                <outcome value="true">
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name="tmp.dci-connects.local_networks.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                        </set>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
+                                            <parameter name="original_string" value="`$tmp.dci-connects.local_networks.original`" />
+                                            <parameter name="regex" value="," />
+                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.local_networks" />
+                                            <outcome value="success">
+                                                <for index="idx" start="0" end="`$tmp.dci-connects.local_networks_length`">
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="l3-network" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.dci-connects.local_networks[$idx] AND         depth = '0'" pfx="tmp.aai.l3-network" local-only="false">
+                                                        <outcome value="success">
+                                                            <set>
+                                                                <parameter name="prop.dci-connects.local_networks[$idx]" value="`$tmp.aai.l3-network.network-id`" />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value="not-found">
+                                                            <return status="failure">
+                                                                <parameter name="error-code" value="" />
+                                                                <parameter name="error-message" value="" />
+                                                            </return>
+                                                        </outcome>
+                                                        <outcome value="Other">
+                                                            <return status="failure">
+                                                                <parameter name="error-code" value="" />
+                                                                <parameter name="error-message" value="" />
+                                                            </return>
+                                                        </outcome>
+                                                    </get-resource>
+                                                </for>
+                                            </outcome>
+                                            <outcome value="failure">
+                                                <return status="failure">
+                                                    <parameter name="error-code" value="" />
+                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />
+                                                </return>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </outcome>
                             </switch>
                             <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`">
                                 <outcome value="true">
@@ -147,7 +187,7 @@
                         <switch test="`$prop.dci-connects.tunnelType`">
                             <outcome value="L3-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3-dci-connects-template.json'`" />
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
@@ -158,7 +198,7 @@
                             </outcome>
                             <outcome value="L2-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l2-dci-connects-template.json'`" />
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
@@ -344,7 +384,7 @@
                         <switch test="`$prop.dci-connects.tunnelType`">
                             <outcome value="L3-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3-dci-connects-template.json'`" />
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
@@ -355,7 +395,7 @@
                             </outcome>
                             <outcome value="L2-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l2-dci-connects-template.json'`" />
                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
index 4a22bd06..2e16622a 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
@@ -257,20 +257,6 @@
                         </outcome>
                     </switch>
                 </block>
-                <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">
-                    <parameter name="`$validate.dci-connects.name`" value="" />
-                    <parameter name="`$validate.dci-connects.site1_id`" value="" />
-                    <parameter name="`$validate.dci-connects.site2_id`" value="" />
-                    <parameter name="`$validate.dci-connects.site1_networkName`" value="" />
-                    <parameter name="`$validate.dci-connects.site2_networkName`" value="" />
-                    <parameter name="`$validate.dci-connects.site1_importRT1`" value="" />
-                    <parameter name="`$validate.dci-connects.site2_importRT1`" value="" />
-                    <parameter name="`$validate.dci-connects.site1_exportRT1`" value="" />
-                    <parameter name="`$validate.dci-connects.site2_exportRT1`" value="" />
-                    <parameter name="`$validate.dci-connects.site1_vni`" value="" />
-                    <parameter name="`$validate.dci-connects.site2_vni`" value="" />
-                    <parameter name="`$validate.dci-connects.tunnelType`" value="" />
-                </execute>
                 <switch test="`$validate.dci-connects.tunnelType`">
                     <outcome value="L3-DCI">
                         <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">
@@ -290,4 +276,4 @@
             </block>
         </for>
     </method>
-</service-logic>
\ No newline at end of file
+</service-logic>
-- 
2.16.6