Update overlay DG for VoLTE use case

1) Replace openecomp schema with onap
2) Get import/export rts from comma separated string
3) Replace tab with space

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

Former-commit-id: 94d275c0b63b7a8d4e88303776edcbd82e681b8d

2 files changed, 890 insertions, 363 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 dbd501eb..091df632 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,80 +1,80 @@
 [
   {
-    "id":"2a040436.290c8c",
+    "id":"60145acf.ac87b4",
     "type":"dgstart",
     "name":"DGSTART",
     "outputs":1,
-    "x":153.515625,
-    "y":124.515625,
-    "z":"17ff3bf3.2a2c24",
+    "x":105.515625,
+    "y":47.99999809265137,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "8161f964.80e1c8"
+        "4cc0f1af.f25ba"
       ]
     ]
   },
   {
-    "id":"8161f964.80e1c8",
+    "id":"4cc0f1af.f25ba",
     "type":"service-logic",
     "name":"GENERIC-RESOURCE-API ${project.version}",
     "module":"GENERIC-RESOURCE-API",
     "version":"${project.version}",
     "comments":"",
-    "xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "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":370.015625,
-    "y":187.015625,
-    "z":"17ff3bf3.2a2c24",
+    "x":322.015625,
+    "y":110.49999809265137,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "30fee650.ed9d0a"
+        "27054278.56f0ce"
       ]
     ]
   },
   {
-    "id":"30fee650.ed9d0a",
+    "id":"27054278.56f0ce",
     "type":"method",
     "name":"method network-topology-operation-activate",
     "xml":"<method rpc='network-topology-operation-activate' mode='sync'>\n",
     "comments":"",
     "outputs":1,
-    "x":278.0156555175781,
-    "y":282.01560974121094,
-    "z":"17ff3bf3.2a2c24",
+    "x":230.01565551757812,
+    "y":205.4999828338623,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "20d450e0.f9c5c"
+        "17a21e32.d066f2"
       ]
     ]
   },
   {
-    "id":"20d450e0.f9c5c",
+    "id":"17a21e32.d066f2",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "outputs":1,
-    "x":575.8489685058594,
-    "y":289.8489532470703,
-    "z":"17ff3bf3.2a2c24",
+    "x":527.8489685058594,
+    "y":213.33332633972168,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "2a5bea3e.9ac986",
-        "69c54932.e08388",
-        "35413b11.2f5d34"
+        "c2ea2a39.349028",
+        "c3b857dd.cdef38",
+        "b122986c.ea3588"
       ]
     ]
   },
   {
-    "id":"69c54932.e08388",
+    "id":"c3b857dd.cdef38",
     "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":965.8489685058594,
-    "y":154.8489532470703,
-    "z":"17ff3bf3.2a2c24",
+    "x":917.8489685058594,
+    "y":78.33332633972168,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
 
@@ -82,361 +82,361 @@
     ]
   },
   {
-    "id":"896ee5a6.83b038",
+    "id":"e3e1b08f.34796",
     "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":1483.8492584228516,
-    "y":427.849014043808,
-    "z":"17ff3bf3.2a2c24",
+    "x":1435.8492584228516,
+    "y":351.33338713645935,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "af2f5aa0.9db4d8"
+        "df2d225.ad706e"
       ]
     ]
   },
   {
-    "id":"af2f5aa0.9db4d8",
+    "id":"df2d225.ad706e",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1730.8491668701172,
-    "y":425.84898352622986,
-    "z":"17ff3bf3.2a2c24",
+    "x":1682.8491668701172,
+    "y":349.3333566188812,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "c1ee07c8.a78ae8",
-        "a6b6dbe6.38ccc8",
-        "9e54353d.d1bfc8",
-        "66bffa85.510244",
-        "4785e157.899f7",
-        "663f250e.61399c",
-        "fab15712.1348c8",
-        "586d46f5.85b668",
-        "ec24e74c.17dbe8"
+        "3fc9d626.fd631a",
+        "3af822f1.512e5e",
+        "ba27957d.3af2a8",
+        "30d85a9a.81ed46",
+        "96ccbb3d.e35638",
+        "953727e3.e65d98",
+        "9f4099a7.cd6818",
+        "ecbf5185.0a283",
+        "366dfe39.460be2"
       ]
     ]
   },
   {
-    "id":"c1ee07c8.a78ae8",
+    "id":"3fc9d626.fd631a",
     "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":2217.84952545166,
-    "y":301.84910011291504,
-    "z":"17ff3bf3.2a2c24",
+    "x":2169.84952545166,
+    "y":225.3334732055664,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "327b4262.8149de"
+        "2d331fe2.47fa4"
       ]
     ]
   },
   {
-    "id":"a6b6dbe6.38ccc8",
+    "id":"3af822f1.512e5e",
     "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":2245.84952545166,
-    "y":355.8490858078003,
-    "z":"17ff3bf3.2a2c24",
+    "x":2197.84952545166,
+    "y":279.33345890045166,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "514eeef4.8a908"
+        "7f98b7b2.516698"
       ]
     ]
   },
   {
-    "id":"9e54353d.d1bfc8",
+    "id":"ba27957d.3af2a8",
     "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":2234.8493118286133,
-    "y":486.849045753479,
-    "z":"17ff3bf3.2a2c24",
+    "x":2186.8493118286133,
+    "y":410.33341884613037,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "53af1349.89045c"
+        "c0866b21.51b018"
       ]
     ]
   },
   {
-    "id":"66bffa85.510244",
+    "id":"30d85a9a.81ed46",
     "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":2243.1350479125977,
-    "y":548.1347990036011,
-    "z":"17ff3bf3.2a2c24",
+    "x":2195.1350479125977,
+    "y":471.61917209625244,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "83930cf2.7360d"
+        "403c9bfb.ba9f84"
       ]
     ]
   },
   {
-    "id":"4785e157.899f7",
+    "id":"96ccbb3d.e35638",
     "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":2244.135108947754,
-    "y":612.1347697973251,
-    "z":"17ff3bf3.2a2c24",
+    "x":2196.135108947754,
+    "y":535.6191428899765,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "534f57af.d494e8"
+        "de48d13a.91b27"
       ]
     ]
   },
   {
-    "id":"663f250e.61399c",
+    "id":"953727e3.e65d98",
     "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":2215.135078430176,
-    "y":675.134801864624,
-    "z":"17ff3bf3.2a2c24",
+    "x":2167.135078430176,
+    "y":598.6191749572754,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "c26455d8.5ef828"
+        "774440d3.26232"
       ]
     ]
   },
   {
-    "id":"327b4262.8149de",
+    "id":"2d331fe2.47fa4",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2432.84952545166,
-    "y":300.84910011291504,
-    "z":"17ff3bf3.2a2c24",
+    "x":2384.84952545166,
+    "y":224.3334732055664,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "43d13ebf.45445"
+        "61674644.1d0558"
       ]
     ]
   },
   {
-    "id":"514eeef4.8a908",
+    "id":"7f98b7b2.516698",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2443.84952545166,
-    "y":355.8490858078003,
-    "z":"17ff3bf3.2a2c24",
+    "x":2395.84952545166,
+    "y":279.33345890045166,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "a9b60a7b.f654d8"
+        "c33f05d1.922218"
       ]
     ]
   },
   {
-    "id":"53af1349.89045c",
+    "id":"c0866b21.51b018",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2439.8493118286133,
-    "y":485.849045753479,
-    "z":"17ff3bf3.2a2c24",
+    "x":2391.8493118286133,
+    "y":409.33341884613037,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "9f81d7be.b3b6e8"
+        "f941cf94.05bbe"
       ]
     ]
   },
   {
-    "id":"83930cf2.7360d",
+    "id":"403c9bfb.ba9f84",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2445.1350479125977,
-    "y":547.1347990036011,
-    "z":"17ff3bf3.2a2c24",
+    "x":2397.1350479125977,
+    "y":470.61917209625244,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-
+        "9da05058.8cf95"
       ]
     ]
   },
   {
-    "id":"534f57af.d494e8",
+    "id":"de48d13a.91b27",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2440.135108947754,
-    "y":609.1347697973251,
-    "z":"17ff3bf3.2a2c24",
+    "x":2392.135108947754,
+    "y":532.6191428899765,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-
+        "7e027125.8b2a2"
       ]
     ]
   },
   {
-    "id":"c26455d8.5ef828",
+    "id":"774440d3.26232",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2421.135078430176,
-    "y":675.134801864624,
-    "z":"17ff3bf3.2a2c24",
+    "x":2373.135078430176,
+    "y":598.6191749572754,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "8be01263.8a302"
+        "cecc8f2e.0ca25"
       ]
     ]
   },
   {
-    "id":"a9b60a7b.f654d8",
+    "id":"c33f05d1.922218",
     "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":2625.84952545166,
-    "y":348.8490858078003,
-    "z":"17ff3bf3.2a2c24",
+    "x":2577.84952545166,
+    "y":272.33345890045166,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"9f81d7be.b3b6e8",
+    "id":"f941cf94.05bbe",
     "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":2630.8495330810547,
-    "y":478.8491325378418,
-    "z":"17ff3bf3.2a2c24",
+    "x":2582.8495330810547,
+    "y":402.33350563049316,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"8be01263.8a302",
+    "id":"cecc8f2e.0ca25",
     "type":"set",
-    "name":"set l3_vni",
+    "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":2591.135078430176,
-    "y":667.134801864624,
-    "z":"17ff3bf3.2a2c24",
+    "x":2543.135078430176,
+    "y":590.6191749572754,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"2a5bea3e.9ac986",
+    "id":"c2ea2a39.349028",
     "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":798.1347961425781,
-    "y":1130.5633239746094,
-    "z":"17ff3bf3.2a2c24",
+    "x":750.1347961425781,
+    "y":1054.0476970672607,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"fab15712.1348c8",
+    "id":"9f4099a7.cd6818",
     "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":2229.0160598754883,
-    "y":243.01573181152344,
-    "z":"17ff3bf3.2a2c24",
+    "x":2181.0160598754883,
+    "y":166.5001049041748,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "5e5a3418.1941bc"
+        "2522e46d.18fb0c"
       ]
     ]
   },
   {
-    "id":"5e5a3418.1941bc",
+    "id":"2522e46d.18fb0c",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2427.0160598754883,
-    "y":243.01573181152344,
-    "z":"17ff3bf3.2a2c24",
+    "x":2379.0160598754883,
+    "y":166.5001049041748,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "5ff1b9ff.668d98"
+        "d80dda98.56d9c8"
       ]
     ]
   },
   {
-    "id":"5ff1b9ff.668d98",
+    "id":"d80dda98.56d9c8",
     "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":2609.0160598754883,
-    "y":236.01573181152344,
-    "z":"17ff3bf3.2a2c24",
+    "x":2561.0160598754883,
+    "y":159.5001049041748,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"586d46f5.85b668",
+    "id":"ecbf5185.0a283",
     "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":2252.5158462524414,
-    "y":422.0156717300415,
-    "z":"17ff3bf3.2a2c24",
+    "x":2204.5158462524414,
+    "y":345.50004482269287,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "42b0bf4c.61f81"
+        "6712cfa0.6da36"
       ]
     ]
   },
   {
-    "id":"42b0bf4c.61f81",
+    "id":"6712cfa0.6da36",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2450.5158462524414,
-    "y":422.0156717300415,
-    "z":"17ff3bf3.2a2c24",
+    "x":2402.5158462524414,
+    "y":345.50004482269287,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
 
@@ -444,317 +444,317 @@
     ]
   },
   {
-    "id":"35413b11.2f5d34",
+    "id":"b122986c.ea3588",
     "type":"block",
     "name":"block : execute",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":799.5155563354492,
-    "y":663.0156707763672,
-    "z":"17ff3bf3.2a2c24",
+    "x":751.5155563354492,
+    "y":586.5000438690186,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "44be3858.556028",
-        "82979b1a.ffa758"
+        "7b94a84.2093158",
+        "ccbd6961.d40f88"
       ]
     ]
   },
   {
-    "id":"44be3858.556028",
+    "id":"7b94a84.2093158",
     "type":"block",
     "name":"block : executeSite1",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":1092.0156173706055,
-    "y":487.5156469345093,
-    "z":"17ff3bf3.2a2c24",
+    "x":1044.0156173706055,
+    "y":411.00002002716064,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "896ee5a6.83b038",
-        "6a6dccab.683c44"
+        "e3e1b08f.34796",
+        "f33269f0.940878"
       ]
     ]
   },
   {
-    "id":"82979b1a.ffa758",
+    "id":"ccbd6961.d40f88",
     "type":"block",
     "name":"block : executeSite2",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":1109.0156631469727,
-    "y":1003.5156297683716,
-    "z":"17ff3bf3.2a2c24",
+    "x":1061.0156631469727,
+    "y":927.000002861023,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "de7fc2e1.99f1a",
-        "6a6dccab.683c44"
+        "51a93228.f2f0fc",
+        "f33269f0.940878"
       ]
     ]
   },
   {
-    "id":"77dd9b7e.75bb04",
+    "id":"5d2180aa.de0e2",
     "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":2203.515869140625,
-    "y":822.5155639648438,
-    "z":"17ff3bf3.2a2c24",
+    "x":2155.515869140625,
+    "y":745.9999370574951,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "fa545715.6bc4d8"
+        "bbb36af3.4b5978"
       ]
     ]
   },
   {
-    "id":"cbab9cb6.9af94",
+    "id":"e3115059.5fca5",
     "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":2227.5162200927734,
-    "y":881.515570640564,
-    "z":"17ff3bf3.2a2c24",
+    "x":2179.5162200927734,
+    "y":804.9999437332153,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "eca3282e.6ef838",
-        "e75e638.f112aa"
+        "b4f95f29.48041",
+        "50452acf.501864"
       ]
     ]
   },
   {
-    "id":"2b87cf93.6aebd",
+    "id":"533af772.c3eac8",
     "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":2236.515609741211,
-    "y":1077.5155363082886,
-    "z":"17ff3bf3.2a2c24",
+    "x":2188.515609741211,
+    "y":1000.9999094009399,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "5395f6bd.9d59d8"
+        "6a04a362.a162ec"
       ]
     ]
   },
   {
-    "id":"1400dc59.ed1ce4",
+    "id":"e72b1110.d4d6e",
     "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":2244.8013458251953,
-    "y":1138.8012895584106,
-    "z":"17ff3bf3.2a2c24",
+    "x":2196.8013458251953,
+    "y":1062.285662651062,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "bb1a369b.7663b8"
+        "c14e7e52.9dfca"
       ]
     ]
   },
   {
-    "id":"7f102eb1.e249d",
+    "id":"32c0b542.9e397a",
     "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":2245.8014068603516,
-    "y":1202.8012603521347,
-    "z":"17ff3bf3.2a2c24",
+    "x":2197.8014068603516,
+    "y":1126.285633444786,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "92bb4854.187448"
+        "b21aa554.501138"
       ]
     ]
   },
   {
-    "id":"e8e9faf3.7fedc8",
+    "id":"759ab28f.fe025c",
     "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":2216.8013763427734,
-    "y":1265.8012924194336,
-    "z":"17ff3bf3.2a2c24",
+    "x":2168.8013763427734,
+    "y":1189.285665512085,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "f8be59bd.a42528"
+        "f68ec5ed.0e6888"
       ]
     ]
   },
   {
-    "id":"fa545715.6bc4d8",
+    "id":"bbb36af3.4b5978",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2418.515869140625,
-    "y":821.5155639648438,
-    "z":"17ff3bf3.2a2c24",
+    "x":2370.515869140625,
+    "y":744.9999370574951,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "f8a4213a.dfd9b"
+        "3b9d92a0.561cce"
       ]
     ]
   },
   {
-    "id":"eca3282e.6ef838",
+    "id":"b4f95f29.48041",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2425.5162200927734,
-    "y":881.515570640564,
-    "z":"17ff3bf3.2a2c24",
+    "x":2377.5162200927734,
+    "y":804.9999437332153,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "52d4304f.1112c"
+        "862e157b.103688"
       ]
     ]
   },
   {
-    "id":"5395f6bd.9d59d8",
+    "id":"6a04a362.a162ec",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2441.515609741211,
-    "y":1076.5155363082886,
-    "z":"17ff3bf3.2a2c24",
+    "x":2393.515609741211,
+    "y":999.9999094009399,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "6207e038.3cb7a"
+        "6295c05a.7d32"
       ]
     ]
   },
   {
-    "id":"bb1a369b.7663b8",
+    "id":"c14e7e52.9dfca",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2446.8013458251953,
-    "y":1137.8012895584106,
-    "z":"17ff3bf3.2a2c24",
+    "x":2398.8013458251953,
+    "y":1061.285662651062,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-
+        "6bd3101.b6ac7f"
       ]
     ]
   },
   {
-    "id":"92bb4854.187448",
+    "id":"b21aa554.501138",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2441.8014068603516,
-    "y":1199.8012603521347,
-    "z":"17ff3bf3.2a2c24",
+    "x":2393.8014068603516,
+    "y":1123.285633444786,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-
+        "353fa61f.c112fa"
       ]
     ]
   },
   {
-    "id":"f8be59bd.a42528",
+    "id":"f68ec5ed.0e6888",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2422.8013763427734,
-    "y":1265.8012924194336,
-    "z":"17ff3bf3.2a2c24",
+    "x":2374.8013763427734,
+    "y":1189.285665512085,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "a6ac757.8e55c88"
+        "5f4e48ea.1a8f68"
       ]
     ]
   },
   {
-    "id":"52d4304f.1112c",
+    "id":"862e157b.103688",
     "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":2607.5162200927734,
-    "y":874.515570640564,
-    "z":"17ff3bf3.2a2c24",
+    "x":2559.5162200927734,
+    "y":797.9999437332153,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"6207e038.3cb7a",
+    "id":"6295c05a.7d32",
     "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":2632.5158309936523,
-    "y":1069.5156230926514,
-    "z":"17ff3bf3.2a2c24",
+    "x":2584.5158309936523,
+    "y":992.9999961853027,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"a6ac757.8e55c88",
+    "id":"5f4e48ea.1a8f68",
     "type":"set",
-    "name":"set l3_vni",
+    "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":2592.8013763427734,
-    "y":1257.8012924194336,
-    "z":"17ff3bf3.2a2c24",
+    "x":2544.8013763427734,
+    "y":1181.285665512085,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"8a2a845c.c20518",
+    "id":"32050113.af315e",
     "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":2254.182144165039,
-    "y":1012.6821622848511,
-    "z":"17ff3bf3.2a2c24",
+    "x":2206.182144165039,
+    "y":936.1665353775024,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "cba705fe.7fbd68"
+        "ad14e7c.2778e18"
       ]
     ]
   },
   {
-    "id":"cba705fe.7fbd68",
+    "id":"ad14e7c.2778e18",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2452.182144165039,
-    "y":1012.6821622848511,
-    "z":"17ff3bf3.2a2c24",
+    "x":2404.182144165039,
+    "y":936.1665353775024,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
 
@@ -762,131 +762,131 @@
     ]
   },
   {
-    "id":"7621d3f.20db72c",
+    "id":"4a12c766.428fe8",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1722.5153198242188,
-    "y":944.5155217647552,
-    "z":"17ff3bf3.2a2c24",
+    "x":1674.5153198242188,
+    "y":867.9998948574066,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "77dd9b7e.75bb04",
-        "cbab9cb6.9af94",
-        "2b87cf93.6aebd",
-        "1400dc59.ed1ce4",
-        "7f102eb1.e249d",
-        "e8e9faf3.7fedc8",
-        "8a2a845c.c20518"
+        "5d2180aa.de0e2",
+        "e3115059.5fca5",
+        "533af772.c3eac8",
+        "e72b1110.d4d6e",
+        "32c0b542.9e397a",
+        "759ab28f.fe025c",
+        "32050113.af315e"
       ]
     ]
   },
   {
-    "id":"de7fc2e1.99f1a",
+    "id":"51a93228.f2f0fc",
     "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":1475.5154113769531,
-    "y":946.5155522823334,
-    "z":"17ff3bf3.2a2c24",
+    "x":1427.5154113769531,
+    "y":869.9999253749847,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "7621d3f.20db72c"
+        "4a12c766.428fe8"
       ]
     ]
   },
   {
-    "id":"43d13ebf.45445",
+    "id":"61674644.1d0558",
     "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":2614.5159072875977,
-    "y":294.5156497955322,
-    "z":"17ff3bf3.2a2c24",
+    "x":2566.5159072875977,
+    "y":218.0000228881836,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"ec24e74c.17dbe8",
+    "id":"366dfe39.460be2",
     "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":2234.015625,
-    "y":744.5155639648438,
-    "z":"17ff3bf3.2a2c24",
+    "x":2186.015625,
+    "y":667.9999370574951,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "12f5c8b9.553a97"
+        "8e0c82ca.7fa6"
       ]
     ]
   },
   {
-    "id":"12f5c8b9.553a97",
+    "id":"8e0c82ca.7fa6",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":2440.015625,
-    "y":744.5155639648438,
-    "z":"17ff3bf3.2a2c24",
+    "x":2392.015625,
+    "y":667.9999370574951,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "ea283679.45ebf8"
+        "731815b1.9879ac"
       ]
     ]
   },
   {
-    "id":"ea283679.45ebf8",
+    "id":"731815b1.9879ac",
     "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":2610.015625,
-    "y":736.5155639648438,
-    "z":"17ff3bf3.2a2c24",
+    "x":2562.015625,
+    "y":659.9999370574951,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"6a6dccab.683c44",
+    "id":"f33269f0.940878",
     "type":"block",
     "name":"block : sendRequest",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":1388.0156440734863,
-    "y":1504.0155696868896,
-    "z":"17ff3bf3.2a2c24",
+    "x":1340.0156440734863,
+    "y":1427.499942779541,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "689b1559.c8e0ac",
-        "6b04340b.667f8c",
-        "e59ef441.ec3b38"
+        "8a66fbcb.3a6538",
+        "a01675f7.06ee28",
+        "49f34f09.e59ea"
       ]
     ]
   },
   {
-    "id":"dc085795.91fbb8",
+    "id":"8f288c1f.2ee81",
     "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",
     "comments":"",
     "outputs":1,
-    "x":2196.0159187316895,
-    "y":1567.0155248641968,
-    "z":"17ff3bf3.2a2c24",
+    "x":2148.0159187316895,
+    "y":1490.4998979568481,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
 
@@ -894,64 +894,64 @@
     ]
   },
   {
-    "id":"ff1f7cdd.1de74",
+    "id":"d32d9795.7e3d68",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1881.5154113769531,
-    "y":1356.0150890350342,
-    "z":"17ff3bf3.2a2c24",
+    "x":1833.5154113769531,
+    "y":1279.4994621276855,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "8fb0b02d.400ca"
+        "2e0abdec.6b6a72"
       ]
     ]
   },
   {
-    "id":"2e24b7ed.4af348",
+    "id":"37a4ea9c.c89576",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1888.5154113769531,
-    "y":1394.0150890350342,
-    "z":"17ff3bf3.2a2c24",
+    "x":1840.5154113769531,
+    "y":1317.4994621276855,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "eabc77a3.4c68d8"
+        "b76645eb.106e38"
       ]
     ]
   },
   {
-    "id":"d482f537.fd1128",
+    "id":"6bb7a3cb.5c930c",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":1880.5154113769531,
-    "y":1436.0150890350342,
-    "z":"17ff3bf3.2a2c24",
+    "x":1832.5154113769531,
+    "y":1359.4994621276855,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "2834746.db4418c"
+        "db6ca063.b0c74"
       ]
     ]
   },
   {
-    "id":"8fb0b02d.400ca",
+    "id":"2e0abdec.6b6a72",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":2046.5154113769531,
-    "y":1345.0150890350342,
-    "z":"17ff3bf3.2a2c24",
+    "x":1998.5154113769531,
+    "y":1268.4994621276855,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
 
@@ -959,134 +959,134 @@
     ]
   },
   {
-    "id":"eabc77a3.4c68d8",
+    "id":"b76645eb.106e38",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":2045.5154113769531,
-    "y":1398.0150890350342,
-    "z":"17ff3bf3.2a2c24",
+    "x":1997.5154113769531,
+    "y":1321.4994621276855,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"2834746.db4418c",
+    "id":"db6ca063.b0c74",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":2038.5154113769531,
-    "y":1445.0150890350342,
-    "z":"17ff3bf3.2a2c24",
+    "x":1990.5154113769531,
+    "y":1368.4994621276855,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"689b1559.c8e0ac",
+    "id":"8a66fbcb.3a6538",
     "type":"get-resource",
     "name":"get-resource dci-connects",
     "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":1693.5155334472656,
-    "y":1403.0151081085205,
-    "z":"17ff3bf3.2a2c24",
+    "x":1645.5155334472656,
+    "y":1326.4994812011719,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "ff1f7cdd.1de74",
-        "2e24b7ed.4af348",
-        "d482f537.fd1128"
+        "d32d9795.7e3d68",
+        "37a4ea9c.c89576",
+        "6bb7a3cb.5c930c"
       ]
     ]
   },
   {
-    "id":"6b04340b.667f8c",
+    "id":"a01675f7.06ee28",
     "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":1665.0153846740723,
-    "y":1504.5150623321533,
-    "z":"17ff3bf3.2a2c24",
+    "x":1617.0153846740723,
+    "y":1427.9994354248047,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"e59ef441.ec3b38",
+    "id":"49f34f09.e59ea",
     "type":"switchNode",
     "name":"switch tunnelType",
     "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1659.0153770446777,
-    "y":1591.5150356292725,
-    "z":"17ff3bf3.2a2c24",
+    "x":1611.0153770446777,
+    "y":1514.9994087219238,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "c8be8edd.1a0fe",
-        "22e73278.5a70de"
+        "72c21633.697888",
+        "bc6148.3fa8ceb8"
       ]
     ]
   },
   {
-    "id":"c8be8edd.1a0fe",
+    "id":"72c21633.697888",
     "type":"outcomeTrue",
     "name":"L3-DCI",
     "xml":"<outcome value='L3-DCI'>\n",
     "comments":"",
     "outputs":1,
-    "x":1872.0155067443848,
-    "y":1571.5150356292725,
-    "z":"17ff3bf3.2a2c24",
+    "x":1824.0155067443848,
+    "y":1494.9994087219238,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "dc085795.91fbb8"
+        "8f288c1f.2ee81"
       ]
     ]
   },
   {
-    "id":"22e73278.5a70de",
+    "id":"bc6148.3fa8ceb8",
     "type":"outcomeTrue",
     "name":"L2-DCI",
     "xml":"<outcome value='L2-DCI'>\n",
     "comments":"",
     "outputs":1,
-    "x":1870.0153274536133,
-    "y":1643.5150356292725,
-    "z":"17ff3bf3.2a2c24",
+    "x":1822.0153274536133,
+    "y":1566.9994087219238,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "73fa04bd.92094c"
+        "18b936e.7133ac9"
       ]
     ]
   },
   {
-    "id":"f8a4213a.dfd9b",
+    "id":"3b9d92a0.561cce",
     "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":2592.515842437744,
-    "y":816.5156164169312,
-    "z":"17ff3bf3.2a2c24",
+    "x":2544.515842437744,
+    "y":739.9999895095825,
+    "z":"21bf7e0.d63c382",
     "wires":[
 
     ]
   },
   {
-    "id":"73fa04bd.92094c",
+    "id":"18b936e.7133ac9",
     "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",
     "comments":"",
     "outputs":1,
-    "x":2190.0158729553223,
-    "y":1644.0154609680176,
-    "z":"17ff3bf3.2a2c24",
+    "x":2142.0158729553223,
+    "y":1567.499834060669,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
 
@@ -1094,30 +1094,557 @@
     ]
   },
   {
-    "id":"e75e638.f112aa",
+    "id":"50452acf.501864",
     "type":"outcomeTrue",
     "name":"false",
     "xml":"<outcome value='false'>\n",
     "comments":"",
     "outputs":1,
-    "x":2424.015800476074,
-    "y":940.5156002044678,
-    "z":"17ff3bf3.2a2c24",
+    "x":2376.015800476074,
+    "y":863.9999732971191,
+    "z":"21bf7e0.d63c382",
     "wires":[
       [
-        "f56ef97.bc2ee08"
+        "558a5beb.808c64"
       ]
     ]
   },
   {
-    "id":"f56ef97.bc2ee08",
+    "id":"558a5beb.808c64",
     "type":"set",
     "name":"set description",
     "xml":"<set>\n<parameter name='prop.dci-connects.description' value='' />\n",
     "comments":"",
-    "x":2605.015869140625,
-    "y":935.5155410766602,
-    "z":"17ff3bf3.2a2c24",
+    "x":2557.015869140625,
+    "y":858.9999141693115,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"9da05058.8cf95",
+    "type":"block",
+    "name":"block setEvpnIrts",
+    "xml":"<block atomic=\"true\">\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":2579.015380859375,
+    "y":472.5155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "f59be47.2245a18",
+        "6fceca00.0b0b48"
+      ]
+    ]
+  },
+  {
+    "id":"f59be47.2245a18",
+    "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":2825.015380859375,
+    "y":423.5155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"6fceca00.0b0b48",
+    "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":2854.015380859375,
+    "y":475.5155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "8ac2a412.2bc7d8",
+        "f06f6320.a3ba5"
+      ]
+    ]
+  },
+  {
+    "id":"f06f6320.a3ba5",
+    "type":"failure",
+    "name":"success",
+    "xml":"<outcome value='success'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":3071.015380859375,
+    "y":401.5155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "a6b39033.8c77c"
+      ]
+    ]
+  },
+  {
+    "id":"8ac2a412.2bc7d8",
+    "type":"failure",
+    "name":"failure",
+    "xml":"<outcome value='failure'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":3072.015380859375,
+    "y":467.5155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "d4181347.bc95d"
+      ]
+    ]
+  },
+  {
+    "id":"d4181347.bc95d",
+    "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":3253.015380859375,
+    "y":465.5155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"d183f400.b7c7a8",
+    "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":2821.515380859375,
+    "y":566.015625,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"862ad334.4820a",
+    "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":2850.515380859375,
+    "y":618.015625,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "c7841794.4a1558",
+        "96021a8.e493ee8"
+      ]
+    ]
+  },
+  {
+    "id":"96021a8.e493ee8",
+    "type":"failure",
+    "name":"success",
+    "xml":"<outcome value='success'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":3067.515380859375,
+    "y":544.015625,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "767a44c9.83ddec"
+      ]
+    ]
+  },
+  {
+    "id":"c7841794.4a1558",
+    "type":"failure",
+    "name":"failure",
+    "xml":"<outcome value='failure'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":3068.515380859375,
+    "y":610.015625,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "f4c642e1.daf09"
+      ]
+    ]
+  },
+  {
+    "id":"f4c642e1.daf09",
+    "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":3249.515380859375,
+    "y":608.015625,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"7e027125.8b2a2",
+    "type":"block",
+    "name":"block setEvpnErts",
+    "xml":"<block atomic=\"true\">\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":2572.5152740478516,
+    "y":528.015682220459,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "d183f400.b7c7a8",
+        "862ad334.4820a"
+      ]
+    ]
+  },
+  {
+    "id":"a6b39033.8c77c",
+    "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":3273.5155448913574,
+    "y":401.01563453674316,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "7a255963.a19a48"
+      ]
+    ]
+  },
+  {
+    "id":"7a255963.a19a48",
+    "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":3485.5160369873047,
+    "y":401.0157871246338,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"767a44c9.83ddec",
+    "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":3267.015380859375,
+    "y":540.015625,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "ad045a9b.36e458"
+      ]
+    ]
+  },
+  {
+    "id":"ad045a9b.36e458",
+    "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":3479.0158729553223,
+    "y":540.0157775878906,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"e67e9dd7.989e2",
+    "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":2838.015380859375,
+    "y":1006.5155639648438,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"e44ee888.917218",
+    "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":2867.015380859375,
+    "y":1058.5155639648438,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "b3fb0522.2e1138",
+        "2f16c983.f313c6"
+      ]
+    ]
+  },
+  {
+    "id":"2f16c983.f313c6",
+    "type":"failure",
+    "name":"success",
+    "xml":"<outcome value='success'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":3084.015380859375,
+    "y":984.5155639648438,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "79319086.b2f45"
+      ]
+    ]
+  },
+  {
+    "id":"b3fb0522.2e1138",
+    "type":"failure",
+    "name":"failure",
+    "xml":"<outcome value='failure'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":3085.015380859375,
+    "y":1050.5155639648438,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "3e085d66.84c402"
+      ]
+    ]
+  },
+  {
+    "id":"3e085d66.84c402",
+    "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":3266.015380859375,
+    "y":1048.5155639648438,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"bfc1728b.da05d",
+    "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":2834.515380859375,
+    "y":1149.0155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"72d8e223.d0b3fc",
+    "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":2863.515380859375,
+    "y":1201.0155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "3bac7268.6214de",
+        "1921e77b.b9d069"
+      ]
+    ]
+  },
+  {
+    "id":"1921e77b.b9d069",
+    "type":"failure",
+    "name":"success",
+    "xml":"<outcome value='success'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":3080.515380859375,
+    "y":1127.0155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "596b6eff.51d1d"
+      ]
+    ]
+  },
+  {
+    "id":"3bac7268.6214de",
+    "type":"failure",
+    "name":"failure",
+    "xml":"<outcome value='failure'>\n",
+    "comments":"",
+    "outputs":1,
+    "x":3081.515380859375,
+    "y":1193.0155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "a3151092.f6bfe"
+      ]
+    ]
+  },
+  {
+    "id":"a3151092.f6bfe",
+    "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":3262.515380859375,
+    "y":1191.0155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"79319086.b2f45",
+    "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":3286.5155448913574,
+    "y":984.015604019165,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "4e2f2b2d.1c3bc4"
+      ]
+    ]
+  },
+  {
+    "id":"4e2f2b2d.1c3bc4",
+    "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":3498.5160369873047,
+    "y":984.0157566070557,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"596b6eff.51d1d",
+    "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":3280.015380859375,
+    "y":1123.0155944824219,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "e02fb530.a62c28"
+      ]
+    ]
+  },
+  {
+    "id":"e02fb530.a62c28",
+    "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":3492.0158729553223,
+    "y":1123.0157470703125,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"6bd3101.b6ac7f",
+    "type":"block",
+    "name":"block setEvpnIrts",
+    "xml":"<block atomic=\"true\">\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":2592.015380859375,
+    "y":1055.5155639648438,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "e67e9dd7.989e2",
+        "e44ee888.917218"
+      ]
+    ]
+  },
+  {
+    "id":"353fa61f.c112fa",
+    "type":"block",
+    "name":"block setEvpnErts",
+    "xml":"<block atomic=\"true\">\n",
+    "atomic":"false",
+    "comments":"",
+    "outputs":1,
+    "x":2585.5152740478516,
+    "y":1111.0156517028809,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+      [
+        "bfc1728b.da05d",
+        "72d8e223.d0b3fc"
+      ]
+    ]
+  },
+  {
+    "id":"f8d5754b.bd5668",
+    "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":2567.0156326293945,
+    "y":340.51564025878906,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"6f5c1ca1.701f84",
+    "type":"comment",
+    "name":"TODO",
+    "info":"Store activated network information in A&AI",
+    "comments":"",
+    "x":723.515625,
+    "y":980.0155639648438,
+    "z":"21bf7e0.d63c382",
+    "wires":[
+
+    ]
+  },
+  {
+    "id":"30786a9a.007f16",
+    "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":2553.515380859375,
+    "y":933.5155639648438,
+    "z":"21bf7e0.d63c382",
     "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 7ebf552e..02bab6d6 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
@@ -81,7 +81,7 @@
     "module":"GENERIC-RESOURCE-API",
     "version":"${project.version}",
     "comments":"",
-    "xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "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,