Fix for overlay DGs.

Changes includes:
1) use `` for expressions.
2) fix loading issue.

Change-Id: Iff71b5be7e606b3bc343cf9d5f9e81eba0e51e06
Issue-Id: SDNC-113
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: 0f1278b2a69a5c0ab0acd2693111d56577ed0d90

1 files changed, 481 insertions, 827 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 02bab6d6..a4469c98 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,59 +1,60 @@
 [
   {
-    "id":"9fbc00bc.c5915",
+    "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":692.6666564941406,
-    "y":154.83338117599487,
-    "z":"47ab735d.a7360c",
+    "x":727.3197174072266,
+    "y":129.1666979789734,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "a976418d.bf0e8"
+        "ae14dcf0.2fa2"
       ]
     ]
   },
   {
-    "id":"bd4a5cad.24385",
+    "id":"28487c0a.d2f1d4",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":915.6666793823242,
-    "y":284.8333406448364,
-    "z":"47ab735d.a7360c",
+    "x":950.3197402954102,
+    "y":259.16665744781494,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "baeb18be.64e288",
-        "ebc31264.45c9c",
-        "6dd687c5.d25178",
-        "4aa7ce12.c2c5c",
-        "8d91f51f.010838",
-        "a564bd41.e58b8",
-        "dfd01ad4.2d6c58",
-        "9f877a62.41f918",
-        "a1c6afab.017d9",
-        "18c864fe.2d77ab",
-        "f8675cad.a9a8b",
-        "c93315a.3d905e8",
-        "5e4cd98f.ace3e8"
+        "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"
       ]
     ]
   },
   {
-    "id":"1f0e911e.e29fcf",
+    "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",
+    "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":729.3334350585938,
-    "y":422.333349943161,
-    "z":"47ab735d.a7360c",
+    "x":763.9864959716797,
+    "y":396.6666667461395,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
 
@@ -61,21 +62,21 @@
     ]
   },
   {
-    "id":"e94160.d414eea",
+    "id":"bea84f00.558f5",
     "type":"dgstart",
     "name":"DGSTART",
     "outputs":1,
-    "x":87.66666412353516,
-    "y":81.66666412353516,
-    "z":"47ab735d.a7360c",
+    "x":122.3197250366211,
+    "y":55.99998092651367,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "e29a088c.48c7f8"
+        "10709a4.e272a66"
       ]
     ]
   },
   {
-    "id":"e29a088c.48c7f8",
+    "id":"10709a4.e272a66",
     "type":"service-logic",
     "name":"GENERIC-RESOURCE-API ${project.version}",
     "module":"GENERIC-RESOURCE-API",
@@ -83,41 +84,41 @@
     "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":332.95237731933594,
-    "y":80.90474319458008,
-    "z":"47ab735d.a7360c",
+    "x":367.6054382324219,
+    "y":55.238059997558594,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "5a029ef9.54fab"
+        "6b6d13a7.c62a8c"
       ]
     ]
   },
   {
-    "id":"5a029ef9.54fab",
+    "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":290.5833511352539,
-    "y":155.91968154907227,
-    "z":"47ab735d.a7360c",
+    "x":325.23641204833984,
+    "y":130.25299835205078,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "9fbc00bc.c5915"
+        "ba95087e.92b9a8"
       ]
     ]
   },
   {
-    "id":"f2681b3f.65fb58",
+    "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",
+    "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":869.6666870117188,
-    "y":517.6666526794434,
-    "z":"47ab735d.a7360c",
+    "x":904.3197479248047,
+    "y":491.9999694824219,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
 
@@ -125,49 +126,49 @@
     ]
   },
   {
-    "id":"23001689.a4dc8a",
+    "id":"766e54f6.c89c1c",
     "type":"switchNode",
     "name":"switch value",
     "xml":"<switch test=\"`$validate.dci-connects.tunnelType`\">\n",
     "comments":"",
     "outputs":1,
-    "x":468.6666717529297,
-    "y":580.666618347168,
-    "z":"47ab735d.a7360c",
+    "x":503.3197326660156,
+    "y":554.9999351501465,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "a5c0553.c8c39a8",
-        "a1b97140.efa03",
-        "49ee51a5.f039a"
+        "63292a9d.15ee34",
+        "319f787e.f84698",
+        "43d71a57.0cfe24"
       ]
     ]
   },
   {
-    "id":"a5c0553.c8c39a8",
+    "id":"63292a9d.15ee34",
     "type":"outcome",
     "name":"L3-DCI",
     "xml":"<outcome value='L3-DCI'>",
     "comments":"",
     "outputs":1,
-    "x":649.0000076293945,
-    "y":516.6664600372314,
-    "z":"47ab735d.a7360c",
+    "x":683.6530685424805,
+    "y":490.99977684020996,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "f2681b3f.65fb58"
+        "62808866.b25cf8"
       ]
     ]
   },
   {
-    "id":"a1b97140.efa03",
+    "id":"319f787e.f84698",
     "type":"outcome",
     "name":"L2-DCI",
     "xml":"<outcome value='L2-DCI'>",
     "comments":"",
     "outputs":1,
-    "x":646.9998931884766,
-    "y":589.6664056777954,
-    "z":"47ab735d.a7360c",
+    "x":681.6529541015625,
+    "y":563.9997224807739,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
 
@@ -175,1337 +176,990 @@
     ]
   },
   {
-    "id":"49ee51a5.f039a",
+    "id":"43d71a57.0cfe24",
     "type":"outcome",
     "name":"other",
     "xml":"<outcome value='other'>",
     "comments":"",
     "outputs":1,
-    "x":645.0000095367432,
-    "y":671.3330984115601,
-    "z":"47ab735d.a7360c",
+    "x":679.6530704498291,
+    "y":645.6664152145386,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "fba967af.e87968"
+        "f6f6f732.6fe428"
       ]
     ]
   },
   {
-    "id":"fba967af.e87968",
+    "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":858.4285316467285,
-    "y":671.3331251144409,
-    "z":"47ab735d.a7360c",
+    "x":893.0815925598145,
+    "y":645.6664419174194,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"baeb18be.64e288",
+    "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":1202.6669235229492,
-    "y":170.83347511291504,
-    "z":"47ab735d.a7360c",
+    "x":1237.3199844360352,
+    "y":145.16679191589355,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "2ad98395.e759ac"
+        "f33cf253.17a49"
       ]
     ]
   },
   {
-    "id":"ebc31264.45c9c",
+    "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":1236.6191329956055,
-    "y":955.1194496154785,
-    "z":"47ab735d.a7360c",
+    "x":1238.9646034240723,
+    "y":553.2989673614502,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "f0e05479.676558"
+        "5eac7584.6d267c"
       ]
     ]
   },
   {
-    "id":"6dd687c5.d25178",
+    "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":1234.619213104248,
-    "y":1197.119421005249,
-    "z":"47ab735d.a7360c",
+    "x":1233.887710571289,
+    "y":689.9144258499146,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "261269c8.cc3de6"
+        "e98038fe.3bc7a8"
       ]
     ]
   },
   {
-    "id":"4aa7ce12.c2c5c",
+    "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":1214.6191482543945,
-    "y":1446.1195335388184,
-    "z":"47ab735d.a7360c",
+    "x":1206.1955490112305,
+    "y":808.9145526885986,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "8460bab.5cb4748"
+        "7c71225a.f8d93c"
       ]
     ]
   },
   {
-    "id":"2ad98395.e759ac",
+    "id":"f33cf253.17a49",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1417.6669235229492,
-    "y":169.83347511291504,
-    "z":"47ab735d.a7360c",
+    "x":1452.3199844360352,
+    "y":144.16679191589355,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "4e98bbb2.6da394",
-        "7d1e7107.e98d7"
+        "479be6ca.797c48"
       ]
     ]
   },
   {
-    "id":"f0e05479.676558",
+    "id":"5eac7584.6d267c",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1438.6191329956055,
-    "y":954.1194496154785,
-    "z":"47ab735d.a7360c",
+    "x":1440.9646034240723,
+    "y":552.2989673614502,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "979386d3.b24028",
-        "26bcb080.9de85"
+        "8e2e8c1d.89a89"
       ]
     ]
   },
   {
-    "id":"261269c8.cc3de6",
+    "id":"e98038fe.3bc7a8",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1430.619213104248,
-    "y":1194.119421005249,
-    "z":"47ab735d.a7360c",
+    "x":1429.887710571289,
+    "y":686.9144258499146,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "7a713e79.f07e5",
-        "cc5ed7e8.5ea2b8"
+        "53264553.d1234c"
       ]
     ]
   },
   {
-    "id":"8460bab.5cb4748",
+    "id":"7c71225a.f8d93c",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1413.6191444396973,
-    "y":1446.1195526123047,
-    "z":"47ab735d.a7360c",
+    "x":1405.1955451965332,
+    "y":808.914571762085,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "6a2f200.8e65de",
-        "4214073.a9e53f8"
+        "a5b17398.c8fe9"
       ]
     ]
   },
   {
-    "id":"8d91f51f.010838",
+    "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":1199.8334884643555,
-    "y":112.00010681152344,
-    "z":"47ab735d.a7360c",
+    "x":1234.4865493774414,
+    "y":86.33342361450195,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "c02bf1f3.bbbf4"
+        "1557c16b.13de0f"
       ]
     ]
   },
   {
-    "id":"c02bf1f3.bbbf4",
+    "id":"1557c16b.13de0f",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1411.8334579467773,
-    "y":112.00010681152344,
-    "z":"47ab735d.a7360c",
+    "x":1454.1791381835938,
+    "y":85.56419563293457,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "25b2958.f7a656a",
-        "9b6f27eb.9ced48"
+        "da60451d.6b55f8"
       ]
     ]
   },
   {
-    "id":"25b2958.f7a656a",
+    "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":1597.8335075378418,
-    "y":49.000104904174805,
-    "z":"47ab735d.a7360c",
+    "x":1842.4868621826172,
+    "y":86.41035079956055,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"a564bd41.e58b8",
+    "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":1239.9998664855957,
-    "y":450.00013637542725,
-    "z":"47ab735d.a7360c",
+    "x":1270.03755569458,
+    "y":274.3334674835205,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "fa867ada.bd0d38"
+        "92423844.76f288"
       ]
     ]
   },
   {
-    "id":"fa867ada.bd0d38",
+    "id":"92423844.76f288",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1437.9998664855957,
-    "y":450.00013637542725,
-    "z":"47ab735d.a7360c",
+    "x":1468.03755569458,
+    "y":274.3334674835205,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "431614dd.2bc43c",
-        "44ab7436.2e79fc"
+        "360a973d.9d1cc8"
       ]
     ]
   },
   {
-    "id":"9b6f27eb.9ced48",
+    "id":"96044bd5.858c28",
     "type":"switchNode",
     "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.name`\">\n",
+    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1608.3333549499512,
-    "y":108.66667079925537,
-    "z":"47ab735d.a7360c",
+    "x":2098.370994567871,
+    "y":518.3846913799644,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "a83b8d69.c7d06"
+        "d3d16a56.8a9738"
       ]
     ]
   },
   {
-    "id":"a83b8d69.c7d06",
+    "id":"d3d16a56.8a9738",
     "type":"outcome",
     "name":"NULL",
     "xml":"<outcome value=''>",
     "comments":"",
     "outputs":1,
-    "x":1775.3334617614746,
-    "y":107.52376461029053,
-    "z":"47ab735d.a7360c",
+    "x":2265.3712005615234,
+    "y":518.0110122188926,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "d8d1825d.06b8d"
+        "ee6eab17.fc7618"
       ]
     ]
   },
   {
-    "id":"d8d1825d.06b8d",
+    "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":1947.7621879577637,
-    "y":107.52376365661621,
-    "z":"47ab735d.a7360c",
+    "x":2433.1845703125,
+    "y":518.0109936222434,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"4e98bbb2.6da394",
+    "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":1599.6667251586914,
-    "y":173.66665601730347,
-    "z":"47ab735d.a7360c",
+    "x":1851.243019104004,
+    "y":143.6922788619995,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"7d1e7107.e98d7",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site1_id`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1604.6666259765625,
-    "y":239.66665649414062,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "fa0cb448.d0c078"
-      ]
-    ]
-  },
-  {
-    "id":"fa0cb448.d0c078",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1771.666732788086,
-    "y":238.52375030517578,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "41562682.d2bfb8"
-      ]
-    ]
-  },
-  {
-    "id":"41562682.d2bfb8",
-    "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":1944.095458984375,
-    "y":238.52374935150146,
-    "z":"47ab735d.a7360c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"dfd01ad4.2d6c58",
+    "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":1206.6666259765625,
-    "y":305.6666564941406,
-    "z":"47ab735d.a7360c",
+    "x":1235.935214996338,
+    "y":207.692289352417,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "fcbf7abe.141ca8"
+        "417631c9.904ff"
       ]
     ]
   },
   {
-    "id":"fcbf7abe.141ca8",
+    "id":"417631c9.904ff",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1421.6666259765625,
-    "y":304.6666564941406,
-    "z":"47ab735d.a7360c",
+    "x":1450.935214996338,
+    "y":206.692289352417,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "6b022b57.4ad064",
-        "8a3f337.89f0bd"
+        "d9eecf1d.5da05"
       ]
     ]
   },
   {
-    "id":"6b022b57.4ad064",
+    "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":1603.6664276123047,
-    "y":308.49983739852905,
-    "z":"47ab735d.a7360c",
+    "x":1842.9352684020996,
+    "y":205.14089107513428,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"8a3f337.89f0bd",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site2_id`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1608.6663284301758,
-    "y":374.4998378753662,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "b06be411.9d3b28"
-      ]
-    ]
-  },
-  {
-    "id":"b06be411.9d3b28",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1775.6664352416992,
-    "y":373.35693168640137,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "64843880.ff2538"
-      ]
-    ]
-  },
-  {
-    "id":"64843880.ff2538",
-    "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":1948.0951614379883,
-    "y":373.35693073272705,
-    "z":"47ab735d.a7360c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"431614dd.2bc43c",
+    "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":1641,
-    "y":450.6666564941406,
-    "z":"47ab735d.a7360c",
+    "x":1874.1148681640625,
+    "y":278.0769100189209,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"44ab7436.2e79fc",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site1_networkName`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1605.999900817871,
-    "y":516.6666569709778,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "d2b45562.0c7fc8"
-      ]
-    ]
-  },
-  {
-    "id":"d2b45562.0c7fc8",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1773.0000076293945,
-    "y":515.5237507820129,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "61b1e1a0.11314"
-      ]
-    ]
-  },
-  {
-    "id":"61b1e1a0.11314",
-    "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":1945.4287338256836,
-    "y":515.5237498283386,
-    "z":"47ab735d.a7360c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"9f877a62.41f918",
+    "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":1240,
-    "y":578.6666259765625,
-    "z":"47ab735d.a7360c",
+    "x":1261.5761260986328,
+    "y":339.153790473938,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "f79dec8d.61c58"
+        "9f5a1ec2.9dcc9"
       ]
     ]
   },
   {
-    "id":"f79dec8d.61c58",
+    "id":"9f5a1ec2.9dcc9",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1438,
-    "y":578.6666259765625,
-    "z":"47ab735d.a7360c",
+    "x":1459.5761260986328,
+    "y":339.153790473938,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "1658307e.f7c1e",
-        "d3a1f175.6b3b3"
+        "822ee2d3.48c3c"
       ]
     ]
   },
   {
-    "id":"1658307e.f7c1e",
+    "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":1641.0001335144043,
-    "y":579.3331460952759,
-    "z":"47ab735d.a7360c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d3a1f175.6b3b3",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site2_networkName`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1606.0000343322754,
-    "y":645.333146572113,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "c14e96c.8f5af68"
-      ]
-    ]
-  },
-  {
-    "id":"c14e96c.8f5af68",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1773.0001411437988,
-    "y":644.1902403831482,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "d3b1b6c2.9459b8"
-      ]
-    ]
-  },
-  {
-    "id":"d3b1b6c2.9459b8",
-    "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":1945.428867340088,
-    "y":644.1902394294739,
-    "z":"47ab735d.a7360c",
+    "x":1867.9607391357422,
+    "y":339.8202781677246,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"a1c6afab.017d9",
+    "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":1225.3333282470703,
-    "y":710.83371925354,
-    "z":"47ab735d.a7360c",
+    "x":1238.44775390625,
+    "y":404.3978147506714,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "a9bc0844.f2eaf8"
+        "bd102392.9272f"
       ]
     ]
   },
   {
-    "id":"a9bc0844.f2eaf8",
+    "id":"bd102392.9272f",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1430.3333282470703,
-    "y":709.83371925354,
-    "z":"47ab735d.a7360c",
+    "x":1443.44775390625,
+    "y":403.3978147506714,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "5bbbca15.5f16f4",
-        "51615f09.7cd5"
+        "e3a432d7.d3122"
       ]
     ]
   },
   {
-    "id":"5bbbca15.5f16f4",
+    "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":1618.333251953125,
-    "y":711,
-    "z":"47ab735d.a7360c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"51615f09.7cd5",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site1_routerId`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1603.333152770996,
-    "y":777.0000004768372,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "5c8e20c7.731dc"
-      ]
-    ]
-  },
-  {
-    "id":"5c8e20c7.731dc",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1770.3332595825195,
-    "y":775.8570942878723,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "dc036fc4.b3148"
-      ]
-    ]
-  },
-  {
-    "id":"dc036fc4.b3148",
-    "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":1942.7619857788086,
-    "y":775.857093334198,
-    "z":"47ab735d.a7360c",
+    "x":1847.601577758789,
+    "y":402.2564105987549,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"ca9364d2.2f4418",
+    "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":1231.333251953125,
-    "y":833,
-    "z":"47ab735d.a7360c",
+    "x":1235.986557006836,
+    "y":475.79493522644043,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "3ff6c495.85cb0c"
+        "6e0eb7d7.46a9d8"
       ]
     ]
   },
   {
-    "id":"3ff6c495.85cb0c",
+    "id":"6e0eb7d7.46a9d8",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1436.333251953125,
-    "y":832,
-    "z":"47ab735d.a7360c",
+    "x":1440.986557006836,
+    "y":474.79493522644043,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "22ffcf96.237c7",
-        "5abc130e.c8a7ec"
+        "82d1be44.e3709"
       ]
     ]
   },
   {
-    "id":"22ffcf96.237c7",
+    "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":1624.3331756591797,
-    "y":833.16628074646,
-    "z":"47ab735d.a7360c",
+    "x":1868.9871444702148,
+    "y":475.19210052490234,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"5abc130e.c8a7ec",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site2_routerId`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1609.3330764770508,
-    "y":899.1662812232971,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "11b34474.2a006c"
-      ]
-    ]
-  },
-  {
-    "id":"11b34474.2a006c",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1776.3331832885742,
-    "y":898.0233750343323,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "3492baf9.c74166"
-      ]
-    ]
-  },
-  {
-    "id":"3492baf9.c74166",
-    "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":1948.7619094848633,
-    "y":898.023374080658,
-    "z":"47ab735d.a7360c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"979386d3.b24028",
+    "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":1622.333251953125,
-    "y":955,
-    "z":"47ab735d.a7360c",
+    "x":1860.8328247070312,
+    "y":552.410285949707,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"26bcb080.9de85",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site1_importRT1`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1607.333152770996,
-    "y":1021.0000004768372,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "ef415eca.43e4c"
-      ]
-    ]
-  },
-  {
-    "id":"ef415eca.43e4c",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1774.3332595825195,
-    "y":1019.8570942878723,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "86ecacf6.62cbf"
-      ]
-    ]
-  },
-  {
-    "id":"86ecacf6.62cbf",
-    "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":1946.7619857788086,
-    "y":1019.857093334198,
-    "z":"47ab735d.a7360c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"18c864fe.2d77ab",
+    "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":1234,
-    "y":1073.333251953125,
-    "z":"47ab735d.a7360c",
+    "x":1238.653060913086,
+    "y":621.5128269195557,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "ed82852f.fe5c18"
+        "767cef4c.87c12"
       ]
     ]
   },
   {
-    "id":"ed82852f.fe5c18",
+    "id":"767cef4c.87c12",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1436,
-    "y":1072.333251953125,
-    "z":"47ab735d.a7360c",
+    "x":1440.653060913086,
+    "y":620.5128269195557,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "d6046005.c3e8f",
-        "f99cbbe6.ae2498"
+        "774128e9.097e98"
       ]
     ]
   },
   {
-    "id":"d6046005.c3e8f",
+    "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":1619.7141189575195,
-    "y":1073.2138023376465,
-    "z":"47ab735d.a7360c",
+    "x":1862.8285751342773,
+    "y":620.6240797042847,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"f99cbbe6.ae2498",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site2_importRT1`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1604.7140197753906,
-    "y":1139.2138028144836,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "8c236b10.143bc8"
-      ]
-    ]
-  },
-  {
-    "id":"8c236b10.143bc8",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
-    "comments":"",
-    "outputs":1,
-    "x":1771.714126586914,
-    "y":1138.0708966255188,
-    "z":"47ab735d.a7360c",
-    "wires":[
-      [
-        "bea6a75d.110d08"
-      ]
-    ]
-  },
-  {
-    "id":"bea6a75d.110d08",
-    "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":1944.1428527832031,
-    "y":1138.0708956718445,
-    "z":"47ab735d.a7360c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"7a713e79.f07e5",
+    "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":1628,
-    "y":1194.6666259765625,
-    "z":"47ab735d.a7360c",
+    "x":1844.9608268737793,
+    "y":682.8463268280029,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"cc5ed7e8.5ea2b8",
+    "id":"6132d023.70902",
     "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site1_exportRT1`\">\n",
+    "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":1612.999900817871,
-    "y":1260.6666264533997,
-    "z":"47ab735d.a7360c",
+    "x":1230.9609603881836,
+    "y":747.7693099975586,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "86630450.14c6c8"
+        "feb35a24.cd3648"
       ]
     ]
   },
   {
-    "id":"86630450.14c6c8",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
+    "id":"feb35a24.cd3648",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1780.0000076293945,
-    "y":1259.5237202644348,
-    "z":"47ab735d.a7360c",
+    "x":1426.9609603881836,
+    "y":744.7693099975586,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "468368dd.119d68"
+        "4b3b20e7.2b2fe"
       ]
     ]
   },
   {
-    "id":"468368dd.119d68",
-    "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",
+    "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":1952.4287338256836,
-    "y":1259.5237193107605,
-    "z":"47ab735d.a7360c",
+    "x":1840.4958572387695,
+    "y":740.7011775970459,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"f8675cad.a9a8b",
+    "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 site1_exportRT2",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT2'`\">\n",
+    "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":1234,
-    "y":1322.6666259765625,
-    "z":"47ab735d.a7360c",
+    "x":1203.6532287597656,
+    "y":873.3337364196777,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "7c5b768c.6c5ba8"
+        "79ded29d.4ddd9c"
       ]
     ]
   },
   {
-    "id":"7c5b768c.6c5ba8",
+    "id":"79ded29d.4ddd9c",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1430,
-    "y":1319.6666259765625,
-    "z":"47ab735d.a7360c",
+    "x":1402.6532249450684,
+    "y":873.3337554931641,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "632409be.2fe268",
-        "ac332471.3b3248"
+        "d0c7e690.e8d078"
       ]
     ]
   },
   {
-    "id":"632409be.2fe268",
+    "id":"8a4479c0.ee42f8",
     "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",
+    "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":1627.380786895752,
-    "y":1320.213830947876,
-    "z":"47ab735d.a7360c",
+    "x":1807.2905578613281,
+    "y":871.2911982536316,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"ac332471.3b3248",
+    "id":"1d0ed859.af0d08",
     "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site1_exportRT2`\">\n",
+    "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":1612.380687713623,
-    "y":1386.2138314247131,
-    "z":"47ab735d.a7360c",
+    "x":1207.5376205444336,
+    "y":940.372227191925,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "aa9c2541.4a4bd8"
+        "5540f5e2.10ecbc"
       ]
     ]
   },
   {
-    "id":"aa9c2541.4a4bd8",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
+    "id":"5540f5e2.10ecbc",
+    "type":"outcomeTrue",
+    "name":"true",
+    "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1779.3807945251465,
-    "y":1385.0709252357483,
-    "z":"47ab735d.a7360c",
+    "x":1413.5376205444336,
+    "y":940.372227191925,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "b786e793.f56c18"
+        "f2527f65.6836f"
       ]
     ]
   },
   {
-    "id":"b786e793.f56c18",
-    "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",
+    "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":1951.8095207214355,
-    "y":1385.070924282074,
-    "z":"47ab735d.a7360c",
+    "x":1812.8451919555664,
+    "y":935.9876976013184,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"6a2f200.8e65de",
-    "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",
+    "id":"a101c9de.bfa5c8",
+    "type":"comment",
+    "name":"TODO: optimize the activate by using parameter assignment here",
+    "info":"",
     "comments":"",
-    "x":1621.333251953125,
-    "y":1451,
-    "z":"47ab735d.a7360c",
+    "x":1100.3197479248047,
+    "y":20,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
 
     ]
   },
   {
-    "id":"4214073.a9e53f8",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site1_vni`\">\n",
+    "id":"ae14dcf0.2fa2",
+    "type":"block",
+    "name":"block validate",
+    "xml":"<block atomic=\"true\">\n",
+    "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1606.333152770996,
-    "y":1517.0000004768372,
-    "z":"47ab735d.a7360c",
+    "x":575.3197402954102,
+    "y":261.9999895095825,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "83c7c713.88af68"
+        "28487c0a.d2f1d4",
+        "657025f9.1e55dc",
+        "766e54f6.c89c1c"
       ]
     ]
   },
   {
-    "id":"83c7c713.88af68",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
+    "id":"da60451d.6b55f8",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1773.3332595825195,
-    "y":1515.8570942878723,
-    "z":"47ab735d.a7360c",
+    "x":1625.0120544433594,
+    "y":86.55049514770508,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "a4f203d2.7ca8"
+        "1db7b8be.899e57",
+        "96044bd5.858c28"
       ]
     ]
   },
   {
-    "id":"a4f203d2.7ca8",
-    "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":1945.7619857788086,
-    "y":1515.857093334198,
-    "z":"47ab735d.a7360c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"c93315a.3d905e8",
-    "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",
+    "id":"479be6ca.797c48",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1219.0001831054688,
-    "y":1579.0001740455627,
-    "z":"47ab735d.a7360c",
+    "x":1624.242691040039,
+    "y":144.2427978515625,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "ef47961a.8fd608"
+        "f8ed6bb4.b05df8",
+        "96044bd5.858c28"
       ]
     ]
   },
   {
-    "id":"ef47961a.8fd608",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
+    "id":"d9eecf1d.5da05",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1418.0001792907715,
-    "y":1579.000193119049,
-    "z":"47ab735d.a7360c",
+    "x":1616.5506019592285,
+    "y":205.78127479553223,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "7976c64e.576738",
-        "835fae91.9704a"
+        "54871b70.cd0a24",
+        "96044bd5.858c28"
       ]
     ]
   },
   {
-    "id":"7976c64e.576738",
-    "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":1625.7142868041992,
-    "y":1583.8806405067444,
-    "z":"47ab735d.a7360c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"835fae91.9704a",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.site2_vni`\">\n",
+    "id":"360a973d.9d1cc8",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1610.7141876220703,
-    "y":1649.8806409835815,
-    "z":"47ab735d.a7360c",
+    "x":1615.0120849609375,
+    "y":275.78126430511475,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "88d0a6fa.f7ddb8"
+        "4ef856dd.ae2728",
+        "96044bd5.858c28"
       ]
     ]
   },
   {
-    "id":"88d0a6fa.f7ddb8",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
+    "id":"822ee2d3.48c3c",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1777.7142944335938,
-    "y":1648.7377347946167,
-    "z":"47ab735d.a7360c",
+    "x":1606.550521850586,
+    "y":338.858193397522,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "4e2d2d8e.6e8494"
+        "ad54b8c9.7da448",
+        "96044bd5.858c28"
       ]
     ]
   },
   {
-    "id":"4e2d2d8e.6e8494",
-    "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",
+    "id":"e3a432d7.d3122",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
-    "x":1950.1430206298828,
-    "y":1648.7377338409424,
-    "z":"47ab735d.a7360c",
+    "outputs":1,
+    "x":1596.5502471923828,
+    "y":403.1658983230591,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
-
+      [
+        "aa160e34.e4b32",
+        "96044bd5.858c28"
+      ]
     ]
   },
   {
-    "id":"5e4cd98f.ace3e8",
-    "type":"switchNode",
-    "name":"switch tunnelType",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
+    "id":"82d1be44.e3709",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1227.4997482299805,
-    "y":1704.5002737045288,
-    "z":"47ab735d.a7360c",
+    "x":1587.319839477539,
+    "y":477.3197727203369,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "60d09a1d.8eacd4"
+        "6301c339.b9a5ac",
+        "96044bd5.858c28"
       ]
     ]
   },
   {
-    "id":"60d09a1d.8eacd4",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
+    "id":"8e2e8c1d.89a89",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1433.4997482299805,
-    "y":1704.5002737045288,
-    "z":"47ab735d.a7360c",
+    "x":1588.08890914917,
+    "y":553.8582248687744,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "39b6c0a.d67614",
-        "8a998b80.e315c8"
+        "56ed96a3.41ee28",
+        "96044bd5.858c28"
       ]
     ]
   },
   {
-    "id":"39b6c0a.d67614",
-    "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",
+    "id":"774128e9.097e98",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
-    "x":1620.499771118164,
-    "y":1705.5004272460938,
-    "z":"47ab735d.a7360c",
+    "outputs":1,
+    "x":1592.704360961914,
+    "y":621.5506038665771,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
-
+      [
+        "1fe27c7.2dcc584",
+        "96044bd5.858c28"
+      ]
     ]
   },
   {
-    "id":"8a998b80.e315c8",
-    "type":"switchNode",
-    "name":"switch value",
-    "xml":"<switch test=\"`$validate.dci-connects.tunnelType`\">\n",
+    "id":"53264553.d1234c",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1613,
-    "y":1775,
-    "z":"47ab735d.a7360c",
+    "x":1582.7043190002441,
+    "y":686.166033744812,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "bdc574b6.8b53a8"
+        "addc94d5.935028",
+        "96044bd5.858c28"
       ]
     ]
   },
   {
-    "id":"bdc574b6.8b53a8",
-    "type":"outcome",
-    "name":"NULL",
-    "xml":"<outcome value=''>",
+    "id":"4b3b20e7.2b2fe",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1780.0001068115234,
-    "y":1773.8570938110352,
-    "z":"47ab735d.a7360c",
+    "x":1584.2429733276367,
+    "y":744.6275215148926,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "97d6982d.d730f8"
+        "c9f8c3ab.70b24",
+        "96044bd5.858c28"
       ]
     ]
   },
   {
-    "id":"97d6982d.d730f8",
-    "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",
+    "id":"a5b17398.c8fe9",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
-    "x":1952.4288330078125,
-    "y":1773.8570928573608,
-    "z":"47ab735d.a7360c",
+    "outputs":1,
+    "x":1574.242935180664,
+    "y":813.8583087921143,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
-
+      [
+        "a5dc4d63.d58b1",
+        "96044bd5.858c28"
+      ]
     ]
   },
   {
-    "id":"f21b1a5d.f4c3d8",
-    "type":"comment",
-    "name":"TODO: optimize the activate by using parameter assignment here",
-    "info":"",
+    "id":"d0c7e690.e8d078",
+    "type":"block",
+    "name":"block",
+    "xml":"<block>\n",
+    "atomic":"false",
     "comments":"",
-    "x":1065.6666870117188,
-    "y":45.666683197021484,
-    "z":"47ab735d.a7360c",
+    "outputs":1,
+    "x":1567.319580078125,
+    "y":879.243043422699,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
-
+      [
+        "8a4479c0.ee42f8",
+        "96044bd5.858c28"
+      ]
     ]
   },
   {
-    "id":"a976418d.bf0e8",
+    "id":"f2527f65.6836f",
     "type":"block",
-    "name":"block validate",
-    "xml":"<block atomic=\"true\">\n",
+    "name":"block",
+    "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":540.6666793823242,
-    "y":287.666672706604,
-    "z":"47ab735d.a7360c",
+    "x":1574.2429809570312,
+    "y":939.2429823875427,
+    "z":"b32ccb5b.ff5d48",
     "wires":[
       [
-        "bd4a5cad.24385",
-        "1f0e911e.e29fcf",
-        "23001689.a4dc8a"
+        "99b782e.ba8658",
+        "96044bd5.858c28"
       ]
     ]
   }