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

6 files changed, 1520 insertions, 1822 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
index bcc9e0e2..8ca37549 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id":"f677edb7.5eba9",
+    "id":"d9348659.3343f8",
     "type":"dgstart",
     "name":"DGSTART",
     "outputs":1,
-    "x":104.66666412353516,
-    "y":37.99999809265137,
-    "z":"e7b3886.bec2e78",
+    "x":123.47356414794922,
+    "y":36.92307662963867,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "bda53e34.48bcb"
+        "91511e7d.e1436"
       ]
     ]
   },
   {
-    "id":"bda53e34.48bcb",
+    "id":"91511e7d.e1436",
     "type":"service-logic",
     "name":"GENERIC-RESOURCE-API ${project.version}",
     "module":"GENERIC-RESOURCE-API",
@@ -22,59 +22,59 @@
     "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":321.16666412353516,
-    "y":100.49999809265137,
-    "z":"e7b3886.bec2e78",
+    "x":339.9735641479492,
+    "y":99.42307662963867,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "33551718.9d6058"
+        "fb35fe83.68171"
       ]
     ]
   },
   {
-    "id":"33551718.9d6058",
+    "id":"fb35fe83.68171",
     "type":"method",
     "name":"method dci-connects-network-topology-operation-activate",
     "xml":"<method rpc='dci-connects-network-topology-operation-activate' mode='sync'>\n",
     "comments":"",
     "outputs":1,
-    "x":229.16669464111328,
-    "y":195.4999828338623,
-    "z":"e7b3886.bec2e78",
+    "x":247.97359466552734,
+    "y":194.4230613708496,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "6463cc60.4f8394"
+        "85134fc3.6a4b9"
       ]
     ]
   },
   {
-    "id":"6463cc60.4f8394",
+    "id":"85134fc3.6a4b9",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "outputs":1,
-    "x":527.0000076293945,
-    "y":203.33332633972168,
-    "z":"e7b3886.bec2e78",
+    "x":545.8069076538086,
+    "y":202.25640487670898,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "c7522c24.5f98b",
-        "102b3cb5.6d7ac3",
-        "2ed80a33.f4c916"
+        "72cde0ff.31704",
+        "590c7c68.1d2104",
+        "550a9d72.337fb4"
       ]
     ]
   },
   {
-    "id":"102b3cb5.6d7ac3",
+    "id":"590c7c68.1d2104",
     "type":"call",
     "name":"call GENERIC-RESOURCE-API:validate-network-input-parameters",
     "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
     "comments":"",
     "outputs":1,
-    "x":917.0000076293945,
-    "y":68.33332633972168,
-    "z":"e7b3886.bec2e78",
+    "x":935.8069076538086,
+    "y":67.25640487670898,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
 
@@ -82,361 +82,361 @@
     ]
   },
   {
-    "id":"12cc8933.03f2b7",
+    "id":"7588d34b.da832c",
     "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":1435.0002975463867,
-    "y":341.33338713645935,
-    "z":"e7b3886.bec2e78",
+    "x":1453.8071975708008,
+    "y":340.25646567344666,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "4b519ec.f2b4b6"
+        "40d47fba.cda58"
       ]
     ]
   },
   {
-    "id":"4b519ec.f2b4b6",
+    "id":"40d47fba.cda58",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1682.0002059936523,
-    "y":339.3333566188812,
-    "z":"e7b3886.bec2e78",
+    "x":1700.8071060180664,
+    "y":338.25643515586853,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "32074b80.b9a384",
-        "448b7ef3.fc516",
-        "1a7f3647.3d7caa",
-        "59f458ff.1d73b8",
-        "bb7bc8f4.498f28",
-        "e2d9cb00.0ed418",
-        "6fb6ab2c.4aa5d4",
-        "397d3387.a8686c",
-        "b90eee01.f71b"
+        "e1df1ae9.cf85b8",
+        "4928a2f4.8183ac",
+        "aa1e7021.923d4",
+        "b5b55974.4394b8",
+        "c1b8667e.1e3be8",
+        "486715ba.35901c",
+        "bfa187c0.0fb398",
+        "32183c6e.e30e04",
+        "61d1802d.1434"
       ]
     ]
   },
   {
-    "id":"32074b80.b9a384",
+    "id":"e1df1ae9.cf85b8",
     "type":"switchNode",
     "name":"switch id",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2169.0005645751953,
-    "y":215.3334732055664,
-    "z":"e7b3886.bec2e78",
+    "x":2187.8074645996094,
+    "y":214.2565517425537,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "f708b7e0.e87648"
+        "df29b873.dc0368"
       ]
     ]
   },
   {
-    "id":"448b7ef3.fc516",
+    "id":"4928a2f4.8183ac",
     "type":"switchNode",
     "name":"switch description",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_description'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2197.0005645751953,
-    "y":269.33345890045166,
-    "z":"e7b3886.bec2e78",
+    "x":2215.8074645996094,
+    "y":268.25653743743896,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "13b7e002.7b869"
+        "66a6f423.f8cf2c"
       ]
     ]
   },
   {
-    "id":"1a7f3647.3d7caa",
+    "id":"aa1e7021.923d4",
     "type":"switchNode",
     "name":"switch routerId",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2186.0003509521484,
-    "y":400.33341884613037,
-    "z":"e7b3886.bec2e78",
+    "x":2204.8072509765625,
+    "y":399.2564973831177,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "b16fc128.b108e"
+        "f862419f.5a38e"
       ]
     ]
   },
   {
-    "id":"59f458ff.1d73b8",
+    "id":"b5b55974.4394b8",
     "type":"switchNode",
     "name":"switch importRT1",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2194.286087036133,
-    "y":461.61917209625244,
-    "z":"e7b3886.bec2e78",
+    "x":2213.092987060547,
+    "y":460.54225063323975,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "38411baa.2cca74"
+        "d69adf7d.fdb4a"
       ]
     ]
   },
   {
-    "id":"bb7bc8f4.498f28",
+    "id":"c1b8667e.1e3be8",
     "type":"switchNode",
     "name":"switch exportRT1",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2195.286148071289,
-    "y":525.6191428899765,
-    "z":"e7b3886.bec2e78",
+    "x":2214.093048095703,
+    "y":524.5422214269638,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "c1464a84.f3b268"
+        "83c8cb3e.493888"
       ]
     ]
   },
   {
-    "id":"e2d9cb00.0ed418",
+    "id":"486715ba.35901c",
     "type":"switchNode",
     "name":"switch vni",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2166.286117553711,
-    "y":588.6191749572754,
-    "z":"e7b3886.bec2e78",
+    "x":2185.093017578125,
+    "y":587.5422534942627,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "a40701ca.7f71d"
+        "9741b81e.e77848"
       ]
     ]
   },
   {
-    "id":"f708b7e0.e87648",
+    "id":"df29b873.dc0368",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2384.0005645751953,
-    "y":214.3334732055664,
-    "z":"e7b3886.bec2e78",
+    "x":2402.8074645996094,
+    "y":213.2565517425537,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "3df14e3f.ff9f42"
+        "2e6a3378.2c236c"
       ]
     ]
   },
   {
-    "id":"13b7e002.7b869",
+    "id":"66a6f423.f8cf2c",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2395.0005645751953,
-    "y":269.33345890045166,
-    "z":"e7b3886.bec2e78",
+    "x":2413.8074645996094,
+    "y":268.25653743743896,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "bf6e83b1.5d5aa"
+        "1b94cf95.06452"
       ]
     ]
   },
   {
-    "id":"b16fc128.b108e",
+    "id":"f862419f.5a38e",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2391.0003509521484,
-    "y":399.33341884613037,
-    "z":"e7b3886.bec2e78",
+    "x":2409.8072509765625,
+    "y":398.2564973831177,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "762bb1f.102ee5"
+        "20e3f8cc.02b6f8"
       ]
     ]
   },
   {
-    "id":"38411baa.2cca74",
+    "id":"d69adf7d.fdb4a",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2396.286087036133,
-    "y":460.61917209625244,
-    "z":"e7b3886.bec2e78",
+    "x":2415.092987060547,
+    "y":459.54225063323975,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "28eacd01.75bb82"
+        "4dceded7.35703"
       ]
     ]
   },
   {
-    "id":"c1464a84.f3b268",
+    "id":"83c8cb3e.493888",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2391.286148071289,
-    "y":522.6191428899765,
-    "z":"e7b3886.bec2e78",
+    "x":2410.093048095703,
+    "y":521.5422214269638,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "54d6710.aef549"
+        "b28306b0.c9d2a8"
       ]
     ]
   },
   {
-    "id":"a40701ca.7f71d",
+    "id":"9741b81e.e77848",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2372.286117553711,
-    "y":588.6191749572754,
-    "z":"e7b3886.bec2e78",
+    "x":2391.093017578125,
+    "y":587.5422534942627,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "3a8b4224.49c96e"
+        "12fa2bd9.b56374"
       ]
     ]
   },
   {
-    "id":"bf6e83b1.5d5aa",
+    "id":"1b94cf95.06452",
     "type":"set",
     "name":"set description",
     "xml":"<set>\n<parameter name='prop.dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2577.0005645751953,
-    "y":262.33345890045166,
-    "z":"e7b3886.bec2e78",
+    "x":2595.8074645996094,
+    "y":261.25653743743896,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"762bb1f.102ee5",
+    "id":"20e3f8cc.02b6f8",
     "type":"set",
     "name":"set router_id",
     "xml":"<set>\n<parameter name='prop.dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2582.00057220459,
-    "y":392.33350563049316,
-    "z":"e7b3886.bec2e78",
+    "x":2600.807472229004,
+    "y":391.25658416748047,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"3a8b4224.49c96e",
+    "id":"12fa2bd9.b56374",
     "type":"set",
     "name":"set vni",
     "xml":"<set>\n<parameter name='prop.dci-connects.vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2542.286117553711,
-    "y":580.6191749572754,
-    "z":"e7b3886.bec2e78",
+    "x":2561.093017578125,
+    "y":579.5422534942627,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"c7522c24.5f98b",
+    "id":"72cde0ff.31704",
     "type":"returnSuccess",
     "name":"return success",
     "xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments":"",
-    "x":749.2858352661133,
-    "y":1044.0476970672607,
-    "z":"e7b3886.bec2e78",
+    "x":768.0927352905273,
+    "y":1042.970775604248,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"6fb6ab2c.4aa5d4",
+    "id":"bfa187c0.0fb398",
     "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":2180.1670989990234,
-    "y":156.5001049041748,
-    "z":"e7b3886.bec2e78",
+    "x":2198.9739990234375,
+    "y":155.4231834411621,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "1239b72b.2fbef9"
+        "72ce5ab6.59c4f4"
       ]
     ]
   },
   {
-    "id":"1239b72b.2fbef9",
+    "id":"72ce5ab6.59c4f4",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2378.1670989990234,
-    "y":156.5001049041748,
-    "z":"e7b3886.bec2e78",
+    "x":2396.9739990234375,
+    "y":155.4231834411621,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "11312cce.e525f3"
+        "94ddea4c.b90858"
       ]
     ]
   },
   {
-    "id":"11312cce.e525f3",
+    "id":"94ddea4c.b90858",
     "type":"set",
     "name":"set name",
     "xml":"<set>\n<parameter name='prop.dci-connects.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2560.1670989990234,
-    "y":149.5001049041748,
-    "z":"e7b3886.bec2e78",
+    "x":2578.9739990234375,
+    "y":148.4231834411621,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"397d3387.a8686c",
+    "id":"32183c6e.e30e04",
     "type":"switchNode",
     "name":"switch networkName",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2203.6668853759766,
-    "y":335.50004482269287,
-    "z":"e7b3886.bec2e78",
+    "x":2222.4737854003906,
+    "y":334.4231233596802,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "7e8f9a77.54d324"
+        "cbd34ee3.99a0d"
       ]
     ]
   },
   {
-    "id":"7e8f9a77.54d324",
+    "id":"cbd34ee3.99a0d",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2401.6668853759766,
-    "y":335.50004482269287,
-    "z":"e7b3886.bec2e78",
+    "x":2420.4737854003906,
+    "y":334.4231233596802,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
 
@@ -444,318 +444,318 @@
     ]
   },
   {
-    "id":"2ed80a33.f4c916",
+    "id":"550a9d72.337fb4",
     "type":"block",
     "name":"block : execute",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":750.6665954589844,
-    "y":576.5000438690186,
-    "z":"e7b3886.bec2e78",
+    "x":769.4734954833984,
+    "y":575.4231224060059,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "5080dfc0.36b37",
-        "eb244a6f.359e28",
-        "ca9b0788.7f9838"
+        "cfc7a47c.663e78",
+        "c5b9ee71.a7f1b",
+        "180ce8e1.cf4c47"
       ]
     ]
   },
   {
-    "id":"5080dfc0.36b37",
+    "id":"cfc7a47c.663e78",
     "type":"block",
     "name":"block : executeSite1",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":1043.1666564941406,
-    "y":401.00002002716064,
-    "z":"e7b3886.bec2e78",
+    "x":1061.9735565185547,
+    "y":399.92309856414795,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "12cc8933.03f2b7",
-        "d400e6f0.9ebae8"
+        "7588d34b.da832c",
+        "28717d00.ee3742"
       ]
     ]
   },
   {
-    "id":"eb244a6f.359e28",
+    "id":"c5b9ee71.a7f1b",
     "type":"block",
     "name":"block : executeSite2",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":1060.1667022705078,
-    "y":917.000002861023,
-    "z":"e7b3886.bec2e78",
+    "x":1078.9736022949219,
+    "y":915.9230813980103,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "89c1aab1.7bdc58",
-        "d400e6f0.9ebae8"
+        "fd35f4e6.c30318",
+        "28717d00.ee3742"
       ]
     ]
   },
   {
-    "id":"8f3fbdf6.1304f",
+    "id":"3cb8fe79.792382",
     "type":"switchNode",
     "name":"switch id",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2154.66690826416,
-    "y":735.9999370574951,
-    "z":"e7b3886.bec2e78",
+    "x":2173.473808288574,
+    "y":734.9230155944824,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "a436316f.11b39"
+        "95aba4ef.a6b348"
       ]
     ]
   },
   {
-    "id":"87844c42.b36e3",
+    "id":"c3869697.ac74a8",
     "type":"switchNode",
     "name":"switch description",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_description'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2178.6672592163086,
-    "y":794.9999437332153,
-    "z":"e7b3886.bec2e78",
+    "x":2197.4741592407227,
+    "y":793.9230222702026,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "bf81b94b.2f55a8",
-        "18114475.1855ec"
+        "87dd7ff6.4e946",
+        "6ebb06e1.0019e8"
       ]
     ]
   },
   {
-    "id":"bb073e87.caa3e",
+    "id":"28c024be.02b6cc",
     "type":"switchNode",
     "name":"switch routerId",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2187.666648864746,
-    "y":990.9999094009399,
-    "z":"e7b3886.bec2e78",
+    "x":2206.47354888916,
+    "y":989.9229879379272,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "96a4190f.73e698"
+        "c2a810a1.f17f8"
       ]
     ]
   },
   {
-    "id":"e9a9b37b.df96d",
+    "id":"4596e3bf.5dc28c",
     "type":"switchNode",
     "name":"switch importRT1",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2195.9523849487305,
-    "y":1052.285662651062,
-    "z":"e7b3886.bec2e78",
+    "x":2214.7592849731445,
+    "y":1051.2087411880493,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "7988286f.daa4d8"
+        "4dd4172.45198e8"
       ]
     ]
   },
   {
-    "id":"d05e00bd.4bb1d",
+    "id":"e37ecd89.2308f",
     "type":"switchNode",
     "name":"switch exportRT1",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_exportRT1'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2196.9524459838867,
-    "y":1116.285633444786,
-    "z":"e7b3886.bec2e78",
+    "x":2215.759346008301,
+    "y":1115.2087119817734,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "4feb1f47.56d31"
+        "562841d1.af6df"
       ]
     ]
   },
   {
-    "id":"50846ae9.b3bb24",
+    "id":"300b1c9.4943ee4",
     "type":"switchNode",
     "name":"switch vni",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2167.9524154663086,
-    "y":1179.285665512085,
-    "z":"e7b3886.bec2e78",
+    "x":2186.7593154907227,
+    "y":1178.2087440490723,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "1c48672.500ee99"
+        "ea952cf3.d5472"
       ]
     ]
   },
   {
-    "id":"a436316f.11b39",
+    "id":"95aba4ef.a6b348",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2369.66690826416,
-    "y":734.9999370574951,
-    "z":"e7b3886.bec2e78",
+    "x":2388.473808288574,
+    "y":733.9230155944824,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "a9738af0.3c8338"
+        "278a044f.dd078c"
       ]
     ]
   },
   {
-    "id":"bf81b94b.2f55a8",
+    "id":"87dd7ff6.4e946",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2376.6672592163086,
-    "y":794.9999437332153,
-    "z":"e7b3886.bec2e78",
+    "x":2395.4741592407227,
+    "y":793.9230222702026,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "b34bd5d.abbf728"
+        "93ea2de.e8ac8d"
       ]
     ]
   },
   {
-    "id":"96a4190f.73e698",
+    "id":"c2a810a1.f17f8",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2392.666648864746,
-    "y":989.9999094009399,
-    "z":"e7b3886.bec2e78",
+    "x":2411.47354888916,
+    "y":988.9229879379272,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "74df6953.989bb8"
+        "85948504.e0e5e8"
       ]
     ]
   },
   {
-    "id":"7988286f.daa4d8",
+    "id":"4dd4172.45198e8",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2397.9523849487305,
-    "y":1051.285662651062,
-    "z":"e7b3886.bec2e78",
+    "x":2416.7592849731445,
+    "y":1050.2087411880493,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "87fc0003.1c83"
+        "36bb1ad6.f67656"
       ]
     ]
   },
   {
-    "id":"4feb1f47.56d31",
+    "id":"562841d1.af6df",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2392.9524459838867,
-    "y":1113.285633444786,
-    "z":"e7b3886.bec2e78",
+    "x":2411.759346008301,
+    "y":1112.2087119817734,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "e1b1c41e.20d598"
+        "6259b6ca.196658"
       ]
     ]
   },
   {
-    "id":"1c48672.500ee99",
+    "id":"ea952cf3.d5472",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2373.9524154663086,
-    "y":1179.285665512085,
-    "z":"e7b3886.bec2e78",
+    "x":2392.7593154907227,
+    "y":1178.2087440490723,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "b4378fb6.33ce7"
+        "255616ab.de0f5a"
       ]
     ]
   },
   {
-    "id":"b34bd5d.abbf728",
+    "id":"93ea2de.e8ac8d",
     "type":"set",
     "name":"set description",
     "xml":"<set>\n<parameter name='prop.dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2558.6672592163086,
-    "y":787.9999437332153,
-    "z":"e7b3886.bec2e78",
+    "x":2577.4741592407227,
+    "y":786.9230222702026,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"74df6953.989bb8",
+    "id":"85948504.e0e5e8",
     "type":"set",
     "name":"set router_id",
     "xml":"<set>\n<parameter name='prop.dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2583.6668701171875,
-    "y":982.9999961853027,
-    "z":"e7b3886.bec2e78",
+    "x":2602.4737701416016,
+    "y":981.92307472229,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"b4378fb6.33ce7",
+    "id":"255616ab.de0f5a",
     "type":"set",
     "name":"set vni",
     "xml":"<set>\n<parameter name='prop.dci-connects.vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2543.9524154663086,
-    "y":1171.285665512085,
-    "z":"e7b3886.bec2e78",
+    "x":2562.7593154907227,
+    "y":1170.2087440490723,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"d2d84b28.6524b8",
+    "id":"61795685.f9f748",
     "type":"switchNode",
     "name":"switch networkName",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":2205.333183288574,
-    "y":926.1665353775024,
-    "z":"e7b3886.bec2e78",
+    "x":2224.1400833129883,
+    "y":925.0896139144897,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "2e52c3b.1c3fa3c"
+        "9b9d32c5.d3d4"
       ]
     ]
   },
   {
-    "id":"2e52c3b.1c3fa3c",
+    "id":"9b9d32c5.d3d4",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2403.333183288574,
-    "y":926.1665353775024,
-    "z":"e7b3886.bec2e78",
+    "x":2422.1400833129883,
+    "y":925.0896139144897,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
 
@@ -763,132 +763,132 @@
     ]
   },
   {
-    "id":"ebb3dc82.63277",
+    "id":"6bade79.05bd618",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1673.666358947754,
-    "y":857.9998948574066,
-    "z":"e7b3886.bec2e78",
+    "x":1692.473258972168,
+    "y":856.9229733943939,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "8f3fbdf6.1304f",
-        "87844c42.b36e3",
-        "bb073e87.caa3e",
-        "e9a9b37b.df96d",
-        "d05e00bd.4bb1d",
-        "50846ae9.b3bb24",
-        "d2d84b28.6524b8"
+        "3cb8fe79.792382",
+        "c3869697.ac74a8",
+        "28c024be.02b6cc",
+        "4596e3bf.5dc28c",
+        "e37ecd89.2308f",
+        "300b1c9.4943ee4",
+        "61795685.f9f748"
       ]
     ]
   },
   {
-    "id":"89c1aab1.7bdc58",
+    "id":"fd35f4e6.c30318",
     "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":1426.6664505004883,
-    "y":859.9999253749847,
-    "z":"e7b3886.bec2e78",
+    "x":1445.4733505249023,
+    "y":858.923003911972,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "ebb3dc82.63277"
+        "6bade79.05bd618"
       ]
     ]
   },
   {
-    "id":"3df14e3f.ff9f42",
+    "id":"2e6a3378.2c236c",
     "type":"set",
     "name":"set id",
     "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2565.666946411133,
-    "y":208.0000228881836,
-    "z":"e7b3886.bec2e78",
+    "x":2584.473846435547,
+    "y":206.9231014251709,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"b90eee01.f71b",
+    "id":"61d1802d.1434",
     "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":2185.166664123535,
-    "y":657.9999370574951,
-    "z":"e7b3886.bec2e78",
+    "x":2203.973564147949,
+    "y":656.9230155944824,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "49421593.ccc6fc"
+        "7f01268.d4291d8"
       ]
     ]
   },
   {
-    "id":"49421593.ccc6fc",
+    "id":"7f01268.d4291d8",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2391.166664123535,
-    "y":657.9999370574951,
-    "z":"e7b3886.bec2e78",
+    "x":2409.973564147949,
+    "y":656.9230155944824,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "85008c2f.e9768"
+        "b055aa18.813ff8"
       ]
     ]
   },
   {
-    "id":"85008c2f.e9768",
+    "id":"b055aa18.813ff8",
     "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":2561.166664123535,
-    "y":649.9999370574951,
-    "z":"e7b3886.bec2e78",
+    "x":2579.973564147949,
+    "y":648.9230155944824,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"d400e6f0.9ebae8",
+    "id":"28717d00.ee3742",
     "type":"block",
     "name":"block : sendRequest",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":1339.1666831970215,
-    "y":1417.499942779541,
-    "z":"e7b3886.bec2e78",
+    "x":1357.9735832214355,
+    "y":1416.4230213165283,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "4b5b64db.a6e31c",
-        "67106fe7.87d3f",
-        "e15d1e8.e713be",
-        "51ee7ac2.7dbfe4"
+        "ceb4bf57.f1644",
+        "143c42a.ea474bd",
+        "69d4f592.3b2f0c",
+        "282c5c4c.028af4"
       ]
     ]
   },
   {
-    "id":"b9168ed9.b3a7b",
+    "id":"f74530f5.a1018",
     "type":"execute",
     "name":"execute RestApiCallNode Activate Vxlan Tunnel",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":2147.1669578552246,
-    "y":1480.4998979568481,
-    "z":"e7b3886.bec2e78",
+    "x":2165.9738578796387,
+    "y":1479.4229764938354,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
 
@@ -896,64 +896,64 @@
     ]
   },
   {
-    "id":"b0137d76.ad7a2",
+    "id":"3efd235d.45b6ec",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1825.6666412353516,
-    "y":1188.4995296001434,
-    "z":"e7b3886.bec2e78",
+    "x":1844.4735412597656,
+    "y":1187.4226081371307,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "e0b0e9e7.f874b8"
+        "e0432082.58761"
       ]
     ]
   },
   {
-    "id":"a03a0ce7.9531c",
+    "id":"55a28fdf.38008",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1832.6666412353516,
-    "y":1226.4995296001434,
-    "z":"e7b3886.bec2e78",
+    "x":1851.4735412597656,
+    "y":1225.4226081371307,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "fa707742.d53878"
+        "2d85c47e.12b71c"
       ]
     ]
   },
   {
-    "id":"818bf049.9d8d8",
+    "id":"726e6abc.90c824",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":1824.6666412353516,
-    "y":1268.4995296001434,
-    "z":"e7b3886.bec2e78",
+    "x":1843.4735412597656,
+    "y":1267.4226081371307,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "d591067c.05c108"
+        "e5b22324.d97fb"
       ]
     ]
   },
   {
-    "id":"e0b0e9e7.f874b8",
+    "id":"e0432082.58761",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1990.6666412353516,
-    "y":1177.4995296001434,
-    "z":"e7b3886.bec2e78",
+    "x":2009.4735412597656,
+    "y":1176.4226081371307,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
 
@@ -961,134 +961,134 @@
     ]
   },
   {
-    "id":"fa707742.d53878",
+    "id":"2d85c47e.12b71c",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":1989.6666412353516,
-    "y":1230.4995296001434,
-    "z":"e7b3886.bec2e78",
+    "x":2008.4735412597656,
+    "y":1229.4226081371307,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"d591067c.05c108",
+    "id":"e5b22324.d97fb",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":1982.6666412353516,
-    "y":1277.4995296001434,
-    "z":"e7b3886.bec2e78",
+    "x":2001.4735412597656,
+    "y":1276.4226081371307,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"4b5b64db.a6e31c",
+    "id":"ceb4bf57.f1644",
     "type":"get-resource",
     "name":"get-resource esr-thirdparty-sdnc",
     "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n",
     "comments":"",
     "outputs":1,
-    "x":1637.666763305664,
-    "y":1235.4995486736298,
-    "z":"e7b3886.bec2e78",
+    "x":1625.7044219970703,
+    "y":1226.7303733825684,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "b0137d76.ad7a2",
-        "a03a0ce7.9531c",
-        "818bf049.9d8d8"
+        "3efd235d.45b6ec",
+        "55a28fdf.38008",
+        "726e6abc.90c824"
       ]
     ]
   },
   {
-    "id":"67106fe7.87d3f",
+    "id":"143c42a.ea474bd",
     "type":"set",
     "name":"set controller data",
     "xml":"<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n\n",
     "comments":"",
-    "x":1609.1666145324707,
-    "y":1336.9995028972626,
-    "z":"e7b3886.bec2e78",
+    "x":1627.9735145568848,
+    "y":1335.9225814342499,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"e15d1e8.e713be",
+    "id":"69d4f592.3b2f0c",
     "type":"switchNode",
     "name":"switch tunnelType",
     "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1610.166416168213,
-    "y":1504.9994087219238,
-    "z":"e7b3886.bec2e78",
+    "x":1628.973316192627,
+    "y":1503.9224872589111,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "a7d6c612.d263a8",
-        "d5e95c68.c598e"
+        "871cf858.f9bdf8",
+        "4bb377eb.2cad38"
       ]
     ]
   },
   {
-    "id":"a7d6c612.d263a8",
+    "id":"871cf858.f9bdf8",
     "type":"outcomeTrue",
     "name":"L3-DCI",
     "xml":"<outcome value='L3-DCI'>\n",
     "comments":"",
     "outputs":1,
-    "x":1823.16654586792,
-    "y":1484.9994087219238,
-    "z":"e7b3886.bec2e78",
+    "x":1841.973445892334,
+    "y":1483.9224872589111,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "b9168ed9.b3a7b"
+        "f74530f5.a1018"
       ]
     ]
   },
   {
-    "id":"d5e95c68.c598e",
+    "id":"4bb377eb.2cad38",
     "type":"outcomeTrue",
     "name":"L2-DCI",
     "xml":"<outcome value='L2-DCI'>\n",
     "comments":"",
     "outputs":1,
-    "x":1821.1663665771484,
-    "y":1556.9994087219238,
-    "z":"e7b3886.bec2e78",
+    "x":1839.9732666015625,
+    "y":1555.9224872589111,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "6cf6d77.8f1d028"
+        "a57b1e86.15921"
       ]
     ]
   },
   {
-    "id":"a9738af0.3c8338",
+    "id":"278a044f.dd078c",
     "type":"set",
     "name":"set id",
     "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2543.6668815612793,
-    "y":729.9999895095825,
-    "z":"e7b3886.bec2e78",
+    "x":2562.4737815856934,
+    "y":728.9230680465698,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"6cf6d77.8f1d028",
+    "id":"a57b1e86.15921",
     "type":"execute",
     "name":"execute RestApiCallNode Activate Vxlan Tunnel",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":2141.1669120788574,
-    "y":1557.499834060669,
-    "z":"e7b3886.bec2e78",
+    "x":2159.9738121032715,
+    "y":1556.4229125976562,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
 
@@ -1096,571 +1096,571 @@
     ]
   },
   {
-    "id":"18114475.1855ec",
+    "id":"6ebb06e1.0019e8",
     "type":"outcomeTrue",
     "name":"false",
     "xml":"<outcome value='false'>\n",
     "comments":"",
     "outputs":1,
-    "x":2375.1668395996094,
-    "y":853.9999732971191,
-    "z":"e7b3886.bec2e78",
+    "x":2393.9737396240234,
+    "y":852.9230518341064,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "3f1b8826.009518"
+        "735e68ce.3cf398"
       ]
     ]
   },
   {
-    "id":"3f1b8826.009518",
+    "id":"735e68ce.3cf398",
     "type":"set",
     "name":"set description",
     "xml":"<set>\n<parameter name='prop.dci-connects.description' value='' />\n",
     "comments":"",
-    "x":2556.16690826416,
-    "y":848.9999141693115,
-    "z":"e7b3886.bec2e78",
+    "x":2574.973808288574,
+    "y":847.9229927062988,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"28eacd01.75bb82",
+    "id":"4dceded7.35703",
     "type":"block",
     "name":"block setEvpnIrts",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":2578.16641998291,
-    "y":462.5155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":2596.973320007324,
+    "y":461.4386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "bb1cdbdd.2fff28",
-        "4cd550f9.8750a"
+        "12798a95.a33a75",
+        "f44998d.4f3fe68"
       ]
     ]
   },
   {
-    "id":"bb1cdbdd.2fff28",
+    "id":"12798a95.a33a75",
     "type":"set",
     "name":"set evpn_irts",
     "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_irts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2824.16641998291,
-    "y":413.5155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":2842.973320007324,
+    "y":412.4386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"4cd550f9.8750a",
+    "id":"f44998d.4f3fe68",
     "type":"execute",
     "name":"split evpn_irts",
     "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_irts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_irts\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":2853.16641998291,
-    "y":465.5155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":2871.973320007324,
+    "y":464.4386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "599d2ef7.cc6f5",
-        "24f186e1.e961aa"
+        "e89fb3dc.f76c8",
+        "20275971.a03626"
       ]
     ]
   },
   {
-    "id":"24f186e1.e961aa",
+    "id":"20275971.a03626",
     "type":"failure",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":3070.16641998291,
-    "y":391.5155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":3088.973320007324,
+    "y":390.4386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "d3a490a1.86ec7"
+        "bd84905.a254d7"
       ]
     ]
   },
   {
-    "id":"599d2ef7.cc6f5",
+    "id":"e89fb3dc.f76c8",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":3071.16641998291,
-    "y":457.5155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":3089.973320007324,
+    "y":456.4386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "9d1496cd.6b6838"
+        "abdc6840.44d668"
       ]
     ]
   },
   {
-    "id":"9d1496cd.6b6838",
+    "id":"abdc6840.44d668",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments":"",
-    "x":3252.16641998291,
-    "y":455.5155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":3270.973320007324,
+    "y":454.4386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"be04370c.90ae38",
+    "id":"c11fadfd.a884b",
     "type":"set",
     "name":"set evpn_erts",
     "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_erts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2820.66641998291,
-    "y":556.015625,
-    "z":"e7b3886.bec2e78",
+    "x":2839.473320007324,
+    "y":554.9387035369873,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"46236baf.ee4334",
+    "id":"dc99c979.844158",
     "type":"execute",
     "name":"split evpn_erts",
     "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_erts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_erts\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":2849.66641998291,
-    "y":608.015625,
-    "z":"e7b3886.bec2e78",
+    "x":2868.473320007324,
+    "y":606.9387035369873,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "50db2b4d.65c564",
-        "3f72e979.616c26"
+        "c87ef0e2.0309f",
+        "14142012.4a22"
       ]
     ]
   },
   {
-    "id":"3f72e979.616c26",
+    "id":"14142012.4a22",
     "type":"failure",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":3066.66641998291,
-    "y":534.015625,
-    "z":"e7b3886.bec2e78",
+    "x":3085.473320007324,
+    "y":532.9387035369873,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "33c6d394.335a0c"
+        "90413362.f9c78"
       ]
     ]
   },
   {
-    "id":"50db2b4d.65c564",
+    "id":"c87ef0e2.0309f",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":3067.66641998291,
-    "y":600.015625,
-    "z":"e7b3886.bec2e78",
+    "x":3086.473320007324,
+    "y":598.9387035369873,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "dd7bbc95.f451"
+        "26998ef1.840202"
       ]
     ]
   },
   {
-    "id":"dd7bbc95.f451",
+    "id":"26998ef1.840202",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments":"",
-    "x":3248.66641998291,
-    "y":598.015625,
-    "z":"e7b3886.bec2e78",
+    "x":3267.473320007324,
+    "y":596.9387035369873,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"54d6710.aef549",
+    "id":"b28306b0.c9d2a8",
     "type":"block",
     "name":"block setEvpnErts",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":2571.6663131713867,
-    "y":518.015682220459,
-    "z":"e7b3886.bec2e78",
+    "x":2590.473213195801,
+    "y":516.9387607574463,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "be04370c.90ae38",
-        "46236baf.ee4334"
+        "c11fadfd.a884b",
+        "dc99c979.844158"
       ]
     ]
   },
   {
-    "id":"d3a490a1.86ec7",
+    "id":"bd84905.a254d7",
     "type":"for",
     "name":"for each evpn_irts",
     "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_irts_length`' >\n\n",
     "comments":"",
     "outputs":1,
-    "x":3272.6665840148926,
-    "y":391.01563453674316,
-    "z":"e7b3886.bec2e78",
+    "x":3291.4734840393066,
+    "y":389.93871307373047,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "5cb80f19.64eda"
+        "71caeb55.d3b804"
       ]
     ]
   },
   {
-    "id":"5cb80f19.64eda",
+    "id":"71caeb55.d3b804",
     "type":"set",
     "name":"set evpn_irt",
     "xml":"<set>\n<parameter name='prop.dci-connects.evpn_irts[$idx]' value='`$tmp.dci-connects.evpn_irts[$idx]`' />\n",
     "comments":"",
-    "x":3484.66707611084,
-    "y":391.0157871246338,
-    "z":"e7b3886.bec2e78",
+    "x":3503.473976135254,
+    "y":389.9388656616211,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"33c6d394.335a0c",
+    "id":"90413362.f9c78",
     "type":"for",
     "name":"for each evpn_erts",
     "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_erts_length`' >\n\n",
     "comments":"",
     "outputs":1,
-    "x":3266.16641998291,
-    "y":530.015625,
-    "z":"e7b3886.bec2e78",
+    "x":3284.973320007324,
+    "y":528.9387035369873,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "64b16cdb.c226f4"
+        "d06ccd4c.3f23a"
       ]
     ]
   },
   {
-    "id":"64b16cdb.c226f4",
+    "id":"d06ccd4c.3f23a",
     "type":"set",
     "name":"set evpn_ert",
     "xml":"<set>\n<parameter name='prop.dci-connects.evpn_erts[$idx]' value='`$tmp.dci-connects.evpn_erts[$idx]`' />\n",
     "comments":"",
-    "x":3478.1669120788574,
-    "y":530.0157775878906,
-    "z":"e7b3886.bec2e78",
+    "x":3496.9738121032715,
+    "y":528.9388561248779,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"de4c08e4.779ef8",
+    "id":"71fe8767.b40368",
     "type":"set",
     "name":"set evpn_irts",
     "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_irts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2837.16641998291,
-    "y":996.5155639648438,
-    "z":"e7b3886.bec2e78",
+    "x":2855.973320007324,
+    "y":995.438642501831,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"afa52494.436008",
+    "id":"d661df7a.c1d68",
     "type":"execute",
     "name":"split evpn_irts",
     "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_irts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_irts\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":2866.16641998291,
-    "y":1048.5155639648438,
-    "z":"e7b3886.bec2e78",
+    "x":2884.973320007324,
+    "y":1047.438642501831,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "a2faa92a.6d34c8",
-        "99a5d2ac.70d4e"
+        "f7a12052.b8c45",
+        "ab4bc48f.87e7b8"
       ]
     ]
   },
   {
-    "id":"99a5d2ac.70d4e",
+    "id":"ab4bc48f.87e7b8",
     "type":"failure",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":3083.16641998291,
-    "y":974.5155639648438,
-    "z":"e7b3886.bec2e78",
+    "x":3101.973320007324,
+    "y":973.438642501831,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "3a5f097c.aa4b76"
+        "88094f8e.ff73b"
       ]
     ]
   },
   {
-    "id":"a2faa92a.6d34c8",
+    "id":"f7a12052.b8c45",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":3084.16641998291,
-    "y":1040.5155639648438,
-    "z":"e7b3886.bec2e78",
+    "x":3102.973320007324,
+    "y":1039.438642501831,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "e3c3ecd1.1d3de"
+        "419e1dfe.6a10b4"
       ]
     ]
   },
   {
-    "id":"e3c3ecd1.1d3de",
+    "id":"419e1dfe.6a10b4",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments":"",
-    "x":3265.16641998291,
-    "y":1038.5155639648438,
-    "z":"e7b3886.bec2e78",
+    "x":3283.973320007324,
+    "y":1037.438642501831,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"4838fe79.9c15c",
+    "id":"57e91416.f44a6c",
     "type":"set",
     "name":"set evpn_erts",
     "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_erts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":2833.66641998291,
-    "y":1139.0155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":2852.473320007324,
+    "y":1137.9386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"498325c5.0baffc",
+    "id":"1ae3a00e.04c3e",
     "type":"execute",
     "name":"split evpn_erts",
     "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_erts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_erts\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":2862.66641998291,
-    "y":1191.0155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":2881.473320007324,
+    "y":1189.9386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "252779ac.34f776",
-        "c60af97c.26e9a8"
+        "cb3d8975.007e48",
+        "1d9688c3.12e9d7"
       ]
     ]
   },
   {
-    "id":"c60af97c.26e9a8",
+    "id":"1d9688c3.12e9d7",
     "type":"failure",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":3079.66641998291,
-    "y":1117.0155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":3098.473320007324,
+    "y":1115.9386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "d01a6ff.a639b9"
+        "cc51ae28.32b09"
       ]
     ]
   },
   {
-    "id":"252779ac.34f776",
+    "id":"cb3d8975.007e48",
     "type":"failure",
     "name":"failure",
     "xml":"<outcome value='failure'>\n",
     "comments":"",
     "outputs":1,
-    "x":3080.66641998291,
-    "y":1183.0155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":3099.473320007324,
+    "y":1181.9386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "99152285.4b98e"
+        "1eca56d8.ed2679"
       ]
     ]
   },
   {
-    "id":"99152285.4b98e",
+    "id":"1eca56d8.ed2679",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments":"",
-    "x":3261.66641998291,
-    "y":1181.0155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":3280.473320007324,
+    "y":1179.9386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"3a5f097c.aa4b76",
+    "id":"88094f8e.ff73b",
     "type":"for",
     "name":"for each evpn_irts",
     "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_irts_length`' >\n\n",
     "comments":"",
     "outputs":1,
-    "x":3285.6665840148926,
-    "y":974.015604019165,
-    "z":"e7b3886.bec2e78",
+    "x":3304.4734840393066,
+    "y":972.9386825561523,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "c7718a98.e04308"
+        "434a8acd.8b0244"
       ]
     ]
   },
   {
-    "id":"c7718a98.e04308",
+    "id":"434a8acd.8b0244",
     "type":"set",
     "name":"set evpn_irt",
     "xml":"<set>\n<parameter name='prop.dci-connects.evpn_irts[$idx]' value='`$tmp.dci-connects.evpn_irts[$idx]`' />\n",
     "comments":"",
-    "x":3497.66707611084,
-    "y":974.0157566070557,
-    "z":"e7b3886.bec2e78",
+    "x":3516.473976135254,
+    "y":972.938835144043,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"d01a6ff.a639b9",
+    "id":"cc51ae28.32b09",
     "type":"for",
     "name":"for each evpn_erts",
     "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_erts_length`' >\n\n",
     "comments":"",
     "outputs":1,
-    "x":3279.16641998291,
-    "y":1113.0155944824219,
-    "z":"e7b3886.bec2e78",
+    "x":3297.973320007324,
+    "y":1111.9386730194092,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "980d219f.1cb96"
+        "7209bbf1.1dd274"
       ]
     ]
   },
   {
-    "id":"980d219f.1cb96",
+    "id":"7209bbf1.1dd274",
     "type":"set",
     "name":"set evpn_ert",
     "xml":"<set>\n<parameter name='prop.dci-connects.evpn_erts[$idx]' value='`$tmp.dci-connects.evpn_erts[$idx]`' />\n",
     "comments":"",
-    "x":3491.1669120788574,
-    "y":1113.0157470703125,
-    "z":"e7b3886.bec2e78",
+    "x":3509.9738121032715,
+    "y":1111.9388256072998,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"87fc0003.1c83",
+    "id":"36bb1ad6.f67656",
     "type":"block",
     "name":"block setEvpnIrts",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":2591.16641998291,
-    "y":1045.5155639648438,
-    "z":"e7b3886.bec2e78",
+    "x":2609.973320007324,
+    "y":1044.438642501831,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "de4c08e4.779ef8",
-        "afa52494.436008"
+        "71fe8767.b40368",
+        "d661df7a.c1d68"
       ]
     ]
   },
   {
-    "id":"e1b1c41e.20d598",
+    "id":"6259b6ca.196658",
     "type":"block",
     "name":"block setEvpnErts",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":2584.6663131713867,
-    "y":1101.0156517028809,
-    "z":"e7b3886.bec2e78",
+    "x":2603.473213195801,
+    "y":1099.9387302398682,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "4838fe79.9c15c",
-        "498325c5.0baffc"
+        "57e91416.f44a6c",
+        "1ae3a00e.04c3e"
       ]
     ]
   },
   {
-    "id":"f43e6d50.f002a",
+    "id":"ff8f139d.0f616",
     "type":"comment",
     "name":"TODO",
     "info":"Get information from VFC team about the A&AI location where name to network mapping will be available.",
     "comments":"",
-    "x":2566.1666717529297,
-    "y":330.51564025878906,
-    "z":"e7b3886.bec2e78",
+    "x":2584.9735717773438,
+    "y":329.43871879577637,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"29cdd210.569a2e",
+    "id":"6bda705e.915dc",
     "type":"comment",
     "name":"TODO",
     "info":"Store activated network information in A&AI",
     "comments":"",
-    "x":722.6666641235352,
-    "y":970.0155639648438,
-    "z":"e7b3886.bec2e78",
+    "x":741.4735641479492,
+    "y":968.938642501831,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"c1da1447.655188",
+    "id":"9e24c01d.9d49c",
     "type":"comment",
     "name":"TODO",
     "info":"Get information from VFC team about teh A&AI location where name to network mapping will be available.",
     "comments":"",
-    "x":2552.66641998291,
-    "y":923.5155639648438,
-    "z":"e7b3886.bec2e78",
+    "x":2571.473320007324,
+    "y":922.438642501831,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"e2902d00.271b2",
+    "id":"9653dd40.51b31",
     "type":"execute",
     "name":"execute generate-overlay-network-id",
     "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.dci.network-id\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":1396.3333740234375,
-    "y":1581.333426475525,
-    "z":"e7b3886.bec2e78",
+    "x":1415.1402740478516,
+    "y":1580.2565050125122,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
 
@@ -1668,136 +1668,136 @@
     ]
   },
   {
-    "id":"ae44dcc.ae6882",
+    "id":"6c49ab69.21e594",
     "type":"switchNode",
     "name":"switch service-data.networks_length",
     "xml":"<switch test='`$service-data.networks.network_length`'>\n",
     "comments":"",
     "outputs":1,
-    "x":1388.3333892822266,
-    "y":1651.3334327936172,
-    "z":"e7b3886.bec2e78",
+    "x":1407.1402893066406,
+    "y":1650.2565113306046,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "6472b37e.9743dc",
-        "63aa7013.b8d94"
+        "4d11657.e59ad9c",
+        "ec09cf68.54011"
       ]
     ]
   },
   {
-    "id":"6472b37e.9743dc",
+    "id":"4d11657.e59ad9c",
     "type":"other",
     "name":"Null",
     "xml":"<outcome value=''>\n",
     "comments":"",
     "outputs":1,
-    "x":1662.1429595947266,
-    "y":1620.2858253717422,
-    "z":"e7b3886.bec2e78",
+    "x":1680.9498596191406,
+    "y":1619.2089039087296,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "4d01bada.4b4734"
+        "685d7d02.6e8fe4"
       ]
     ]
   },
   {
-    "id":"63aa7013.b8d94",
+    "id":"ec09cf68.54011",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":1657.0001373291016,
-    "y":1666.000119805336,
-    "z":"e7b3886.bec2e78",
+    "x":1675.8070373535156,
+    "y":1664.9231983423233,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "329b5d96.16d152"
+        "305d55a0.4ef32a"
       ]
     ]
   },
   {
-    "id":"4d01bada.4b4734",
+    "id":"685d7d02.6e8fe4",
     "type":"set",
     "name":"set nidx",
     "xml":"<set>\n<parameter name='nidx' value='0' />\n",
     "comments":"",
-    "x":1815.1429595947266,
-    "y":1619.8572365045547,
-    "z":"e7b3886.bec2e78",
+    "x":1833.9498596191406,
+    "y":1618.780315041542,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"329b5d96.16d152",
+    "id":"305d55a0.4ef32a",
     "type":"set",
     "name":"set nidx",
     "xml":"<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments":"",
-    "x":1816.571548461914,
-    "y":1664.857297539711,
-    "z":"e7b3886.bec2e78",
+    "x":1835.3784484863281,
+    "y":1663.7803760766983,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"54770b17.566f04",
+    "id":"c180ad49.bc28d",
     "type":"set",
     "name":"set network in service-data",
     "xml":"<set>\n<parameter name=\"service-data.networks.network[$nidx].network-id\" value='`$prop.dci.network-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n<parameter name=\"service-data.networks.network_length\" value='`$nidx+1`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n\n\n",
     "comments":"",
-    "x":1360.3333740234375,
-    "y":1723.3334350585938,
-    "z":"e7b3886.bec2e78",
+    "x":1379.1402740478516,
+    "y":1722.256513595581,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"ca9b0788.7f9838",
+    "id":"180ce8e1.cf4c47",
     "type":"block",
     "name":"block : saveNetworkData",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":1056.6666259765625,
-    "y":1562.6666259765625,
-    "z":"e7b3886.bec2e78",
+    "x":1075.4735260009766,
+    "y":1561.5897045135498,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
-        "e2902d00.271b2",
-        "ae44dcc.ae6882",
-        "54770b17.566f04",
-        "c62b5ead.36429"
+        "9653dd40.51b31",
+        "6c49ab69.21e594",
+        "c180ad49.bc28d",
+        "2148a80e.029b58"
       ]
     ]
   },
   {
-    "id":"c62b5ead.36429",
+    "id":"2148a80e.029b58",
     "type":"set",
     "name":"set networkId and network-object-path",
     "xml":"<set>\n<parameter name='networkId' value='`$prop.dci.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.dci.network-id  + '/network-data/'` \" />",
     "comments":"",
-    "x":1392.6666259765625,
-    "y":1793,
-    "z":"e7b3886.bec2e78",
+    "x":1411.4735260009766,
+    "y":1791.9230785369873,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
   },
   {
-    "id":"51ee7ac2.7dbfe4",
+    "id":"282c5c4c.028af4",
     "type":"record",
     "name":"record",
-    "xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"dci-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"dci-connects.name\"/>\n<parameter name=\"field4\" value=\"$prop.dci-connects.name\" />\n<parameter name=\"field5\" value=\"dci-connects.id\"/>\n<parameter name=\"field6\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
+    "xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"dci-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"dci-connects.name\"/>\n<parameter name=\"field4\" value=\"`$prop.dci-connects.name`\" />\n<parameter name=\"field5\" value=\"dci-connects.id\"/>\n<parameter name=\"field6\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
     "comments":"",
     "outputs":1,
-    "x":1575.0004196166992,
-    "y":1421.6667108535767,
-    "z":"e7b3886.bec2e78",
+    "x":1593.8073196411133,
+    "y":1420.589789390564,
+    "z":"14477aa.fad1e85",
     "wires":[
       [
 
@@ -1805,14 +1805,14 @@
     ]
   },
   {
-    "id":"f9e8ba1c.b0c118",
+    "id":"db894db4.d284f",
     "type":"comment",
     "name":"TODO",
     "info":"Currently activate is done without assignment, later divide in two phases.",
     "comments":"",
-    "x":1351.6666259765625,
-    "y":55.666664123535156,
-    "z":"e7b3886.bec2e78",
+    "x":1370.4735260009766,
+    "y":54.58974266052246,
+    "z":"14477aa.fad1e85",
     "wires":[
 
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json
index cfccd825..c6ec5441 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id":"148f01b9.7651be",
+    "id":"afc28ff2.d8ea9",
     "type":"dgstart",
     "name":"DGSTART",
     "outputs":1,
-    "x":127.66666412353516,
-    "y":59.666664123535156,
-    "z":"b8d6a9b7.54bca8",
+    "x":101.93510437011719,
+    "y":56,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "75389724.73d1d8"
+        "a8585fe8.5793e"
       ]
     ]
   },
   {
-    "id":"75389724.73d1d8",
+    "id":"a8585fe8.5793e",
     "type":"service-logic",
     "name":"GENERIC-RESOURCE-API ${project.version}",
     "module":"GENERIC-RESOURCE-API",
@@ -22,61 +22,61 @@
     "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":388.66666412353516,
-    "y":130.66666412353516,
-    "z":"b8d6a9b7.54bca8",
+    "x":362.9351043701172,
+    "y":127,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "c572bb07.b4aab8"
+        "94697b2b.bea8e8"
       ]
     ]
   },
   {
-    "id":"c572bb07.b4aab8",
+    "id":"94697b2b.bea8e8",
     "type":"method",
     "name":"method dci-connects-network-topology-operation-deactivate",
     "xml":"<method rpc='dci-connects-network-topology-operation-deactivate' mode='sync'>\n",
     "comments":"",
     "outputs":1,
-    "x":278.66666412353516,
-    "y":215.66666412353516,
-    "z":"b8d6a9b7.54bca8",
+    "x":252.9351043701172,
+    "y":212,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "2e7d9d36.9e8932"
+        "24e4978b.40bb18"
       ]
     ]
   },
   {
-    "id":"2e7d9d36.9e8932",
+    "id":"24e4978b.40bb18",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "outputs":1,
-    "x":613.6666793823242,
-    "y":215.66667366027832,
-    "z":"b8d6a9b7.54bca8",
+    "x":587.9351196289062,
+    "y":212.00000953674316,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "b8044390.c16c5",
-        "d126698a.8dba88",
-        "3c585b18.c1b394",
-        "17e0f0e1.f4a85f",
-        "c13afebf.e4af7"
+        "60e59d5a.4ad384",
+        "9bff20c0.b11cf",
+        "35e712db.b43fee",
+        "6edb8096.c4d1e",
+        "a782fd8c.f34ee"
       ]
     ]
   },
   {
-    "id":"b8044390.c16c5",
+    "id":"60e59d5a.4ad384",
     "type":"call",
     "name":"call GENERIC-RESOURCE-API:validate-network-input-parameters",
     "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
     "comments":"",
     "outputs":1,
-    "x":948.6666641235352,
-    "y":84.66666412353516,
-    "z":"b8d6a9b7.54bca8",
+    "x":922.9351043701172,
+    "y":81,
+    "z":"7989b353.45560c",
     "wires":[
       [
 
@@ -84,97 +84,97 @@
     ]
   },
   {
-    "id":"d126698a.8dba88",
+    "id":"9bff20c0.b11cf",
     "type":"returnSuccess",
     "name":"return success",
     "xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments":"",
-    "x":814.6666412353516,
-    "y":863.6666374206543,
-    "z":"b8d6a9b7.54bca8",
+    "x":788.9350814819336,
+    "y":859.9999732971191,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"a0179072.b0699",
+    "id":"bb4ced0c.de7b8",
     "type":"block",
     "name":"block : sendRequest",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":1010.1666946411133,
-    "y":559.1823291778564,
-    "z":"b8d6a9b7.54bca8",
+    "x":984.4351348876953,
+    "y":555.5156650543213,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "2004f909.4303c6",
-        "8f1e5d77.2d978",
-        "db4a772d.b48518",
-        "a9badb26.f8ff08"
+        "d1e4e88.126bd18",
+        "bfe084a4.ec1ca8",
+        "d78e26a8.5dd648",
+        "1f1b0399.96268c"
       ]
     ]
   },
   {
-    "id":"48d3ef18.744f9",
+    "id":"24a23dfb.9014c2",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1542.666591644287,
-    "y":356.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1516.9350318908691,
+    "y":352.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "f3e0b35b.ac7e6"
+        "4f88ee45.9763"
       ]
     ]
   },
   {
-    "id":"1f0ce6e6.d7e319",
+    "id":"e4d7297.507cad8",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1549.666591644287,
-    "y":394.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1523.9350318908691,
+    "y":390.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "25422e06.a06362"
+        "30ddc43e.1be0dc"
       ]
     ]
   },
   {
-    "id":"c9371824.9cf4a8",
+    "id":"7ed45316.3f63cc",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":1541.666591644287,
-    "y":436.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1515.9350318908691,
+    "y":432.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "caa6b2ac.fdad4"
+        "f80e7609.f66618"
       ]
     ]
   },
   {
-    "id":"f3e0b35b.ac7e6",
+    "id":"4f88ee45.9763",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1707.666591644287,
-    "y":345.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1681.9350318908691,
+    "y":341.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
       [
 
@@ -182,72 +182,72 @@
     ]
   },
   {
-    "id":"25422e06.a06362",
+    "id":"30ddc43e.1be0dc",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":1706.666591644287,
-    "y":398.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1680.9350318908691,
+    "y":394.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"caa6b2ac.fdad4",
+    "id":"f80e7609.f66618",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":1699.666591644287,
-    "y":445.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1673.9350318908691,
+    "y":441.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"2004f909.4303c6",
+    "id":"d1e4e88.126bd18",
     "type":"get-resource",
     "name":"get-resource esr-thirdparty-sdnc",
     "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n",
     "comments":"",
     "outputs":1,
-    "x":1318.6666793823242,
-    "y":403.18186211586,
-    "z":"b8d6a9b7.54bca8",
+    "x":1292.9351196289062,
+    "y":399.51519799232483,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "48d3ef18.744f9",
-        "1f0ce6e6.d7e319",
-        "c9371824.9cf4a8"
+        "24a23dfb.9014c2",
+        "e4d7297.507cad8",
+        "7ed45316.3f63cc"
       ]
     ]
   },
   {
-    "id":"8f1e5d77.2d978",
+    "id":"bfe084a4.ec1ca8",
     "type":"set",
     "name":"set controller data",
     "xml":"<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n\n",
     "comments":"",
-    "x":1290.1665306091309,
-    "y":504.6818163394928,
-    "z":"b8d6a9b7.54bca8",
+    "x":1264.434970855713,
+    "y":501.01515221595764,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"fc904692.6194d8",
+    "id":"4fcdf2bb.86953c",
     "type":"execute",
     "name":"execute RestApiCallNode De-Activate Vxlan Tunnel",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":1818.1669692993164,
-    "y":622.1822843551636,
-    "z":"b8d6a9b7.54bca8",
+    "x":1792.4354095458984,
+    "y":618.5156202316284,
+    "z":"7989b353.45560c",
     "wires":[
       [
 
@@ -255,64 +255,64 @@
     ]
   },
   {
-    "id":"db4a772d.b48518",
+    "id":"d78e26a8.5dd648",
     "type":"switchNode",
     "name":"switch tunnelType",
     "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1281.1664276123047,
-    "y":646.6817951202393,
-    "z":"b8d6a9b7.54bca8",
+    "x":1255.4348678588867,
+    "y":643.0151309967041,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "435458d3.7f7428",
-        "ac616ba.5114198"
+        "ee3b94c4.136978",
+        "935dfafd.d77e18"
       ]
     ]
   },
   {
-    "id":"435458d3.7f7428",
+    "id":"ee3b94c4.136978",
     "type":"outcomeTrue",
     "name":"L3-DCI",
     "xml":"<outcome value='L3-DCI'>\n",
     "comments":"",
     "outputs":1,
-    "x":1494.1665573120117,
-    "y":626.6817951202393,
-    "z":"b8d6a9b7.54bca8",
+    "x":1468.4349975585938,
+    "y":623.0151309967041,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "fc904692.6194d8"
+        "4fcdf2bb.86953c"
       ]
     ]
   },
   {
-    "id":"ac616ba.5114198",
+    "id":"935dfafd.d77e18",
     "type":"outcomeTrue",
     "name":"L2-DCI",
     "xml":"<outcome value='L2-DCI'>\n",
     "comments":"",
     "outputs":1,
-    "x":1492.1663780212402,
-    "y":698.6817951202393,
-    "z":"b8d6a9b7.54bca8",
+    "x":1466.4348182678223,
+    "y":695.0151309967041,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "43446998.00c4b8"
+        "b315041d.581508"
       ]
     ]
   },
   {
-    "id":"43446998.00c4b8",
+    "id":"b315041d.581508",
     "type":"execute",
     "name":"execute RestApiCallNode De-Activate Vxlan Tunnel",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments":"",
     "outputs":1,
-    "x":1812.1669235229492,
-    "y":699.1822204589844,
-    "z":"b8d6a9b7.54bca8",
+    "x":1786.4353637695312,
+    "y":695.5155563354492,
+    "z":"7989b353.45560c",
     "wires":[
       [
 
@@ -320,31 +320,31 @@
     ]
   },
   {
-    "id":"f950c622.50d2c8",
+    "id":"df0f7d7d.fb7f7",
     "type":"for",
     "name":"for each network-input-parameters",
     "xml":"<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n",
     "comments":"",
     "outputs":1,
-    "x":1072.666648864746,
-    "y":160.18229579925537,
-    "z":"b8d6a9b7.54bca8",
+    "x":1046.9350891113281,
+    "y":156.51563167572021,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "2803809e.cd6f9"
+        "d4d1f0ce.b7e74"
       ]
     ]
   },
   {
-    "id":"a9badb26.f8ff08",
+    "id":"1f1b0399.96268c",
     "type":"record",
     "name":"record",
     "xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"dci-network-topology-operation-deactivate\"/>\n<parameter name=\"field3\" value=\"dci-connects.id\" />\n<parameter name=\"field4\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field5\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field6\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
     "comments":"",
     "outputs":1,
-    "x":1255.0000305175781,
-    "y":578.6666641235352,
-    "z":"b8d6a9b7.54bca8",
+    "x":1229.2684707641602,
+    "y":575,
+    "z":"7989b353.45560c",
     "wires":[
       [
 
@@ -352,308 +352,308 @@
     ]
   },
   {
-    "id":"2803809e.cd6f9",
+    "id":"d4d1f0ce.b7e74",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1306.0000915527344,
-    "y":159.6666717529297,
-    "z":"b8d6a9b7.54bca8",
+    "x":1280.2685317993164,
+    "y":156.00000762939453,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "b059e691.786878",
-        "e3c86ec7.af8ef"
+        "36149500.01f18c",
+        "ba269191.56dc8"
       ]
     ]
   },
   {
-    "id":"b059e691.786878",
+    "id":"36149500.01f18c",
     "type":"switchNode",
     "name":"switch site1_id",
     "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1512.3333015441895,
-    "y":128.66666793823242,
-    "z":"b8d6a9b7.54bca8",
+    "x":1486.6017417907715,
+    "y":125.00000381469727,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "6b8958be.1a4d18"
+        "acfbd7a0.59b5e8"
       ]
     ]
   },
   {
-    "id":"6b8958be.1a4d18",
+    "id":"acfbd7a0.59b5e8",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1713.333396911621,
-    "y":127.6666669845581,
-    "z":"b8d6a9b7.54bca8",
+    "x":1687.6018371582031,
+    "y":124.00000286102295,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "4c747d09.9d8e34"
+        "237ecb59.1d0964"
       ]
     ]
   },
   {
-    "id":"4c747d09.9d8e34",
+    "id":"237ecb59.1d0964",
     "type":"set",
     "name":"set id",
     "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":1886.9997482299805,
-    "y":127.33321189880371,
-    "z":"b8d6a9b7.54bca8",
+    "x":1861.2681884765625,
+    "y":123.66654777526855,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"e3c86ec7.af8ef",
+    "id":"ba269191.56dc8",
     "type":"switchNode",
     "name":"switch tunnelType",
     "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1522.333381652832,
-    "y":181.6666738986969,
-    "z":"b8d6a9b7.54bca8",
+    "x":1496.601821899414,
+    "y":178.00000977516174,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "53a3a5f5.60a92c"
+        "6d15d351.7a469c"
       ]
     ]
   },
   {
-    "id":"53a3a5f5.60a92c",
+    "id":"6d15d351.7a469c",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1728.333381652832,
-    "y":181.6666738986969,
-    "z":"b8d6a9b7.54bca8",
+    "x":1702.601821899414,
+    "y":178.00000977516174,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "e41570df.a2318"
+        "330168fb.71c318"
       ]
     ]
   },
   {
-    "id":"e41570df.a2318",
+    "id":"330168fb.71c318",
     "type":"set",
     "name":"set tunnelType",
     "xml":"<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":1897.333480834961,
-    "y":181.66668915748596,
-    "z":"b8d6a9b7.54bca8",
+    "x":1871.601921081543,
+    "y":178.0000250339508,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"3c585b18.c1b394",
+    "id":"35e712db.b43fee",
     "type":"block",
     "name":"block : executeSite1",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":802,
-    "y":161.3333282470703,
-    "z":"b8d6a9b7.54bca8",
+    "x":776.268440246582,
+    "y":157.66666412353516,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "f950c622.50d2c8",
-        "a0179072.b0699"
+        "df0f7d7d.fb7f7",
+        "bb4ced0c.de7b8"
       ]
     ]
   },
   {
-    "id":"3cc5f533.01012a",
+    "id":"5b0cba4c.81dcb4",
     "type":"for",
     "name":"for each network-input-parameters",
     "xml":"<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n",
     "comments":"",
     "outputs":1,
-    "x":1077.666732788086,
-    "y":266.3332996368408,
-    "z":"b8d6a9b7.54bca8",
+    "x":1051.935173034668,
+    "y":262.66663551330566,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "38542283.614a3e"
+        "2694ce03.b776a2"
       ]
     ]
   },
   {
-    "id":"38542283.614a3e",
+    "id":"2694ce03.b776a2",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1306.000099182129,
-    "y":268.81767559051514,
-    "z":"b8d6a9b7.54bca8",
+    "x":1280.268539428711,
+    "y":265.15101146698,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "4cb30828.1cc3b8"
+        "cdac3e08.6cbf5"
       ]
     ]
   },
   {
-    "id":"4cb30828.1cc3b8",
+    "id":"cdac3e08.6cbf5",
     "type":"switchNode",
     "name":"switch site2_id",
     "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1507.0000495910645,
-    "y":268.8176612854004,
-    "z":"b8d6a9b7.54bca8",
+    "x":1481.2684898376465,
+    "y":265.15099716186523,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "dd6bc853.9b86f8"
+        "6bd0e46.d18a11c"
       ]
     ]
   },
   {
-    "id":"dd6bc853.9b86f8",
+    "id":"6bd0e46.d18a11c",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1708.000144958496,
-    "y":267.8176603317261,
-    "z":"b8d6a9b7.54bca8",
+    "x":1682.2685852050781,
+    "y":264.1509962081909,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "eabf42ba.5e4d4"
+        "aa108b27.c2a0e8"
       ]
     ]
   },
   {
-    "id":"eabf42ba.5e4d4",
+    "id":"aa108b27.c2a0e8",
     "type":"set",
     "name":"set id",
     "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":1881.6664962768555,
-    "y":267.4842052459717,
-    "z":"b8d6a9b7.54bca8",
+    "x":1855.9349365234375,
+    "y":263.8175411224365,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"17e0f0e1.f4a85f",
+    "id":"6edb8096.c4d1e",
     "type":"block",
     "name":"block : executeSite1",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":802.0000076293945,
-    "y":270.48433208465576,
-    "z":"b8d6a9b7.54bca8",
+    "x":776.2684478759766,
+    "y":266.8176679611206,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "3cc5f533.01012a",
-        "a0179072.b0699"
+        "5b0cba4c.81dcb4",
+        "bb4ced0c.de7b8"
       ]
     ]
   },
   {
-    "id":"ba49b6c1.a72218",
+    "id":"45699908.a75b98",
     "type":"set",
     "name":"set object-path",
     "xml":"<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/network-topology/'` \" />\n \n",
     "comments":"",
-    "x":1117.0039901733398,
-    "y":791.5274066925049,
-    "z":"b8d6a9b7.54bca8",
+    "x":1091.2724304199219,
+    "y":787.8607425689697,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"378e343e.0cb45c",
+    "id":"d2e9c512.6abce8",
     "type":"set",
     "name":"set networkId",
     "xml":"<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
     "comments":"",
-    "x":1111.289623260498,
-    "y":754.3845148086548,
-    "z":"b8d6a9b7.54bca8",
+    "x":1085.55806350708,
+    "y":750.7178506851196,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"c13afebf.e4af7",
+    "id":"a782fd8c.f34ee",
     "type":"block",
     "name":"block : saveNetworkData",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":854.0000610351562,
-    "y":730.3333559036255,
-    "z":"b8d6a9b7.54bca8",
+    "x":828.2685012817383,
+    "y":726.6666917800903,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "378e343e.0cb45c",
-        "ba49b6c1.a72218",
-        "44d19a8f.ba7544",
-        "e247e731.bf5fd8"
+        "d2e9c512.6abce8",
+        "45699908.a75b98",
+        "50cb404a.13f74",
+        "768af1e8.a21de"
       ]
     ]
   },
   {
-    "id":"74d41b77.b05d54",
+    "id":"d2714bfd.01d828",
     "type":"comment",
     "name":"TODO",
     "info":"Currently deactivate does deletion too, later divide in two phases.",
     "comments":"",
-    "x":736,
-    "y":23.666664123535156,
-    "z":"b8d6a9b7.54bca8",
+    "x":710.268440246582,
+    "y":20,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"44d19a8f.ba7544",
+    "id":"50cb404a.13f74",
     "type":"set",
     "name":"copy input to service-data",
     "xml":"<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n",
     "comments":"",
-    "x":1147.0000686645508,
-    "y":710.6666679382324,
-    "z":"b8d6a9b7.54bca8",
+    "x":1121.2685089111328,
+    "y":707.0000038146973,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"e247e731.bf5fd8",
+    "id":"768af1e8.a21de",
     "type":"set",
     "name":"set network-level-oper-status",
     "xml":"<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Deleted' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
     "comments":"",
-    "x":1161,
-    "y":838.6666259765625,
-    "z":"b8d6a9b7.54bca8",
+    "x":1135.268440246582,
+    "y":834.9999618530273,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.json
index 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"
       ]
     ]
   }
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index d0a402c7..59ffb6f6 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -137,7 +137,7 @@
                             <parameter name="field1" value="__TIMESTAMP__" />
                             <parameter name="field2" value="dci-network-topology-operation-activate" />
                             <parameter name="field3" value="dci-connects.name" />
