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

1 files changed, 850 insertions, 891 deletions

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
+]