Fix for overlay DGs.

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

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

Former-commit-id: 0f1278b2a69a5c0ab0acd2693111d56577ed0d90

1 files changed, 584 insertions, 584 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":[
 
     ]