-                            <parameter name="field4" value="$prop.dci-connects.name" />
+                            <parameter name="field4" value="`$prop.dci-connects.name`" />
                             <parameter name="field5" value="dci-connects.id" />
                             <parameter name="field6" value="`$prop.dci-connects.id`" />
                             <parameter name="field7" value="dci-connects.tunnelType" />
@@ -148,10 +148,10 @@
                         <switch test="`$prop.dci-connects.tunnelType`">
                             <outcome value="L3-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
@@ -159,10 +159,10 @@
                             </outcome>
                             <outcome value="L2-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
@@ -295,7 +295,7 @@
                             <parameter name="field1" value="__TIMESTAMP__" />
                             <parameter name="field2" value="dci-network-topology-operation-activate" />
                             <parameter name="field3" value="dci-connects.name" />
-                            <parameter name="field4" value="$prop.dci-connects.name" />
+                            <parameter name="field4" value="`$prop.dci-connects.name`" />
                             <parameter name="field5" value="dci-connects.id" />
                             <parameter name="field6" value="`$prop.dci-connects.id`" />
                             <parameter name="field7" value="dci-connects.tunnelType" />
@@ -306,10 +306,10 @@
                         <switch test="`$prop.dci-connects.tunnelType`">
                             <outcome value="L3-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
@@ -317,10 +317,10 @@
                             </outcome>
                             <outcome value="L2-DCI">
                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'" />
-                                    <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'" />
-                                    <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                                    <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                                     <parameter name="format" value="json" />
                                     <parameter name="httpMethod" value="post" />
                                     <parameter name="responsePrefix" value="restapi-result" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
index 3de08ffe..23f67272 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
@@ -62,9 +62,9 @@
                <switch test="`$prop.dci-connects.tunnelType`">
                   <outcome value="L3-DCI">
                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id" />
-                        <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                        <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
@@ -72,9 +72,9 @@
                   </outcome>
                   <outcome value="L2-DCI">
                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id" />
-                        <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                        <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
@@ -135,9 +135,9 @@
                <switch test="`$prop.dci-connects.tunnelType`">
                   <outcome value="L3-DCI">
                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id" />
-                        <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                        <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
@@ -145,9 +145,9 @@
                   </outcome>
                   <outcome value="L2-DCI">
                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                        <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id" />
-                        <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                        <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
+                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
                         <parameter name="format" value="json" />
                         <parameter name="httpMethod" value="delete" />
                         <parameter name="responsePrefix" value="restapi-result" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
index 11461f37..4a22bd06 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-overlay-network-input-parameters.xml
@@ -6,232 +6,276 @@
                 <block>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.name`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <set>

+                                    <parameter name="validate.dci-connects.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site1_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site1_id`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <set>

+                                    <parameter name="validate.dci-connects.site1_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site2_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site2_id`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <set>

+                                    <parameter name="validate.dci-connects.site2_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site1_networkName" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site1_networkName`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <set>

+                                    <parameter name="validate.dci-connects.site1_networkName" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site2_networkName" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site2_networkName`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <set>

+                                    <parameter name="validate.dci-connects.site2_networkName" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site1_routerId" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site1_routerId`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <set>

+                                    <parameter name="validate.dci-connects.site1_routerId" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                            </block>

+                        </outcome>

+                    </switch>

+                    <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`">

+                        <outcome value="true">

+                            <block>

+                                <set>

+                                    <parameter name="validate.dci-connects.site2_routerId" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site1_importRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site1_importRT1`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                                <set>

+                                    <parameter name="validate.dci-connects.site1_importRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site2_importRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site2_importRT1`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                                <set>

+                                    <parameter name="validate.dci-connects.site2_importRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site1_exportRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site1_exportRT1`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                                <set>

+                                    <parameter name="validate.dci-connects.site1_exportRT1" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT2'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site1_exportRT2" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site1_exportRT2`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                                <set>

+                                    <parameter name="validate.dci-connects.site1_exportRT2" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site1_vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site1_vni`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                                <set>

+                                    <parameter name="validate.dci-connects.site1_vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="validate.dci-connects.site2_vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.site2_vni`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                                <set>

+                                    <parameter name="validate.dci-connects.site2_vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                            </block>

                         </outcome>

                     </switch>

                     <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`">

                         <outcome value="true">

-                            <set>

-                                <parameter name="prop.dci-connects.tunnelType" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

-                            </set>

-                            <switch test="`$validate.dci-connects.tunnelType`">

-                                <outcome value="">

-                                    <return status="failure">

-                                        <parameter name="ack-final" value="Y" />

-                                        <parameter name="error-code" value="500" />

-                                        <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

-                                    </return>

-                                </outcome>

-                            </switch>

+                            <block>

+                                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`">

+                                    <outcome value="">

+                                        <return status="failure">

+                                            <parameter name="ack-final" value="Y" />

+                                            <parameter name="error-code" value="500" />

+                                            <parameter name="error-message" value="network-request-input.network-input-parameters.name is a required input" />

+                                        </return>

+                                    </outcome>

+                                </switch>

+                                <set>

+                                    <parameter name="prop.dci-connects.tunnelType" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />

+                                </set>

+                            </block>

                         </outcome>

                     </switch>

                 </block>

                 <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">

-                    <parameter name="$validate.dci-connects.name" value="" />

-                    <parameter name="$validate.dci-connects.site1_id" value="" />

-                    <parameter name="$validate.dci-connects.site2_id" value="" />

-                    <parameter name="$validate.dci-connects.site1_networkName" value="" />

-                    <parameter name="$validate.dci-connects.site2_networkName" value="" />

-                    <parameter name="$validate.dci-connects.site1_importRT1" value="" />

-                    <parameter name="$validate.dci-connects.site2_importRT1" value="" />

-                    <parameter name="$validate.dci-connects.site1_exportRT1" value="" />

-                    <parameter name="$validate.dci-connects.site2_exportRT1" value="" />

-                    <parameter name="$validate.dci-connects.site1_vni" value="" />

-                    <parameter name="$validate.dci-connects.site2_vni" value="" />

-                    <parameter name="$validate.dci-connects.tunnelType" value="" />

+                    <parameter name="`$validate.dci-connects.name`" value="" />

+                    <parameter name="`$validate.dci-connects.site1_id`" value="" />

+                    <parameter name="`$validate.dci-connects.site2_id`" value="" />

+                    <parameter name="`$validate.dci-connects.site1_networkName`" value="" />

+                    <parameter name="`$validate.dci-connects.site2_networkName`" value="" />

+                    <parameter name="`$validate.dci-connects.site1_importRT1`" value="" />

+                    <parameter name="`$validate.dci-connects.site2_importRT1`" value="" />

+                    <parameter name="`$validate.dci-connects.site1_exportRT1`" value="" />

+                    <parameter name="`$validate.dci-connects.site2_exportRT1`" value="" />

+                    <parameter name="`$validate.dci-connects.site1_vni`" value="" />

+                    <parameter name="`$validate.dci-connects.site2_vni`" value="" />

+                    <parameter name="`$validate.dci-connects.tunnelType`" value="" />

                 </execute>

                 <switch test="`$validate.dci-connects.tunnelType`">

                     <outcome value="L3-DCI">

                         <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="requiredParameters">

-                            <parameter name="$network-topology-operation-input.network-request-input.network-input-parameters.site1_routerId" value="" />

-                            <parameter name="$network-topology-operation-input.network-request-input.network-input-parameters.site2_routerId" value="" />

+                            <parameter name="`$network-topology-operation-input.network-request-input.network-input-parameters.site1_routerId`" value="" />

+                            <parameter name="`$network-topology-operation-input.network-request-input.network-input-parameters.site2_routerId`" value="" />

                         </execute>

                     </outcome>

                     <outcome value="L2-DCI" />