Merge "Add VoLTE json templates"

Former-commit-id: a0e999bbbcab86b401d5cf0c41be7c64e0718fa4

14 files changed, 2673 insertions, 2028 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 635773b0..5bbee453 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": "c1f029b8.a1e58",
+    "id": "efadabab.b5cb18",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 102,
-    "y": 62,
-    "z": "e441b8db.02f6b8",
+    "x": 161.03125,
+    "y": 58.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "ef85c5fd.ef823"
+        "ba4efe38.fe52f"
       ]
     ]
   },
   {
-    "id": "ef85c5fd.ef823",
+    "id": "ba4efe38.fe52f",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,2106 +22,2193 @@
     "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": 318.5,
-    "y": 124.5,
-    "z": "e441b8db.02f6b8",
+    "x": 377.53125,
+    "y": 120.53125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "515c9604.c78fc8"
+        "7f023f5f.1b1c1"
       ]
     ]
   },
   {
-    "id": "515c9604.c78fc8",
+    "id": "7f023f5f.1b1c1",
     "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": 226.50003051757812,
-    "y": 219.49998474121094,
-    "z": "e441b8db.02f6b8",
+    "x": 285.5312805175781,
+    "y": 215.53123474121094,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "6260ef3c.117e18"
+        "e1d5d7b9.ae02f8"
       ]
     ]
   },
   {
-    "id": "6260ef3c.117e18",
+    "id": "e1d5d7b9.ae02f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 524.3333435058594,
-    "y": 227.3333282470703,
-    "z": "e441b8db.02f6b8",
+    "x": 583.3645935058594,
+    "y": 223.3645782470703,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "9c5e659e.5a8468",
-        "14efaf2d.582f39",
-        "e96c5239.cc3f4",
-        "edee7e9.f5684",
-        "c1d82a9d.7debd"
+        "66ae34bb.465bdc",
+        "f39d0958.e0ee98",
+        "9338de7d.f59b5",
+        "80e65684.a81798",
+        "44b13ee0.f42ab"
       ]
     ]
   },
   {
-    "id": "14efaf2d.582f39",
+    "id": "f39d0958.e0ee98",
     "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": 914.3333435058594,
-    "y": 92.33332824707031,
-    "z": "e441b8db.02f6b8",
+    "x": 973.3645935058594,
+    "y": 88.36457824707031,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       []
     ]
   },
   {
-    "id": "11728db1.0b1f22",
+    "id": "605eaf8f.084d",
     "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": 1432.3336334228516,
-    "y": 365.333389043808,
-    "z": "e441b8db.02f6b8",
+    "x": 1491.3648834228516,
+    "y": 361.364639043808,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "62d2a561.8055cc"
+        "bfa446d7.0384a8"
       ]
     ]
   },
   {
-    "id": "62d2a561.8055cc",
+    "id": "bfa446d7.0384a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1679.3335418701172,
-    "y": 363.33335852622986,
-    "z": "e441b8db.02f6b8",
+    "x": 1738.3647918701172,
+    "y": 359.36460852622986,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "bb31f713.0d193",
-        "c9b81c0f.b35a2",
-        "972db21e.7bfc",
-        "d4313d46.0ad918",
-        "4fee8f3d.149ad",
-        "5a1f2e0e.d48708",
-        "c19cf751.1eed5",
-        "132409b3.4b71ee",
-        "cd65a796.961288"
+        "2241976d.6a72e8",
+        "923aebd8.9492b8",
+        "2f701681.5a3f2a",
+        "7ed4d1f2.e0fb2",
+        "c165c87.d2de838",
+        "9f9caa1e.b9ba18",
+        "fd1390eb.db4fe",
+        "dc38e2a3.7cbf5",
+        "6fbbb836.ada618"
       ]
     ]
   },
   {
-    "id": "bb31f713.0d193",
+    "id": "2241976d.6a72e8",
     "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": 2166.33390045166,
-    "y": 239.33347511291504,
-    "z": "e441b8db.02f6b8",
+    "x": 2225.36515045166,
+    "y": 235.36472511291504,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "a76462ff.b835d8"
+        "78ea1224.bc5bac"
       ]
     ]
   },
   {
-    "id": "c9b81c0f.b35a2",
+    "id": "923aebd8.9492b8",
     "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": 2194.33390045166,
-    "y": 293.3334608078003,
-    "z": "e441b8db.02f6b8",
+    "x": 2253.36515045166,
+    "y": 289.3647108078003,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "57a46fca.b19958"
+        "3eb5f34b.fabb6c"
       ]
     ]
   },
   {
-    "id": "972db21e.7bfc",
+    "id": "2f701681.5a3f2a",
     "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": 2183.3336868286133,
-    "y": 424.333420753479,
-    "z": "e441b8db.02f6b8",
+    "x": 2242.3649368286133,
+    "y": 420.364670753479,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "30ca3831.cb43e8"
+        "db1938c9.795a18"
       ]
     ]
   },
   {
-    "id": "d4313d46.0ad918",
+    "id": "7ed4d1f2.e0fb2",
     "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": 2191.6194229125977,
-    "y": 485.6191740036011,
-    "z": "e441b8db.02f6b8",
+    "x": 2250.6506729125977,
+    "y": 481.6504240036011,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "b3e5d4ae.a3dda"
+        "666446e9.c89ea8"
       ]
     ]
   },
   {
-    "id": "4fee8f3d.149ad",
+    "id": "c165c87.d2de838",
     "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": 2192.619483947754,
-    "y": 549.6191447973251,
-    "z": "e441b8db.02f6b8",
+    "x": 2251.650733947754,
+    "y": 545.6503947973251,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "8c2ed6a8.d98208"
+        "16c5b91c.f31b17"
       ]
     ]
   },
   {
-    "id": "5a1f2e0e.d48708",
+    "id": "9f9caa1e.b9ba18",
     "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": 2163.619453430176,
-    "y": 612.619176864624,
-    "z": "e441b8db.02f6b8",
+    "x": 2222.650703430176,
+    "y": 608.650426864624,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "b1cfec26.3ec6b"
+        "918dfdc3.aa336"
       ]
     ]
   },
   {
-    "id": "a76462ff.b835d8",
+    "id": "78ea1224.bc5bac",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2381.33390045166,
-    "y": 238.33347511291504,
-    "z": "e441b8db.02f6b8",
+    "x": 2440.36515045166,
+    "y": 234.36472511291504,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "c92e65bb.5b6848"
+        "4bf931c1.dd806"
       ]
     ]
   },
   {
-    "id": "57a46fca.b19958",
+    "id": "3eb5f34b.fabb6c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2392.33390045166,
-    "y": 293.3334608078003,
-    "z": "e441b8db.02f6b8",
+    "x": 2451.36515045166,
+    "y": 289.3647108078003,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "f358b487.1305d8"
+        "55b0ea54.6a4d14"
       ]
     ]
   },
   {
-    "id": "30ca3831.cb43e8",
+    "id": "db1938c9.795a18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2388.3336868286133,
-    "y": 423.333420753479,
-    "z": "e441b8db.02f6b8",
+    "x": 2447.3649368286133,
+    "y": 419.364670753479,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "508f3269.7b7274"
+        "874dab5.61e2258"
       ]
     ]
   },
   {
-    "id": "b3e5d4ae.a3dda",
+    "id": "666446e9.c89ea8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2393.6194229125977,
-    "y": 484.6191740036011,
-    "z": "e441b8db.02f6b8",
+    "x": 2452.6506729125977,
+    "y": 480.6504240036011,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "b0552f88.544ae8"
+        "3adcbd29.e08a92"
       ]
     ]
   },
   {
-    "id": "8c2ed6a8.d98208",
+    "id": "16c5b91c.f31b17",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2388.619483947754,
-    "y": 546.6191447973251,
-    "z": "e441b8db.02f6b8",
+    "x": 2447.650733947754,
+    "y": 542.6503947973251,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "caf135a5.75dfb"
+        "4c2a55f8.8427bc"
       ]
     ]
   },
   {
-    "id": "b1cfec26.3ec6b",
+    "id": "918dfdc3.aa336",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2369.619453430176,
-    "y": 612.619176864624,
-    "z": "e441b8db.02f6b8",
+    "x": 2428.650703430176,
+    "y": 608.650426864624,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "9fed6f8d.3cc17"
+        "18742d4d.86f243"
       ]
     ]
   },
   {
-    "id": "f358b487.1305d8",
+    "id": "55b0ea54.6a4d14",
     "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": 2574.33390045166,
-    "y": 286.3334608078003,
-    "z": "e441b8db.02f6b8",
+    "x": 2633.36515045166,
+    "y": 282.3647108078003,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "508f3269.7b7274",
+    "id": "874dab5.61e2258",
     "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": 2579.3339080810547,
-    "y": 416.3335075378418,
-    "z": "e441b8db.02f6b8",
+    "x": 2638.3651580810547,
+    "y": 412.3647575378418,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "9fed6f8d.3cc17",
+    "id": "18742d4d.86f243",
     "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": 2539.619453430176,
-    "y": 604.619176864624,
-    "z": "e441b8db.02f6b8",
+    "x": 2598.650703430176,
+    "y": 600.650426864624,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "9c5e659e.5a8468",
+    "id": "66ae34bb.465bdc",
     "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": 747.6191711425781,
-    "y": 1190.0477294921875,
-    "z": "e441b8db.02f6b8",
+    "x": 806.6504211425781,
+    "y": 1186.0789794921875,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "c19cf751.1eed5",
+    "id": "fd1390eb.db4fe",
     "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": 2177.5004348754883,
-    "y": 180.50010681152344,
-    "z": "e441b8db.02f6b8",
+    "x": 2236.5316848754883,
+    "y": 176.53135681152344,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "d75f53ba.27ad98"
+        "c0671fb5.a1596"
       ]
     ]
   },
   {
-    "id": "d75f53ba.27ad98",
+    "id": "c0671fb5.a1596",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2375.5004348754883,
-    "y": 180.50010681152344,
-    "z": "e441b8db.02f6b8",
+    "x": 2434.5316848754883,
+    "y": 176.53135681152344,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "be2d314a.29948"
+        "4df90ce2.99e144"
       ]
     ]
   },
   {
-    "id": "be2d314a.29948",
+    "id": "4df90ce2.99e144",
     "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": 2557.5004348754883,
-    "y": 173.50010681152344,
-    "z": "e441b8db.02f6b8",
+    "x": 2616.5316848754883,
+    "y": 169.53135681152344,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "132409b3.4b71ee",
+    "id": "dc38e2a3.7cbf5",
     "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": 2201.0002212524414,
-    "y": 359.5000467300415,
-    "z": "e441b8db.02f6b8",
+    "x": 2260.0314712524414,
+    "y": 355.5312967300415,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "b22fe3e2.4a61a"
+        "b00f6243.0a48"
       ]
     ]
   },
   {
-    "id": "b22fe3e2.4a61a",
+    "id": "b00f6243.0a48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2399.0002212524414,
-    "y": 359.5000467300415,
-    "z": "e441b8db.02f6b8",
+    "x": 2458.0314712524414,
+    "y": 355.5312967300415,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "6eecda19.439af4"
+        "2e41bbcc.a6d6e4"
       ]
     ]
   },
   {
-    "id": "e96c5239.cc3f4",
+    "id": "9338de7d.f59b5",
     "type": "block",
     "name": "block : execute",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 747.9999313354492,
-    "y": 600.5000457763672,
-    "z": "e441b8db.02f6b8",
+    "x": 807.0311813354492,
+    "y": 596.5312957763672,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "284e1b18.dbac04",
-        "550986c4.f40138",
-        "861b73d2.7c3dc"
+        "c6f41a63.9856e8",
+        "e91af8d8.1aa348",
+        "d35fd906.7c7fe8"
       ]
     ]
   },
   {
-    "id": "284e1b18.dbac04",
+    "id": "c6f41a63.9856e8",
     "type": "block",
     "name": "block : executeSite1",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1040.4999923706055,
-    "y": 425.0000219345093,
-    "z": "e441b8db.02f6b8",
+    "x": 1099.5312423706055,
+    "y": 421.0312719345093,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "11728db1.0b1f22",
-        "82851975.f9c43"
+        "605eaf8f.084d",
+        "5df4287.26506d8"
       ]
     ]
   },
   {
-    "id": "550986c4.f40138",
+    "id": "e91af8d8.1aa348",
     "type": "block",
     "name": "block : executeSite2",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1057.5000381469727,
-    "y": 941.0000047683716,
-    "z": "e441b8db.02f6b8",
+    "x": 1116.5312881469727,
+    "y": 937.0312547683716,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "ef1d071a.3ba078",
-        "82851975.f9c43"
+        "ba12a388.ca536",
+        "5df4287.26506d8"
       ]
     ]
   },
   {
-    "id": "d7d72f5f.7a7ce",
+    "id": "4ba9c3e9.e8390c",
     "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": 2152.000244140625,
-    "y": 759.9999389648438,
-    "z": "e441b8db.02f6b8",
+    "x": 2211.031494140625,
+    "y": 756.0311889648438,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "d63e1652.f569d"
+        "4d059d56.ac7354"
       ]
     ]
   },
   {
-    "id": "dec2ce36.a7d0b8",
+    "id": "a5aeb648.cbf968",
     "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": 2176.0005950927734,
-    "y": 818.999945640564,
-    "z": "e441b8db.02f6b8",
+    "x": 2235.0318450927734,
+    "y": 815.031195640564,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "1dec5f83.486278",
-        "2b5e6af5.fa1be6"
+        "44b5c7cb.6c0ad8",
+        "f5c82290.f1663"
       ]
     ]
   },
   {
-    "id": "98740756.5a0698",
+    "id": "1b41b68d.54ece9",
     "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": 2184.999984741211,
-    "y": 1014.9999113082886,
-    "z": "e441b8db.02f6b8",
+    "x": 2244.031234741211,
+    "y": 1011.0311613082886,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "526a88c5.c1e6f"
+        "126609cf.3fa496"
       ]
     ]
   },
   {
-    "id": "cf346f91.adf2b8",
+    "id": "1ea9ba64.03cfe6",
     "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": 2193.2857208251953,
-    "y": 1076.2856645584106,
-    "z": "e441b8db.02f6b8",
+    "x": 2252.3169708251953,
+    "y": 1072.3169145584106,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "fa93b7e1.ca525"
+        "f302ebc3.5b2b08"
       ]
     ]
   },
   {
-    "id": "ef96aea9.bb52b8",
+    "id": "f446799d.52ab98",
     "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": 2194.2857818603516,
-    "y": 1140.2856353521347,
-    "z": "e441b8db.02f6b8",
+    "x": 2253.3170318603516,
+    "y": 1136.3168853521347,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "3dfa7241.2277c6"
+        "760fe723.f862b8"
       ]
     ]
   },
   {
-    "id": "38b0bb00.7d39e6",
+    "id": "12876faf.c9b22",
     "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": 2165.2857513427734,
-    "y": 1203.2856674194336,
-    "z": "e441b8db.02f6b8",
+    "x": 2224.3170013427734,
+    "y": 1199.3169174194336,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "4f915472.693e64"
+        "9ec06044.5ffa5"
       ]
     ]
   },
   {
-    "id": "d63e1652.f569d",
+    "id": "4d059d56.ac7354",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2367.000244140625,
-    "y": 758.9999389648438,
-    "z": "e441b8db.02f6b8",
+    "x": 2426.031494140625,
+    "y": 755.0311889648438,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "fa875aed.c34ac"
+        "59ffa97c.5c0fc8"
       ]
     ]
   },
   {
-    "id": "1dec5f83.486278",
+    "id": "44b5c7cb.6c0ad8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2374.0005950927734,
-    "y": 818.999945640564,
-    "z": "e441b8db.02f6b8",
+    "x": 2433.0318450927734,
+    "y": 815.031195640564,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "33fd7326.698864"
+        "bc8f84e7.1a2c38"
       ]
     ]
   },
   {
-    "id": "526a88c5.c1e6f",
+    "id": "126609cf.3fa496",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2389.999984741211,
-    "y": 1013.9999113082886,
-    "z": "e441b8db.02f6b8",
+    "x": 2449.031234741211,
+    "y": 1010.0311613082886,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "d17959a.97f2aa8"
+        "9984a813.340fe8"
       ]
     ]
   },
   {
-    "id": "fa93b7e1.ca525",
+    "id": "f302ebc3.5b2b08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2395.2857208251953,
-    "y": 1075.2856645584106,
-    "z": "e441b8db.02f6b8",
+    "x": 2454.3169708251953,
+    "y": 1071.3169145584106,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "5dc95384.4ed664"
+        "76d6f69c.e0f7a8"
       ]
     ]
   },
   {
-    "id": "3dfa7241.2277c6",
+    "id": "760fe723.f862b8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2390.2857818603516,
-    "y": 1137.2856353521347,
-    "z": "e441b8db.02f6b8",
+    "x": 2449.3170318603516,
+    "y": 1133.3168853521347,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "c2766476.fb709"
+        "fe22f97a.e156b8"
       ]
     ]
   },
   {
-    "id": "4f915472.693e64",
+    "id": "9ec06044.5ffa5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2371.2857513427734,
-    "y": 1203.2856674194336,
-    "z": "e441b8db.02f6b8",
+    "x": 2430.3170013427734,
+    "y": 1199.3169174194336,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "6837898c.7c5d88"
+        "cab29ddd.d3511"
       ]
     ]
   },
   {
-    "id": "33fd7326.698864",
+    "id": "bc8f84e7.1a2c38",
     "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": 2556.0005950927734,
-    "y": 811.999945640564,
-    "z": "e441b8db.02f6b8",
+    "x": 2615.0318450927734,
+    "y": 808.031195640564,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "d17959a.97f2aa8",
+    "id": "9984a813.340fe8",
     "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": 2581.0002059936523,
-    "y": 1006.9999980926514,
-    "z": "e441b8db.02f6b8",
+    "x": 2640.0314559936523,
+    "y": 1003.0312480926514,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "6837898c.7c5d88",
+    "id": "cab29ddd.d3511",
     "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": 2541.2857513427734,
-    "y": 1195.2856674194336,
-    "z": "e441b8db.02f6b8",
+    "x": 2600.3170013427734,
+    "y": 1191.3169174194336,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "70524c4e.0bccac",
+    "id": "da831bc2.b61118",
     "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": 2202.666519165039,
-    "y": 950.1665372848511,
-    "z": "e441b8db.02f6b8",
+    "x": 2261.697769165039,
+    "y": 946.1977872848511,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "4079fe10.73712"
+        "1a29ba09.a33016"
       ]
     ]
   },
   {
-    "id": "4079fe10.73712",
+    "id": "1a29ba09.a33016",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2400.666519165039,
-    "y": 950.1665372848511,
-    "z": "e441b8db.02f6b8",
+    "x": 2459.697769165039,
+    "y": 946.1977872848511,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "b289aa17.d6ea6"
+        "38aff846.dc0b98"
       ]
     ]
   },
   {
-    "id": "280833fe.9bdbb4",
+    "id": "f9349a4.bd78768",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1670.9996948242188,
-    "y": 881.9998967647552,
-    "z": "e441b8db.02f6b8",
+    "x": 1730.0309448242188,
+    "y": 878.0311467647552,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "d7d72f5f.7a7ce",
-        "dec2ce36.a7d0b8",
-        "98740756.5a0698",
-        "cf346f91.adf2b8",
-        "ef96aea9.bb52b8",
-        "38b0bb00.7d39e6",
-        "70524c4e.0bccac"
+        "4ba9c3e9.e8390c",
+        "a5aeb648.cbf968",
+        "1b41b68d.54ece9",
+        "1ea9ba64.03cfe6",
+        "f446799d.52ab98",
+        "12876faf.c9b22",
+        "da831bc2.b61118"
       ]
     ]
   },
   {
-    "id": "ef1d071a.3ba078",
+    "id": "ba12a388.ca536",
     "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": 1423.9997863769531,
-    "y": 883.9999272823334,
-    "z": "e441b8db.02f6b8",
+    "x": 1483.0310363769531,
+    "y": 880.0311772823334,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "280833fe.9bdbb4"
+        "f9349a4.bd78768"
       ]
     ]
   },
   {
-    "id": "c92e65bb.5b6848",
+    "id": "4bf931c1.dd806",
     "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": 2563.0002822875977,
-    "y": 232.00002479553223,
-    "z": "e441b8db.02f6b8",
+    "x": 2622.0315322875977,
+    "y": 228.03127479553223,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "cd65a796.961288",
+    "id": "6fbbb836.ada618",
     "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": 2182.5,
-    "y": 681.9999389648438,
-    "z": "e441b8db.02f6b8",
+    "x": 2241.53125,
+    "y": 678.0311889648438,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "1fce8229.b61736"
+        "c5018b38.b82348"
       ]
     ]
   },
   {
-    "id": "1fce8229.b61736",
+    "id": "c5018b38.b82348",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2388.5,
-    "y": 681.9999389648438,
-    "z": "e441b8db.02f6b8",
+    "x": 2447.53125,
+    "y": 678.0311889648438,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "868e249c.157cd8"
+        "85645a4.a9bb1a8"
       ]
     ]
   },
   {
-    "id": "868e249c.157cd8",
+    "id": "85645a4.a9bb1a8",
     "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": 2558.5,
-    "y": 673.9999389648438,
-    "z": "e441b8db.02f6b8",
+    "x": 2617.53125,
+    "y": 670.0311889648438,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "82851975.f9c43",
+    "id": "5df4287.26506d8",
     "type": "block",
     "name": "block : sendRequest",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1336.5000190734863,
-    "y": 1441.4999446868896,
-    "z": "e441b8db.02f6b8",
+    "x": 1395.5312690734863,
+    "y": 1437.5311946868896,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "2e5b4bbb.d3f49c",
-        "cc5ac5d8.cd6108",
-        "fdf840a9.0444e8"
+        "1dccb94.bd57b47",
+        "5d6b118.552a3f",
+        "2eb443d1.da3d7c",
+        "6c39ea0c.ba0e9c",
+        "1fbe5a07.98eb36"
       ]
     ]
   },
   {
-    "id": "a91c0c9d.68d8d8",
+    "id": "37fa897c.a998d6",
     "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.templateDir +'/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.restapi.templateDir +'/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 2144.5002937316895,
-    "y": 1504.4998998641968,
-    "z": "e441b8db.02f6b8",
+    "x": 2203.5315437316895,
+    "y": 1500.5311498641968,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       []
     ]
   },
   {
-    "id": "dc2e27d2.f3149",
+    "id": "a2886d1e.1475a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1822.9999771118164,
-    "y": 1212.499531507492,
-    "z": "e441b8db.02f6b8",
+    "x": 1882.0312271118164,
+    "y": 1208.530781507492,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "7ff9492b.841e"
+        "59fbb9bc.1fe2b8"
       ]
     ]
   },
   {
-    "id": "ac70e961.9619e8",
+    "id": "4cc401c7.12563",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1829.9999771118164,
-    "y": 1250.499531507492,
-    "z": "e441b8db.02f6b8",
+    "x": 1889.0312271118164,
+    "y": 1246.530781507492,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "eb823b4e.91d25"
+        "fa41b944.ad53d8"
       ]
     ]
   },
   {
-    "id": "ca05e8cb.5f4ec",
+    "id": "499333c.6e6f8cc",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1821.9999771118164,
-    "y": 1292.499531507492,
-    "z": "e441b8db.02f6b8",
+    "x": 1881.0312271118164,
+    "y": 1288.530781507492,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "85a36612.a37bb8"
+        "30de8b8b.248734"
       ]
     ]
   },
   {
-    "id": "eb823b4e.91d25",
+    "id": "fa41b944.ad53d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1986.9999771118164,
-    "y": 1254.499531507492,
-    "z": "e441b8db.02f6b8",
+    "x": 2046.0312271118164,
+    "y": 1250.530781507492,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "85a36612.a37bb8",
+    "id": "30de8b8b.248734",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1979.9999771118164,
-    "y": 1301.499531507492,
-    "z": "e441b8db.02f6b8",
+    "x": 2039.0312271118164,
+    "y": 1297.530781507492,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "fdf840a9.0444e8",
+    "id": "2eb443d1.da3d7c",
     "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": 1604.230857849121,
-    "y": 1251.8072967529297,
-    "z": "e441b8db.02f6b8",
+    "x": 1663.262107849121,
+    "y": 1247.8385467529297,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "dc2e27d2.f3149",
-        "ac70e961.9619e8",
-        "ca05e8cb.5f4ec"
+        "a2886d1e.1475a",
+        "4cc401c7.12563",
+        "499333c.6e6f8cc"
       ]
     ]
   },
   {
-    "id": "7ff9492b.841e",
+    "id": "59fbb9bc.1fe2b8",
     "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.esr-system-info[0].service-url`\" />\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.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n",
     "comments": "",
-    "x": 1997.4999084472656,
-    "y": 1208.99951171875,
-    "z": "e441b8db.02f6b8",
+    "x": 2056.5311584472656,
+    "y": 1205.03076171875,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "2e5b4bbb.d3f49c",
+    "id": "1dccb94.bd57b47",
     "type": "switchNode",
     "name": "switch tunnelType",
     "xml": "<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1607.4997520446777,
-    "y": 1528.9994106292725,
-    "z": "e441b8db.02f6b8",
+    "x": 1666.5310020446777,
+    "y": 1525.0306606292725,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "3befe90d.b29476",
-        "aa631529.b7acf8"
+        "71cfd469.6c1bec",
+        "86e8360c.b36588"
       ]
     ]
   },
   {
-    "id": "3befe90d.b29476",
+    "id": "71cfd469.6c1bec",
     "type": "outcomeTrue",
     "name": "L3-DCI",
     "xml": "<outcome value='L3-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1820.4998817443848,
-    "y": 1508.9994106292725,
-    "z": "e441b8db.02f6b8",
+    "x": 1879.5311317443848,
+    "y": 1505.0306606292725,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "a91c0c9d.68d8d8"
+        "37fa897c.a998d6"
       ]
     ]
   },
   {
-    "id": "aa631529.b7acf8",
+    "id": "86e8360c.b36588",
     "type": "outcomeTrue",
     "name": "L2-DCI",
     "xml": "<outcome value='L2-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1818.4997024536133,
-    "y": 1580.9994106292725,
-    "z": "e441b8db.02f6b8",
+    "x": 1877.5309524536133,
+    "y": 1577.0306606292725,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "acdaaf2d.3fa418"
+        "888b7367.eced7"
       ]
     ]
   },
   {
-    "id": "fa875aed.c34ac",
+    "id": "59ffa97c.5c0fc8",
     "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": 2541.000217437744,
-    "y": 753.9999914169312,
-    "z": "e441b8db.02f6b8",
+    "x": 2600.031467437744,
+    "y": 750.0312414169312,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "acdaaf2d.3fa418",
+    "id": "888b7367.eced7",
     "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.templateDir +'/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.restapi.templateDir +'/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 2138.5002479553223,
-    "y": 1581.4998359680176,
-    "z": "e441b8db.02f6b8",
+    "x": 2197.5314979553223,
+    "y": 1577.5310859680176,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       []
     ]
   },
   {
-    "id": "2b5e6af5.fa1be6",
+    "id": "f5c82290.f1663",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2372.500175476074,
-    "y": 877.9999752044678,
-    "z": "e441b8db.02f6b8",
+    "x": 2431.531425476074,
+    "y": 874.0312252044678,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "57bbffac.8097a"
+        "cbfd35c2.bfcb88"
       ]
     ]
   },
   {
-    "id": "57bbffac.8097a",
+    "id": "cbfd35c2.bfcb88",
     "type": "set",
     "name": "set description",
     "xml": "<set>\n<parameter name='prop.dci-connects.description' value='' />\n",
     "comments": "",
-    "x": 2553.500244140625,
-    "y": 872.9999160766602,
-    "z": "e441b8db.02f6b8",
+    "x": 2612.531494140625,
+    "y": 869.0311660766602,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "b0552f88.544ae8",
+    "id": "3adcbd29.e08a92",
     "type": "block",
     "name": "block setEvpnIrts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2575.499755859375,
-    "y": 486.5155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 2634.531005859375,
+    "y": 482.5468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "a0835968.abab58",
-        "29e92f82.7e48a"
+        "ee0c28f8.e4d418",
+        "e8a5d988.95c218"
       ]
     ]
   },
   {
-    "id": "a0835968.abab58",
+    "id": "ee0c28f8.e4d418",
     "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": 2821.499755859375,
-    "y": 437.5155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 2880.531005859375,
+    "y": 433.5468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "29e92f82.7e48a",
+    "id": "e8a5d988.95c218",
     "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": 2850.499755859375,
-    "y": 489.5155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 2909.531005859375,
+    "y": 485.5468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "8e45a14f.6987e8",
-        "7d8c23d3.29c044"
+        "d28f896c.05d5c8",
+        "14de53a9.69951c"
       ]
     ]
   },
   {
-    "id": "7d8c23d3.29c044",
+    "id": "14de53a9.69951c",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3067.499755859375,
-    "y": 415.5155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 3126.531005859375,
+    "y": 411.5468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "c173e280.2c1e9"
+        "2beb253e.7afdaa"
       ]
     ]
   },
   {
-    "id": "8e45a14f.6987e8",
+    "id": "d28f896c.05d5c8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3068.499755859375,
-    "y": 481.5155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 3127.531005859375,
+    "y": 477.5468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "3e58258.775a2da"
+        "75111897.c6e698"
       ]
     ]
   },
   {
-    "id": "3e58258.775a2da",
+    "id": "75111897.c6e698",
     "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.499755859375,
-    "y": 479.5155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 3308.531005859375,
+    "y": 475.5468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "beca6511.f65ce8",
+    "id": "cc14d3d6.a8bb8",
     "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": 2817.999755859375,
-    "y": 580.0156269073486,
-    "z": "e441b8db.02f6b8",
+    "x": 2877.031005859375,
+    "y": 576.0468769073486,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "5c8c8ec.d68a17",
+    "id": "456385de.3c8bcc",
     "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": 2846.999755859375,
-    "y": 632.0156269073486,
-    "z": "e441b8db.02f6b8",
+    "x": 2906.031005859375,
+    "y": 628.0468769073486,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "f785906c.f11148",
-        "cf6bfe81.a42eb"
+        "7302b848.08c648",
+        "5fdfc909.24b298"
       ]
     ]
   },
   {
-    "id": "cf6bfe81.a42eb",
+    "id": "5fdfc909.24b298",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3063.999755859375,
-    "y": 558.0156269073486,
-    "z": "e441b8db.02f6b8",
+    "x": 3123.031005859375,
+    "y": 554.0468769073486,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "22c92a4e.65d95e"
+        "a89b655a.a9acf8"
       ]
     ]
   },
   {
-    "id": "f785906c.f11148",
+    "id": "7302b848.08c648",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3064.999755859375,
-    "y": 624.0156269073486,
-    "z": "e441b8db.02f6b8",
+    "x": 3124.031005859375,
+    "y": 620.0468769073486,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "e7b8be46.c3f6f8"
+        "c1a75157.1fffe"
       ]
     ]
   },
   {
-    "id": "e7b8be46.c3f6f8",
+    "id": "c1a75157.1fffe",
     "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": 3245.999755859375,
-    "y": 622.0156269073486,
-    "z": "e441b8db.02f6b8",
+    "x": 3305.031005859375,
+    "y": 618.0468769073486,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "caf135a5.75dfb",
+    "id": "4c2a55f8.8427bc",
     "type": "block",
     "name": "block setEvpnErts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2568.9996490478516,
-    "y": 542.0156841278076,
-    "z": "e441b8db.02f6b8",
+    "x": 2628.0308990478516,
+    "y": 538.0469341278076,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "beca6511.f65ce8",
-        "5c8c8ec.d68a17"
+        "cc14d3d6.a8bb8",
+        "456385de.3c8bcc"
       ]
     ]
   },
   {
-    "id": "c173e280.2c1e9",
+    "id": "2beb253e.7afdaa",
     "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": 3269.9999198913574,
-    "y": 415.0156364440918,
-    "z": "e441b8db.02f6b8",
+    "x": 3329.0311698913574,
+    "y": 411.0468864440918,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "a51d665a.022ac"
+        "7f5427c6.ab6078"
       ]
     ]
   },
   {
-    "id": "a51d665a.022ac",
+    "id": "7f5427c6.ab6078",
     "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": 3482.0004119873047,
-    "y": 415.0157890319824,
-    "z": "e441b8db.02f6b8",
+    "x": 3541.0316619873047,
+    "y": 411.0470390319824,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "22c92a4e.65d95e",
+    "id": "a89b655a.a9acf8",
     "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": 3263.499755859375,
-    "y": 554.0156269073486,
-    "z": "e441b8db.02f6b8",
+    "x": 3322.531005859375,
+    "y": 550.0468769073486,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "aa48125e.46af68"
+        "26d12fff.9c7b4"
       ]
     ]
   },
   {
-    "id": "aa48125e.46af68",
+    "id": "26d12fff.9c7b4",
     "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": 3475.5002479553223,
-    "y": 554.0157794952393,
-    "z": "e441b8db.02f6b8",
+    "x": 3534.5314979553223,
+    "y": 550.0470294952393,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "df48b455.f78358",
+    "id": "232c8152.10922e",
     "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": 2834.499755859375,
-    "y": 1020.5155658721924,
-    "z": "e441b8db.02f6b8",
+    "x": 2893.531005859375,
+    "y": 1016.5468158721924,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "4671089c.4065d",
+    "id": "60735ad6.75f224",
     "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": 2863.499755859375,
-    "y": 1072.5155658721924,
-    "z": "e441b8db.02f6b8",
+    "x": 2922.531005859375,
+    "y": 1068.5468158721924,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "c07a8fe4.eee06",
-        "b25e01c2.b4c498"
+        "9de0af26.c612a",
+        "f23e522f.721f"
       ]
     ]
   },
   {
-    "id": "b25e01c2.b4c498",
+    "id": "f23e522f.721f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3080.499755859375,
-    "y": 998.5155658721924,
-    "z": "e441b8db.02f6b8",
+    "x": 3139.531005859375,
+    "y": 994.5468158721924,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "fd6137f0.99036"
+        "3e0e3570.15512a"
       ]
     ]
   },
   {
-    "id": "c07a8fe4.eee06",
+    "id": "9de0af26.c612a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3081.499755859375,
-    "y": 1064.5155658721924,
-    "z": "e441b8db.02f6b8",
+    "x": 3140.531005859375,
+    "y": 1060.5468158721924,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "ae803047.be9f4"
+        "7bec3155.0aa5"
       ]
     ]
   },
   {
-    "id": "ae803047.be9f4",
+    "id": "7bec3155.0aa5",
     "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.499755859375,
-    "y": 1062.5155658721924,
-    "z": "e441b8db.02f6b8",
+    "x": 3321.531005859375,
+    "y": 1058.5468158721924,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "dca9a5fc.c2dd7",
+    "id": "2d50095d.e93056",
     "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": 2830.999755859375,
-    "y": 1163.0155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 2890.031005859375,
+    "y": 1159.0468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "d09c4d61.8c28a8",
+    "id": "5512a241.93c69c",
     "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": 2859.999755859375,
-    "y": 1215.0155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 2919.031005859375,
+    "y": 1211.0468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "16d5f80f.face6",
-        "d6e6a1c9.8aba28"
+        "2406f85.66f9d08",
+        "5ea7c0a.461a54"
       ]
     ]
   },
   {
-    "id": "d6e6a1c9.8aba28",
+    "id": "5ea7c0a.461a54",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3076.999755859375,
-    "y": 1141.0155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 3136.031005859375,
+    "y": 1137.0468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "1e8c72ef.2dadbd"
+        "29bb0627.190dea"
       ]
     ]
   },
   {
-    "id": "16d5f80f.face6",
+    "id": "2406f85.66f9d08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3077.999755859375,
-    "y": 1207.0155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 3137.031005859375,
+    "y": 1203.0468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "a59e780.8734808"
+        "f9b95a01.7c2878"
       ]
     ]
   },
   {
-    "id": "a59e780.8734808",
+    "id": "f9b95a01.7c2878",
     "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": 3258.999755859375,
-    "y": 1205.0155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 3318.031005859375,
+    "y": 1201.0468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "fd6137f0.99036",
+    "id": "3e0e3570.15512a",
     "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": 3282.9999198913574,
-    "y": 998.0156059265137,
-    "z": "e441b8db.02f6b8",
+    "x": 3342.0311698913574,
+    "y": 994.0468559265137,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "3366154b.09f69a"
+        "9a59b84a.ecec98"
       ]
     ]
   },
   {
-    "id": "3366154b.09f69a",
+    "id": "9a59b84a.ecec98",
     "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": 3495.0004119873047,
-    "y": 998.0157585144043,
-    "z": "e441b8db.02f6b8",
+    "x": 3554.0316619873047,
+    "y": 994.0470085144043,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "1e8c72ef.2dadbd",
+    "id": "29bb0627.190dea",
     "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": 3276.499755859375,
-    "y": 1137.0155963897705,
-    "z": "e441b8db.02f6b8",
+    "x": 3335.531005859375,
+    "y": 1133.0468463897705,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "83278032.925b58"
+        "d32d9c80.701b4"
       ]
     ]
   },
   {
-    "id": "83278032.925b58",
+    "id": "d32d9c80.701b4",
     "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": 3488.5002479553223,
-    "y": 1137.0157489776611,
-    "z": "e441b8db.02f6b8",
+    "x": 3547.5314979553223,
+    "y": 1133.0469989776611,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "5dc95384.4ed664",
+    "id": "76d6f69c.e0f7a8",
     "type": "block",
     "name": "block setEvpnIrts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2588.499755859375,
-    "y": 1069.5155658721924,
-    "z": "e441b8db.02f6b8",
+    "x": 2647.531005859375,
+    "y": 1065.5468158721924,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "df48b455.f78358",
-        "4671089c.4065d"
+        "232c8152.10922e",
+        "60735ad6.75f224"
       ]
     ]
   },
   {
-    "id": "c2766476.fb709",
+    "id": "fe22f97a.e156b8",
     "type": "block",
     "name": "block setEvpnErts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2581.9996490478516,
-    "y": 1125.0156536102295,
-    "z": "e441b8db.02f6b8",
+    "x": 2641.0308990478516,
+    "y": 1121.0469036102295,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "dca9a5fc.c2dd7",
-        "d09c4d61.8c28a8"
+        "2d50095d.e93056",
+        "5512a241.93c69c"
       ]
     ]
   },
   {
-    "id": "a8dbfcec.d67fe8",
+    "id": "cb8f4f81.03f6",
     "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": 1393.6667098999023,
-    "y": 1605.3334283828735,
-    "z": "e441b8db.02f6b8",
+    "x": 1452.6979598999023,
+    "y": 1601.3646783828735,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       []
     ]
   },
   {
-    "id": "c861a6a.2bad4d8",
+    "id": "b671a31f.ca73a",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1385.6667251586914,
-    "y": 1675.3334347009659,
-    "z": "e441b8db.02f6b8",
+    "x": 1444.6979751586914,
+    "y": 1671.3646847009659,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "ec47d113.88981",
-        "a4b7938c.8397d8"
+        "ac48e882.8e5458",
+        "bc7b8c68.e23fc"
       ]
     ]
   },
   {
-    "id": "ec47d113.88981",
+    "id": "ac48e882.8e5458",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1659.4762954711914,
-    "y": 1644.2858272790909,
-    "z": "e441b8db.02f6b8",
+    "x": 1718.5075454711914,
+    "y": 1640.3170772790909,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "1ffb3be3.659b34"
+        "e844e350.99df9"
       ]
     ]
   },
   {
-    "id": "a4b7938c.8397d8",
+    "id": "bc7b8c68.e23fc",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1654.3334732055664,
-    "y": 1690.0001217126846,
-    "z": "e441b8db.02f6b8",
+    "x": 1713.3647232055664,
+    "y": 1686.0313717126846,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "b8b2072e.0d1078"
+        "1eb190aa.78173f"
       ]
     ]
   },
   {
-    "id": "1ffb3be3.659b34",
+    "id": "e844e350.99df9",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1812.4762954711914,
-    "y": 1643.8572384119034,
-    "z": "e441b8db.02f6b8",
+    "x": 1871.5075454711914,
+    "y": 1639.8884884119034,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "b8b2072e.0d1078",
+    "id": "1eb190aa.78173f",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1813.904884338379,
-    "y": 1688.8572994470596,
-    "z": "e441b8db.02f6b8",
+    "x": 1872.936134338379,
+    "y": 1684.8885494470596,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "a90e8a48.4fa9a8",
+    "id": "55222dc2.e57ec4",
     "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": 1357.6667098999023,
-    "y": 1747.3334369659424,
-    "z": "e441b8db.02f6b8",
+    "x": 1416.6979598999023,
+    "y": 1743.3646869659424,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "861b73d2.7c3dc",
+    "id": "d35fd906.7c7fe8",
     "type": "block",
     "name": "block : saveNetworkData",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1053.9999618530273,
-    "y": 1586.6666278839111,
-    "z": "e441b8db.02f6b8",
+    "x": 1113.0312118530273,
+    "y": 1582.6978778839111,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "a8dbfcec.d67fe8",
-        "c861a6a.2bad4d8",
-        "a90e8a48.4fa9a8",
-        "b943b7ea.3454d"
+        "cb8f4f81.03f6",
+        "b671a31f.ca73a",
+        "55222dc2.e57ec4",
+        "a89a8da5.fdcdb"
       ]
     ]
   },
   {
-    "id": "b943b7ea.3454d",
+    "id": "a89a8da5.fdcdb",
     "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": 1389.9999618530273,
-    "y": 1817.0000019073486,
-    "z": "e441b8db.02f6b8",
+    "x": 1449.0312118530273,
+    "y": 1813.0312519073486,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "cc5ac5d8.cd6108",
+    "id": "5d6b118.552a3f",
     "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`\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1572.333755493164,
-    "y": 1445.6667127609253,
-    "z": "e441b8db.02f6b8",
+    "x": 1622.364990234375,
+    "y": 1392.697998046875,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       []
     ]
   },
   {
-    "id": "7460e970.19e46",
+    "id": "228b648e.7d106c",
     "type": "comment",
     "name": "TODO",
     "info": "Currently activate is done without assignment, later divide in two phases.",
     "comments": "",
-    "x": 1348.9999618530273,
-    "y": 79.66666603088379,
-    "z": "e441b8db.02f6b8",
+    "x": 1408.0312118530273,
+    "y": 75.69791603088379,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "b289aa17.d6ea6",
+    "id": "38aff846.dc0b98",
     "type": "block",
     "name": "block setLocalNetworks",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2571.500030517578,
-    "y": 949,
-    "z": "e441b8db.02f6b8",
+    "x": 2630.531280517578,
+    "y": 945.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "f627cda3.14a76",
-        "25c7d846.4b2ee8"
+        "d37b497d.93d8f8",
+        "d298e6ac.258b68"
       ]
     ]
   },
   {
-    "id": "f627cda3.14a76",
+    "id": "d37b497d.93d8f8",
     "type": "set",
     "name": "set local_networks",
     "xml": "<set>\n<parameter name='tmp.dci-connects.local_networks.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2774.500030517578,
-    "y": 884,
-    "z": "e441b8db.02f6b8",
+    "x": 2833.531280517578,
+    "y": 880.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "25c7d846.4b2ee8",
+    "id": "d298e6ac.258b68",
     "type": "execute",
     "name": "split local_networks",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.local_networks.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.local_networks\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2803.500030517578,
-    "y": 936,
-    "z": "e441b8db.02f6b8",
+    "x": 2862.531280517578,
+    "y": 932.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "fc4b2239.ad95e",
-        "b78d8584.51d7a"
+        "eff34a17.4d5f68",
+        "a2b7dcb4.f7dfe"
       ]
     ]
   },
   {
-    "id": "fc4b2239.ad95e",
+    "id": "eff34a17.4d5f68",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3000.500030517578,
-    "y": 871,
-    "z": "e441b8db.02f6b8",
+    "x": 3059.531280517578,
+    "y": 867.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "967e5828.2a4"
+        "f3612128.8fa1"
       ]
     ]
   },
   {
-    "id": "b78d8584.51d7a",
+    "id": "a2b7dcb4.f7dfe",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3001.500030517578,
-    "y": 937,
-    "z": "e441b8db.02f6b8",
+    "x": 3060.531280517578,
+    "y": 933.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "daabf19.5290e1"
+        "8c6ffd32.2208f"
       ]
     ]
   },
   {
-    "id": "daabf19.5290e1",
+    "id": "8c6ffd32.2208f",
     "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": 3182.500030517578,
-    "y": 935,
-    "z": "e441b8db.02f6b8",
+    "x": 3241.531280517578,
+    "y": 931.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "967e5828.2a4",
+    "id": "f3612128.8fa1",
     "type": "for",
     "name": "for each local_networks",
     "xml": "<for index='idx' start='0' end='`$tmp.dci-connects.local_networks_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3203.0001945495605,
-    "y": 870.5000400543213,
-    "z": "e441b8db.02f6b8",
+    "x": 3262.0314445495605,
+    "y": 866.5312900543213,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "fc475635.0ecc7"
+        "654fc20b.a1919c"
       ]
     ]
   },
   {
-    "id": "fc475635.0ecc7",
+    "id": "654fc20b.a1919c",
     "type": "get-resource",
     "name": "get-resource l3-network",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $tmp.dci-connects.local_networks[$idx] AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.l3-network' local-only='false' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3475.500030517578,
-    "y": 869,
-    "z": "e441b8db.02f6b8",
+    "x": 3534.531280517578,
+    "y": 865.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "3713fed6.e8a612",
-        "948581dc.359b18",
-        "a5fff0f8.ef0de"
+        "e570a32e.5f1c",
+        "bdb2f778.6e3618",
+        "bc031e42.eeb7c"
       ]
     ]
   },
   {
-    "id": "3713fed6.e8a612",
+    "id": "e570a32e.5f1c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3694.2691497802734,
-    "y": 829.6922347545624,
-    "z": "e441b8db.02f6b8",
+    "x": 3753.3003997802734,
+    "y": 825.7234847545624,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "74fe93ab.32caec"
+        "c951297e.06f838"
       ]
     ]
   },
   {
-    "id": "948581dc.359b18",
+    "id": "bdb2f778.6e3618",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3701.2691497802734,
-    "y": 867.6922347545624,
-    "z": "e441b8db.02f6b8",
+    "x": 3760.3003997802734,
+    "y": 863.7234847545624,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "3de46cb6.4664a4"
+        "37619.408049e7c"
       ]
     ]
   },
   {
-    "id": "a5fff0f8.ef0de",
+    "id": "bc031e42.eeb7c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3693.2691497802734,
-    "y": 909.6922347545624,
-    "z": "e441b8db.02f6b8",
+    "x": 3752.3003997802734,
+    "y": 905.7234847545624,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "16b5935a.976ded"
+        "8357d17d.030af"
       ]
     ]
   },
   {
-    "id": "3de46cb6.4664a4",
+    "id": "37619.408049e7c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3858.2691497802734,
-    "y": 871.6922347545624,
-    "z": "e441b8db.02f6b8",
+    "x": 3917.3003997802734,
+    "y": 867.7234847545624,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "16b5935a.976ded",
+    "id": "8357d17d.030af",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3851.2691497802734,
-    "y": 918.6922347545624,
-    "z": "e441b8db.02f6b8",
+    "x": 3910.3003997802734,
+    "y": 914.7234847545624,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "74fe93ab.32caec",
+    "id": "c951297e.06f838",
     "type": "set",
     "name": "set network-id",
     "xml": "<set>\n<parameter name='prop.dci-connects.local_networks[$idx]' value=\"`$tmp.aai.l3-network.network-id`\" />\n",
     "comments": "",
-    "x": 3868.7690811157227,
-    "y": 826.1922149658203,
-    "z": "e441b8db.02f6b8",
+    "x": 3927.8003311157227,
+    "y": 822.2234649658203,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "edee7e9.f5684",
+    "id": "80e65684.a81798",
     "type": "save",
     "name": "save overlay configuration in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $prop.dci.network-id' >\n<parameter name='configuration-id' value='`$prop.dci.network-id`' />\n<parameter name='configuration-type' value='overlay' />\n<parameter name='orchestration-status' value='Created' />\n<parameter name='configuration-selflink' 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/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 853.5,
-    "y": 1023,
-    "z": "e441b8db.02f6b8",
+    "x": 912.53125,
+    "y": 1019.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       []
     ]
   },
   {
-    "id": "c1d82a9d.7debd",
+    "id": "44b13ee0.f42ab",
     "type": "save",
     "name": "save service relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-id' >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"/network/configurations/configuration\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.dci.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"configuration.configuration-type\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"overlay\" />",
     "comments": "",
     "outputs": 1,
-    "x": 811.5000305175781,
-    "y": 1102,
-    "z": "e441b8db.02f6b8",
+    "x": 870.5312805175781,
+    "y": 1098.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       []
     ]
   },
   {
-    "id": "6eecda19.439af4",
+    "id": "2e41bbcc.a6d6e4",
     "type": "block",
     "name": "block setLocalNetworks",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2602,
-    "y": 356,
-    "z": "e441b8db.02f6b8",
+    "x": 2661.03125,
+    "y": 352.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "bdc08c35.1283",
-        "394dfa49.7d183e"
+        "636f0708.977f58",
+        "af56db03.32d938"
       ]
     ]
   },
   {
-    "id": "bdc08c35.1283",
+    "id": "636f0708.977f58",
     "type": "set",
     "name": "set local_networks",
     "xml": "<set>\n<parameter name='tmp.dci-connects.local_networks.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2805,
-    "y": 291,
-    "z": "e441b8db.02f6b8",
+    "x": 2864.03125,
+    "y": 287.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "394dfa49.7d183e",
+    "id": "af56db03.32d938",
     "type": "execute",
     "name": "split local_networks",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.local_networks.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.local_networks\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2834,
-    "y": 343,
-    "z": "e441b8db.02f6b8",
+    "x": 2893.03125,
+    "y": 339.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "60eb5396.78be9c",
-        "4332c294.3fe73c"
+        "39e07dec.1621b2",
+        "91074007.ecd89"
       ]
     ]
   },
   {
-    "id": "60eb5396.78be9c",
+    "id": "39e07dec.1621b2",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3031,
-    "y": 278,
-    "z": "e441b8db.02f6b8",
+    "x": 3090.03125,
+    "y": 274.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "1db92507.15d47b"
+        "cb051330.3cb5b"
       ]
     ]
   },
   {
-    "id": "4332c294.3fe73c",
+    "id": "91074007.ecd89",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3032,
-    "y": 344,
-    "z": "e441b8db.02f6b8",
+    "x": 3091.03125,
+    "y": 340.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "8c77dee5.f45208"
+        "573f8606.d6b8a8"
       ]
     ]
   },
   {
-    "id": "8c77dee5.f45208",
+    "id": "573f8606.d6b8a8",
     "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": 3213,
-    "y": 342,
-    "z": "e441b8db.02f6b8",
+    "x": 3272.03125,
+    "y": 338.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "1db92507.15d47b",
+    "id": "cb051330.3cb5b",
     "type": "for",
     "name": "for each local_networks",
     "xml": "<for index='idx' start='0' end='`$tmp.dci-connects.local_networks_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3233.5001640319824,
-    "y": 277.5000400543213,
-    "z": "e441b8db.02f6b8",
+    "x": 3292.5314140319824,
+    "y": 273.5312900543213,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "5d5e8ee8.e594e8"
+        "99742942.c53d08"
       ]
     ]
   },
   {
-    "id": "5d5e8ee8.e594e8",
+    "id": "99742942.c53d08",
     "type": "get-resource",
     "name": "get-resource l3-network",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"l3-network\" \n\t\tkey=\"l3-network.network-name = $tmp.dci-connects.local_networks[$idx] AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.l3-network' local-only='false' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3506,
-    "y": 276,
-    "z": "e441b8db.02f6b8",
+    "x": 3565.03125,
+    "y": 272.03125,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "9eecd85b.9e0378",
-        "f0b90daa.70ba48",
-        "c26d74dd.826c88"
+        "ce35f358.6f76e",
+        "8d00520d.551d5",
+        "2e5108cc.272428"
       ]
     ]
   },
   {
-    "id": "c26d74dd.826c88",
+    "id": "2e5108cc.272428",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3723.7691192626953,
-    "y": 316.6922347545624,
-    "z": "e441b8db.02f6b8",
+    "x": 3782.8003692626953,
+    "y": 312.7234847545624,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "19ff7603.327b32"
+        "dcf88a18.567f48"
       ]
     ]
   },
   {
-    "id": "f0b90daa.70ba48",
+    "id": "8d00520d.551d5",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3731.7691192626953,
-    "y": 274.6922347545624,
-    "z": "e441b8db.02f6b8",
+    "x": 3790.8003692626953,
+    "y": 270.7234847545624,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "283dc5a8.944bea"
+        "2d45b755.c2efb8"
       ]
     ]
   },
   {
-    "id": "9eecd85b.9e0378",
+    "id": "ce35f358.6f76e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3724.7691192626953,
-    "y": 236.69223475456238,
-    "z": "e441b8db.02f6b8",
+    "x": 3783.8003692626953,
+    "y": 232.72348475456238,
+    "z": "1d7d5b1a.5d6895",
     "wires": [
       [
-        "974d7763.cd52a8"
+        "5eecb2c5.b15a1c"
       ]
     ]
   },
   {
-    "id": "974d7763.cd52a8",
+    "id": "5eecb2c5.b15a1c",
     "type": "set",
     "name": "set network-id",
     "xml": "<set>\n<parameter name='prop.dci-connects.local_networks[$idx]' value=\"`$tmp.aai.l3-network.network-id`\" />\n",
     "comments": "",
-    "x": 3899.2690505981445,
-    "y": 233.1922149658203,
-    "z": "e441b8db.02f6b8",
+    "x": 3958.3003005981445,
+    "y": 229.2234649658203,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "283dc5a8.944bea",
+    "id": "2d45b755.c2efb8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3888.7691192626953,
-    "y": 278.6922347545624,
-    "z": "e441b8db.02f6b8",
+    "x": 3947.8003692626953,
+    "y": 274.7234847545624,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   },
   {
-    "id": "19ff7603.327b32",
+    "id": "dcf88a18.567f48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3881.7691192626953,
-    "y": 325.6922347545624,
-    "z": "e441b8db.02f6b8",
+    "x": 3940.8003692626953,
+    "y": 321.7234847545624,
+    "z": "1d7d5b1a.5d6895",
+    "wires": []
+  },
+  {
+    "id": "6c39ea0c.ba0e9c",
+    "type": "execute",
+    "name": "execute Properties",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1646,
+    "y": 1323,
+    "z": "1d7d5b1a.5d6895",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1fbe5a07.98eb36",
+    "type": "execute",
+    "name": "execute RestApiCallNode Get token",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1910,
+    "y": 1421,
+    "z": "1d7d5b1a.5d6895",
+    "wires": [
+      [
+        "ecc5245d.ffca28",
+        "6e7f216c.19692"
+      ]
+    ]
+  },
+  {
+    "id": "ecc5245d.ffca28",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2150,
+    "y": 1384,
+    "z": "1d7d5b1a.5d6895",
+    "wires": [
+      [
+        "952d3488.c107a8"
+      ]
+    ]
+  },
+  {
+    "id": "6e7f216c.19692",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2157.25,
+    "y": 1450.6428833007812,
+    "z": "1d7d5b1a.5d6895",
+    "wires": [
+      [
+        "323acdac.d34ffa"
+      ]
+    ]
+  },
+  {
+    "id": "323acdac.d34ffa",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
+    "comments": "",
+    "x": 2338,
+    "y": 1449.3929443359375,
+    "z": "1d7d5b1a.5d6895",
+    "wires": []
+  },
+  {
+    "id": "952d3488.c107a8",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
+    "comments": "",
+    "x": 2335,
+    "y": 1381,
+    "z": "1d7d5b1a.5d6895",
     "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json
index 2affc9cd..43ac4a75 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "e6595ced.cd07e",
+    "id": "f5a8ee3a.716df8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 93,
-    "y": 105,
-    "z": "88fdd57.10ebea8",
+    "x": 92,
+    "y": 90,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "6a3b8941.159818"
+        "181c6e18.5e551a"
       ]
     ]
   },
   {
-    "id": "6a3b8941.159818",
+    "id": "181c6e18.5e551a",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,605 +22,692 @@
     "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": 354,
-    "y": 176,
-    "z": "88fdd57.10ebea8",
+    "x": 353,
+    "y": 161,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "3be859ad.2be5b6"
+        "4deec5d.bc3e13c"
       ]
     ]
   },
   {
-    "id": "3be859ad.2be5b6",
+    "id": "4deec5d.bc3e13c",
     "type": "method",
     "name": "method dci-connects-network-topology-operation-deactivate",
     "xml": "<method rpc='dci-connects-network-topology-operation-deactivate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 244,
-    "y": 261,
-    "z": "88fdd57.10ebea8",
+    "x": 243,
+    "y": 246,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "33572f89.f401b"
+        "db590270.2247a"
       ]
     ]
   },
   {
-    "id": "33572f89.f401b",
+    "id": "db590270.2247a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 579.0000152587891,
-    "y": 261.00000953674316,
-    "z": "88fdd57.10ebea8",
+    "x": 578.0000152587891,
+    "y": 246.00000953674316,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "d0a86103.e51848",
-        "74647967.d19da8",
-        "87f2c3a5.8dd168",
-        "d8b9200b.bee808",
-        "827daee9.fd9758",
-        "1f2fa549.76dec3"
+        "ab4a3388.0c6b38",
+        "a32bd41.02ddda8",
+        "10699173.9d62bf",
+        "517a5a14.a94154",
+        "efd1462b.b12ac8",
+        "73a3e34f.020a74"
       ]
     ]
   },
   {
-    "id": "d0a86103.e51848",
+    "id": "ab4a3388.0c6b38",
     "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": 914,
-    "y": 130,
-    "z": "88fdd57.10ebea8",
+    "x": 913,
+    "y": 115,
+    "z": "4f2829e5.fc576",
     "wires": [
       []
     ]
   },
   {
-    "id": "74647967.d19da8",
+    "id": "a32bd41.02ddda8",
     "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": 788,
-    "y": 1023,
-    "z": "88fdd57.10ebea8",
+    "x": 787,
+    "y": 1008,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "38788fe5.0d87a",
+    "id": "9bf0ea3a.343b6",
     "type": "block",
     "name": "block : sendRequest",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 975.5000305175781,
-    "y": 604.5156650543213,
-    "z": "88fdd57.10ebea8",
+    "x": 974.5000305175781,
+    "y": 589.5156650543213,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "351a36d5.bb2aba",
-        "a84bd383.c98848",
-        "d1ee1ccb.6ac1e"
+        "9dd304ed.281768",
+        "efaa0ea1.0c4f18",
+        "c52f3ac0.e967a8",
+        "f2e7b7ab.8ad1d",
+        "c98e6def.0e6fb8"
       ]
     ]
   },
   {
-    "id": "fff41978.9f33",
+    "id": "b2910a08.b9547",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1507.999927520752,
-    "y": 401.51519107818604,
-    "z": "88fdd57.10ebea8",
+    "x": 1506.999927520752,
+    "y": 386.51519107818604,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "8722da7b.5697a8"
+        "c0709608.52e74"
       ]
     ]
   },
   {
-    "id": "d6d9b577.1d5bf8",
+    "id": "7302542d.935134",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1514.999927520752,
-    "y": 439.51519107818604,
-    "z": "88fdd57.10ebea8",
+    "x": 1513.999927520752,
+    "y": 424.51519107818604,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "cdd52bd7.c7dbb8"
+        "46e7f2ba.30df5c"
       ]
     ]
   },
   {
-    "id": "2bb0e607.cf37aa",
+    "id": "c3c5a87c.e92ec",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1506.999927520752,
-    "y": 481.51519107818604,
-    "z": "88fdd57.10ebea8",
+    "x": 1505.999927520752,
+    "y": 466.51519107818604,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "db4903d.eb23f8"
+        "c4b5e7cb.79f558"
       ]
     ]
   },
   {
-    "id": "cdd52bd7.c7dbb8",
+    "id": "46e7f2ba.30df5c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1671.999927520752,
-    "y": 443.51519107818604,
-    "z": "88fdd57.10ebea8",
+    "x": 1670.999927520752,
+    "y": 428.51519107818604,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "db4903d.eb23f8",
+    "id": "c4b5e7cb.79f558",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1664.999927520752,
-    "y": 490.51519107818604,
-    "z": "88fdd57.10ebea8",
+    "x": 1663.999927520752,
+    "y": 475.51519107818604,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "351a36d5.bb2aba",
+    "id": "9dd304ed.281768",
     "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": 1284.000015258789,
-    "y": 448.51519799232483,
-    "z": "88fdd57.10ebea8",
+    "x": 1283.000015258789,
+    "y": 433.51519799232483,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "fff41978.9f33",
-        "d6d9b577.1d5bf8",
-        "2bb0e607.cf37aa"
+        "b2910a08.b9547",
+        "7302542d.935134",
+        "c3c5a87c.e92ec"
       ]
     ]
   },
   {
-    "id": "8722da7b.5697a8",
+    "id": "c0709608.52e74",
     "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.esr-system-info[0].service-url`\" />\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.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n",
     "comments": "",
-    "x": 1687.4998779296875,
-    "y": 394.01513671875,
-    "z": "88fdd57.10ebea8",
+    "x": 1686.4998779296875,
+    "y": 379.01513671875,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "ecb96ba3.5758d",
+    "id": "ad303774.891d",
     "type": "execute",
     "name": "execute RestApiCallNode De-Activate Vxlan Tunnel",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783.5003051757812,
-    "y": 667.5156202316284,
-    "z": "88fdd57.10ebea8",
+    "x": 1782.5003051757812,
+    "y": 652.5156202316284,
+    "z": "4f2829e5.fc576",
     "wires": [
       []
     ]
   },
   {
-    "id": "a84bd383.c98848",
+    "id": "efaa0ea1.0c4f18",
     "type": "switchNode",
     "name": "switch tunnelType",
     "xml": "<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1246.4997634887695,
-    "y": 692.0151309967041,
-    "z": "88fdd57.10ebea8",
+    "x": 1245.4997634887695,
+    "y": 677.0151309967041,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "1b404d3f.38e2eb",
-        "dcb57b7d.8ec64"
+        "96ca330.e8be2d",
+        "cc0d585a.c5e7e"
       ]
     ]
   },
   {
-    "id": "1b404d3f.38e2eb",
+    "id": "96ca330.e8be2d",
     "type": "outcomeTrue",
     "name": "L3-DCI",
     "xml": "<outcome value='L3-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1459.4998931884766,
-    "y": 672.0151309967041,
-    "z": "88fdd57.10ebea8",
+    "x": 1458.4998931884766,
+    "y": 657.0151309967041,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "ecb96ba3.5758d"
+        "ad303774.891d"
       ]
     ]
   },
   {
-    "id": "dcb57b7d.8ec64",
+    "id": "cc0d585a.c5e7e",
     "type": "outcomeTrue",
     "name": "L2-DCI",
     "xml": "<outcome value='L2-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1457.499713897705,
-    "y": 744.0151309967041,
-    "z": "88fdd57.10ebea8",
+    "x": 1456.499713897705,
+    "y": 729.0151309967041,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "62327707.f218a"
+        "bacc084b.3ec41"
       ]
     ]
   },
   {
-    "id": "62327707.f218a",
+    "id": "bacc084b.3ec41",
     "type": "execute",
     "name": "execute RestApiCallNode De-Activate Vxlan Tunnel",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1777.500259399414,
-    "y": 744.5155563354492,
-    "z": "88fdd57.10ebea8",
+    "x": 1776.500259399414,
+    "y": 729.5155563354492,
+    "z": "4f2829e5.fc576",
     "wires": [
       []
     ]
   },
   {
-    "id": "4860ee5f.f2017",
+    "id": "a2b7f400.1f465",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1037.999984741211,
-    "y": 205.51563167572021,
-    "z": "88fdd57.10ebea8",
+    "x": 1036.999984741211,
+    "y": 190.51563167572021,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "ba7fcf57.78acb"
+        "225b5a0e.27e1d6"
       ]
     ]
   },
   {
-    "id": "d1ee1ccb.6ac1e",
+    "id": "c52f3ac0.e967a8",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"dci-network-topology-operation-deactivate\"/>\n<parameter name=\"field3\" value=\"dci-connects.id\" />\n<parameter name=\"field4\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field5\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field6\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1220.333366394043,
-    "y": 624,
-    "z": "88fdd57.10ebea8",
+    "x": 1220.3333740234375,
+    "y": 542,
+    "z": "4f2829e5.fc576",
     "wires": [
       []
     ]
   },
   {
-    "id": "ba7fcf57.78acb",
+    "id": "225b5a0e.27e1d6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1271.3334274291992,
-    "y": 205.00000762939453,
-    "z": "88fdd57.10ebea8",
+    "x": 1270.3334274291992,
+    "y": 190.00000762939453,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "121de4fa.dd7713",
-        "e7af85ba.d512e"
+        "be8fe02b.02612",
+        "9b16a3b9.1f3098"
       ]
     ]
   },
   {
-    "id": "121de4fa.dd7713",
+    "id": "be8fe02b.02612",
     "type": "switchNode",
     "name": "switch site1_id",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1477.6666374206543,
-    "y": 174.00000381469727,
-    "z": "88fdd57.10ebea8",
+    "x": 1476.6666374206543,
+    "y": 159.00000381469727,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "b3100ed.49466f"
+        "97e27afd.097dc"
       ]
     ]
   },
   {
-    "id": "b3100ed.49466f",
+    "id": "97e27afd.097dc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1678.666732788086,
-    "y": 173.00000286102295,
-    "z": "88fdd57.10ebea8",
+    "x": 1677.666732788086,
+    "y": 158.00000286102295,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "7769aa51.22fb2c"
+        "b51077df.7867c"
       ]
     ]
   },
   {
-    "id": "7769aa51.22fb2c",
+    "id": "b51077df.7867c",
     "type": "set",
     "name": "set id",
     "xml": "<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1852.3330841064453,
-    "y": 172.66654777526855,
-    "z": "88fdd57.10ebea8",
+    "x": 1851.3330841064453,
+    "y": 157.66654777526855,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "e7af85ba.d512e",
+    "id": "9b16a3b9.1f3098",
     "type": "switchNode",
     "name": "switch tunnelType",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1487.6667175292969,
-    "y": 227.00000977516174,
-    "z": "88fdd57.10ebea8",
+    "x": 1486.6667175292969,
+    "y": 212.00000977516174,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "98ab781f.4131f8"
+        "f71924ef.335e7"
       ]
     ]
   },
   {
-    "id": "98ab781f.4131f8",
+    "id": "f71924ef.335e7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1693.6667175292969,
-    "y": 227.00000977516174,
-    "z": "88fdd57.10ebea8",
+    "x": 1692.6667175292969,
+    "y": 212.00000977516174,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "ffcfe73.d016818"
+        "81bda338.0c501"
       ]
     ]
   },
   {
-    "id": "ffcfe73.d016818",
+    "id": "81bda338.0c501",
     "type": "set",
     "name": "set tunnelType",
     "xml": "<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1862.6668167114258,
-    "y": 227.0000250339508,
-    "z": "88fdd57.10ebea8",
+    "x": 1861.6668167114258,
+    "y": 212.0000250339508,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "87f2c3a5.8dd168",
+    "id": "10699173.9d62bf",
     "type": "block",
     "name": "block : executeSite1",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 767.3333358764648,
-    "y": 206.66666412353516,
-    "z": "88fdd57.10ebea8",
+    "x": 766.3333358764648,
+    "y": 191.66666412353516,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "4860ee5f.f2017",
-        "38788fe5.0d87a"
+        "a2b7f400.1f465",
+        "9bf0ea3a.343b6"
       ]
     ]
   },
   {
-    "id": "2ffdab13.6ed684",
+    "id": "13dfccf8.bd0803",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1043.0000686645508,
-    "y": 311.66663551330566,
-    "z": "88fdd57.10ebea8",
+    "x": 1042.0000686645508,
+    "y": 296.66663551330566,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "b45df97f.e41dd"
+        "9c692b97.c836f"
       ]
     ]
   },
   {
-    "id": "b45df97f.e41dd",
+    "id": "9c692b97.c836f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1271.3334350585938,
-    "y": 314.15101146698,
-    "z": "88fdd57.10ebea8",
+    "x": 1270.3334350585938,
+    "y": 299.15101146698,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "4ec4a4e9.835374"
+        "3edb515.a48a22e"
       ]
     ]
   },
   {
-    "id": "4ec4a4e9.835374",
+    "id": "3edb515.a48a22e",
     "type": "switchNode",
     "name": "switch site2_id",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1472.3333854675293,
-    "y": 314.15099716186523,
-    "z": "88fdd57.10ebea8",
+    "x": 1471.3333854675293,
+    "y": 299.15099716186523,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "583f59bb.0661c"
+        "948a60aa.59ad7"
       ]
     ]
   },
   {
-    "id": "583f59bb.0661c",
+    "id": "948a60aa.59ad7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1673.333480834961,
-    "y": 313.1509962081909,
-    "z": "88fdd57.10ebea8",
+    "x": 1672.333480834961,
+    "y": 298.1509962081909,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "5598a85d.318a8"
+        "1962949c.26443b"
       ]
     ]
   },
   {
-    "id": "5598a85d.318a8",
+    "id": "1962949c.26443b",
     "type": "set",
     "name": "set id",
     "xml": "<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1846.9998321533203,
-    "y": 312.8175411224365,
-    "z": "88fdd57.10ebea8",
+    "x": 1845.9998321533203,
+    "y": 297.8175411224365,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "d8b9200b.bee808",
+    "id": "517a5a14.a94154",
     "type": "block",
     "name": "block : executeSite1",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 767.3333435058594,
-    "y": 315.8176679611206,
-    "z": "88fdd57.10ebea8",
+    "x": 766.3333435058594,
+    "y": 300.8176679611206,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "2ffdab13.6ed684",
-        "38788fe5.0d87a"
+        "13dfccf8.bd0803",
+        "9bf0ea3a.343b6"
       ]
     ]
   },
   {
-    "id": "c84ccddc.555998",
+    "id": "8eb2a0d4.825dc8",
     "type": "set",
     "name": "set object-path",
     "xml": "<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/network-topology/'` \" />\n \n",
     "comments": "",
-    "x": 1082.3373260498047,
-    "y": 836.8607425689697,
-    "z": "88fdd57.10ebea8",
+    "x": 1081.3373260498047,
+    "y": 821.8607425689697,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "ef0a295c.2add48",
+    "id": "56c4779e.6fd13",
     "type": "set",
     "name": "set networkId",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
     "comments": "",
-    "x": 1076.622959136963,
-    "y": 799.7178506851196,
-    "z": "88fdd57.10ebea8",
+    "x": 1075.622959136963,
+    "y": 784.7178506851196,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "827daee9.fd9758",
+    "id": "efd1462b.b12ac8",
     "type": "block",
     "name": "block : saveNetworkData",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 819.3333969116211,
-    "y": 775.6666917800903,
-    "z": "88fdd57.10ebea8",
+    "x": 818.3333969116211,
+    "y": 760.6666917800903,
+    "z": "4f2829e5.fc576",
     "wires": [
       [
-        "ef0a295c.2add48",
-        "c84ccddc.555998",
-        "11e0aee9.730f31",
-        "6f6203a9.3e25c4"
+        "56c4779e.6fd13",
+        "8eb2a0d4.825dc8",
+        "cc5c05c.b33c178",
+        "36a63a6b.ba56a6"
       ]
     ]
   },
   {
-    "id": "e74b5285.3bfcc8",
+    "id": "edaf65d1.c9376",
     "type": "comment",
     "name": "TODO",
     "info": "Currently deactivate does deletion too, later divide in two phases.",
     "comments": "",
-    "x": 701.3333358764648,
-    "y": 69,
-    "z": "88fdd57.10ebea8",
+    "x": 700.3333358764648,
+    "y": 54,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "11e0aee9.730f31",
+    "id": "cc5c05c.b33c178",
     "type": "set",
     "name": "copy input to service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n",
     "comments": "",
-    "x": 1112.3334045410156,
-    "y": 756.0000038146973,
-    "z": "88fdd57.10ebea8",
+    "x": 1111.3334045410156,
+    "y": 741.0000038146973,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "6f6203a9.3e25c4",
+    "id": "36a63a6b.ba56a6",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Deleted' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
     "comments": "",
-    "x": 1126.3333358764648,
-    "y": 883.9999618530273,
-    "z": "88fdd57.10ebea8",
+    "x": 1125.3333358764648,
+    "y": 868.9999618530273,
+    "z": "4f2829e5.fc576",
     "wires": []
   },
   {
-    "id": "1f2fa549.76dec3",
+    "id": "73a3e34f.020a74",
     "type": "delete",
     "name": "delete underlay configuration in AAI",
     "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 856,
-    "y": 943,
-    "z": "88fdd57.10ebea8",
+    "x": 855,
+    "y": 928,
+    "z": "4f2829e5.fc576",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "f2e7b7ab.8ad1d",
+    "type": "execute",
+    "name": "execute Properties",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1255,
+    "y": 490,
+    "z": "4f2829e5.fc576",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c98e6def.0e6fb8",
+    "type": "execute",
+    "name": "execute RestApiCallNode Get token",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1462,
+    "y": 574,
+    "z": "4f2829e5.fc576",
+    "wires": [
+      [
+        "2ccb6350.67574c",
+        "5977545b.66d21c"
+      ]
+    ]
+  },
+  {
+    "id": "2ccb6350.67574c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1702,
+    "y": 537,
+    "z": "4f2829e5.fc576",
+    "wires": [
+      [
+        "b77a0163.0800d"
+      ]
+    ]
+  },
+  {
+    "id": "5977545b.66d21c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1709.25,
+    "y": 603.6428833007812,
+    "z": "4f2829e5.fc576",
+    "wires": [
+      [
+        "ad04fb75.6d618"
+      ]
+    ]
+  },
+  {
+    "id": "b77a0163.0800d",
+    "type": "set",
+    "name": "set token-id",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
+    "comments": "",
+    "x": 1887,
+    "y": 534,
+    "z": "4f2829e5.fc576",
+    "wires": []
+  },
+  {
+    "id": "ad04fb75.6d618",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
+    "comments": "",
+    "x": 1890,
+    "y": 602.3929443359375,
+    "z": "4f2829e5.fc576",
+    "wires": []
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
index 3c64d532..1ac38e62 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "47e67080.80954",
+    "id": "a804e8b3.b56458",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 86,
-    "y": 57,
-    "z": "f0bdac73.5c8b08",
+    "x": 152.03125,
+    "y": 61.999969482421875,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "2a509806.cfd2b"
+        "18e447a7.6f0858"
       ]
     ]
   },
   {
-    "id": "2a509806.cfd2b",
+    "id": "18e447a7.6f0858",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,2214 +22,2229 @@
     "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": 298.00000381469727,
-    "y": 129.0000171661377,
-    "z": "f0bdac73.5c8b08",
+    "x": 364.03125381469727,
+    "y": 133.99998664855957,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "25026a28.6facee"
+        "256df46c.ff714c"
       ]
     ]
   },
   {
-    "id": "25026a28.6facee",
+    "id": "256df46c.ff714c",
     "type": "method",
     "name": "method network-topology-operation-create",
     "xml": "<method rpc='network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 286.0001220703125,
-    "y": 217,
-    "z": "f0bdac73.5c8b08",
+    "x": 352.0313720703125,
+    "y": 221.99996948242188,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "fbf289ee.ac5b88"
+        "7cf0fc5e.374144"
       ]
     ]
   },
   {
-    "id": "fbf289ee.ac5b88",
+    "id": "7cf0fc5e.374144",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 362,
-    "y": 615.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 428.03125,
+    "y": 620,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "7de5755c.474434",
-        "83ddbf2a.ca0fb8",
-        "89f06a3c.5cf0c8",
-        "acc5dbef.ee3348",
-        "e2132fcb.e54328",
-        "c225d084.2fc3d8",
-        "6a15cb31.6626a4",
-        "fdf946de.e32c5",
-        "c90552d6.d68d2",
-        "e0e6781c.4e0188",
-        "9875bc60.171298",
-        "3a5f6ad2.fcb69e",
-        "9104517f.7f262",
-        "cbcd99ce.c72bd8",
-        "7a9f34e2.0af57c",
-        "b55f1296.840848",
-        "d604a407.16f9a",
-        "5c189e4b.93fcf8",
-        "6a04e23f.5461dc"
+        "e8bdc14b.b11af",
+        "2a05068a.e6721a",
+        "e16012fc.ef0af",
+        "179dd935.bb3747",
+        "37b4efd2.368ed",
+        "e431fd19.db908",
+        "60db19ec.521588",
+        "6a3a805.948d08",
+        "77fa32c0.09c32c",
+        "cbfd620a.85d71",
+        "37c9fe5c.d39282",
+        "bb4e39dc.aefd28",
+        "90e757cc.0959f8",
+        "8c153068.d865f",
+        "b9935276.cc7ee",
+        "e891bd7f.8fb2d",
+        "c20c2a08.dc6768",
+        "56419be7.895d24",
+        "a13270b7.6c1f5",
+        "fb767200.4ff718"
       ]
     ]
   },
   {
-    "id": "ea6e7cc2.759108",
+    "id": "1fd5d87a.f37a68",
     "type": "execute",
     "name": "execute RestApiCallNode Create IPWAN L3VPN",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir + '/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'`\" />\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=\"vpn-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'`\" />\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=\"vpn-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1109.0001831054688,
-    "y": 988,
-    "z": "f0bdac73.5c8b08",
+    "x": 1175.0314331054688,
+    "y": 992.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "4a301b10.4617ec",
-        "41cb92ed.fecc84"
+        "52fc73ef.e7aa0c",
+        "b81affca.012b9"
       ]
     ]
   },
   {
-    "id": "c81881c5.b2d718",
+    "id": "8d9313d.965c4f",
     "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.esr-system-info[0].service-url`\" />\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.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 1263.0000610351562,
-    "y": 262,
-    "z": "f0bdac73.5c8b08",
+    "x": 1329.0313110351562,
+    "y": 266.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "89f06a3c.5cf0c8",
+    "id": "e16012fc.ef0af",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 804.6666259765625,
-    "y": 177.66665649414062,
-    "z": "f0bdac73.5c8b08",
+    "x": 870.6978759765625,
+    "y": 182.6666259765625,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "4838189c.cc5c2"
+        "a0a289d3.8a3128"
       ]
     ]
   },
   {
-    "id": "ee76e905.760cf",
+    "id": "e7cb4067.6cda1",
     "type": "execute",
     "name": "execute RestApiCallNode Create SPTN L3VPN",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url\"/>\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\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1145.6668701171875,
-    "y": 1227.666748046875,
-    "z": "f0bdac73.5c8b08",
+    "x": 1211.6981201171875,
+    "y": 1232.6667175292969,
+    "z": "e07ef8ab.015e18",
     "wires": [
       []
     ]
   },
   {
-    "id": "83ddbf2a.ca0fb8",
+    "id": "2a05068a.e6721a",
     "type": "execute",
     "name": "execute vpn-policy1-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vpn-policy1-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 807.6666259765625,
-    "y": 450.66668701171875,
-    "z": "f0bdac73.5c8b08",
+    "x": 873.6978759765625,
+    "y": 455.6666564941406,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "1c6ccd23.dfd9ab"
+        "dfa32502.bd43b8"
       ]
     ]
   },
   {
-    "id": "1c6ccd23.dfd9ab",
+    "id": "dfa32502.bd43b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1032.6666259765625,
-    "y": 453.6666564941406,
-    "z": "f0bdac73.5c8b08",
+    "x": 1098.6978759765625,
+    "y": 458.6666259765625,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "c7b2537.20c0ab"
+        "317318fb.4e9e28"
       ]
     ]
   },
   {
-    "id": "c7b2537.20c0ab",
+    "id": "317318fb.4e9e28",
     "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 generation vpn policy ID\" />\n",
     "comments": "",
-    "x": 1213.6666259765625,
-    "y": 451.6666564941406,
-    "z": "f0bdac73.5c8b08",
+    "x": 1279.6978759765625,
+    "y": 456.6666259765625,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "7de5755c.474434",
+    "id": "e8bdc14b.b11af",
     "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": 859.5,
-    "y": 94,
-    "z": "f0bdac73.5c8b08",
+    "x": 925.53125,
+    "y": 98.99996948242188,
+    "z": "e07ef8ab.015e18",
     "wires": [
       []
     ]
   },
   {
-    "id": "d604a407.16f9a",
+    "id": "c20c2a08.dc6768",
     "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 = $tmp.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 820.5,
-    "y": 328,
-    "z": "f0bdac73.5c8b08",
+    "x": 886.53125,
+    "y": 332.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "85e43fb.89fcec",
-        "2e779e4a.efc65a",
-        "30f09d47.f52bd2"
+        "13f02083.f3783f",
+        "ef2a8a2e.104fc8",
+        "212aed64.086862"
       ]
     ]
   },
   {
-    "id": "85e43fb.89fcec",
+    "id": "13f02083.f3783f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1065.5,
-    "y": 274,
-    "z": "f0bdac73.5c8b08",
+    "x": 1131.53125,
+    "y": 278.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "c81881c5.b2d718"
+        "8d9313d.965c4f"
       ]
     ]
   },
   {
-    "id": "2e779e4a.efc65a",
+    "id": "ef2a8a2e.104fc8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1068.990966796875,
-    "y": 321.57403564453125,
-    "z": "f0bdac73.5c8b08",
+    "x": 1135.022216796875,
+    "y": 326.5740051269531,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "5e19031a.6be224"
+        "be218957.42e218"
       ]
     ]
   },
   {
-    "id": "30f09d47.f52bd2",
+    "id": "212aed64.086862",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1064.323974609375,
-    "y": 362.9073486328125,
-    "z": "f0bdac73.5c8b08",
+    "x": 1130.355224609375,
+    "y": 367.9073181152344,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "ca3e7785.85e588"
+        "53967fa5.5f3e"
       ]
     ]
   },
   {
-    "id": "5e19031a.6be224",
+    "id": "be218957.42e218",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1245.5623779296875,
-    "y": 309.8597717285156,
-    "z": "f0bdac73.5c8b08",
+    "x": 1311.5936279296875,
+    "y": 314.8597412109375,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "ca3e7785.85e588",
+    "id": "53967fa5.5f3e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1252.0965309143066,
-    "y": 358.3465414047241,
-    "z": "f0bdac73.5c8b08",
+    "x": 1318.1277809143066,
+    "y": 363.346510887146,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "3d658710.cc53a",
+    "id": "8ed22fd9.4d3dc",
     "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": 1597.5,
-    "y": 28.000030517578125,
-    "z": "f0bdac73.5c8b08",
+    "x": 1663.53125,
+    "y": 33,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "790fe8ea.59c5f8"
+        "80b3ba44.055788"
       ]
     ]
   },
   {
-    "id": "3ffa7de9.3d22aa",
+    "id": "efdd2674.739ce8",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1601.4999389648438,
-    "y": 85.60000610351562,
-    "z": "f0bdac73.5c8b08",
+    "x": 1667.5311889648438,
+    "y": 90.5999755859375,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "503c6fe2.37ebc"
+        "6d4384b9.0ebe7c"
       ]
     ]
   },
   {
-    "id": "790fe8ea.59c5f8",
+    "id": "80b3ba44.055788",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784.5,
-    "y": 24.000030517578125,
-    "z": "f0bdac73.5c8b08",
+    "x": 1850.53125,
+    "y": 29,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "c0ed55b7.392048"
+        "9fbc359d.c51268"
       ]
     ]
   },
   {
-    "id": "503c6fe2.37ebc",
+    "id": "6d4384b9.0ebe7c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1786.4999389648438,
-    "y": 83.60000610351562,
-    "z": "f0bdac73.5c8b08",
+    "x": 1852.5311889648438,
+    "y": 88.5999755859375,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "100cc5e.56d753a"
+        "afc95f0c.000e8"
       ]
     ]
   },
   {
-    "id": "c0ed55b7.392048",
+    "id": "9fbc359d.c51268",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.l3vpn.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1952.5,
-    "y": 24.60003662109375,
-    "z": "f0bdac73.5c8b08",
+    "x": 2018.53125,
+    "y": 29.600006103515625,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "100cc5e.56d753a",
+    "id": "afc95f0c.000e8",
     "type": "set",
     "name": "set service-type",
     "xml": "<set>\n<parameter name='prop.l3vpn.service-type' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1955.4999389648438,
-    "y": 81.60000610351562,
-    "z": "f0bdac73.5c8b08",
+    "x": 2021.5311889648438,
+    "y": 86.5999755859375,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "664b1b62.1edb04",
+    "id": "f576c53a.7be778",
     "type": "switchNode",
     "name": "switch topology",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1600.5,
-    "y": 147,
-    "z": "f0bdac73.5c8b08",
+    "x": 1666.53125,
+    "y": 151.99996948242188,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "f87542c8.b42238"
+        "c58b51de.9dcfb"
       ]
     ]
   },
   {
-    "id": "34505a72.fd91d6",
+    "id": "f5da2a66.76d6a8",
     "type": "switchNode",
     "name": "switch technology",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'technology'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1603.5,
-    "y": 200,
-    "z": "f0bdac73.5c8b08",
+    "x": 1669.53125,
+    "y": 204.99996948242188,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "1b29c3a2.67f81c"
+        "22ac483f.40cd08"
       ]
     ]
   },
   {
-    "id": "7e10e5c0.fe770c",
+    "id": "9322169f.7e6468",
     "type": "switchNode",
     "name": "switch site1_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1608.5,
-    "y": 262,
-    "z": "f0bdac73.5c8b08",
+    "x": 1674.53125,
+    "y": 266.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "6e3aae9.70d855"
+        "38b6d1b6.17180e"
       ]
     ]
   },
   {
-    "id": "13208c8b.098ffb",
+    "id": "41e22f2d.675b9",
     "type": "switchNode",
     "name": "switch site2_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1603.5,
-    "y": 325,
-    "z": "f0bdac73.5c8b08",
+    "x": 1669.53125,
+    "y": 329.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "3a603034.e9efa"
+        "486c488e.0a32b8"
       ]
     ]
   },
   {
-    "id": "746f494e.5eb71",
+    "id": "fc7aed60.65dde",
     "type": "switchNode",
     "name": "switch sna1_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'sna1_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1608.5,
-    "y": 385,
-    "z": "f0bdac73.5c8b08",
+    "x": 1674.53125,
+    "y": 389.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "a8e565d2.d10748"
+        "915000f3.1120f"
       ]
     ]
   },
   {
-    "id": "234c66fc.f3b94a",
+    "id": "3fbbe309.27a1fc",
     "type": "switchNode",
     "name": "switch sna2_name",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'sna2_name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1603.5,
-    "y": 449,
-    "z": "f0bdac73.5c8b08",
+    "x": 1669.53125,
+    "y": 453.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "907f12f7.ac643"
+        "f4543b5c.8e0d38"
       ]
     ]
   },
   {
-    "id": "57e3e674.d18598",
+    "id": "a2bdcc47.ae6fd",
     "type": "switchNode",
     "name": "switch pe1_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'pe1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1608.5,
-    "y": 511,
-    "z": "f0bdac73.5c8b08",
+    "x": 1674.53125,
+    "y": 515.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "1c1a9f73.56aea1"
+        "5f3dc9f6.e27f38"
       ]
     ]
   },
   {
-    "id": "b57b62d6.ecd3f8",
+    "id": "5ff7d202.bbe52c",
     "type": "switchNode",
     "name": "switch pe2_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'pe2_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1623.5,
-    "y": 571,
-    "z": "f0bdac73.5c8b08",
+    "x": 1689.53125,
+    "y": 575.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "80e772d.f39d31"
+        "e42f30ff.07bec"
       ]
     ]
   },
   {
-    "id": "19af71a4.6ac59e",
+    "id": "70478129.46c8",
     "type": "switchNode",
     "name": "switch ac1_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1618.5,
-    "y": 643,
-    "z": "f0bdac73.5c8b08",
+    "x": 1684.53125,
+    "y": 647.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "41098a93.695abc"
+        "88f3112.2d2fdf"
       ]
     ]
   },
   {
-    "id": "f7634e7a.60329",
+    "id": "5b2c84b5.c4133c",
     "type": "switchNode",
     "name": "switch ac2_id",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1617.5,
-    "y": 702,
-    "z": "f0bdac73.5c8b08",
+    "x": 1683.53125,
+    "y": 706.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "b357553d.e05988"
+        "b0791125.97403"
       ]
     ]
   },
   {
-    "id": "ef48199.418d9e8",
+    "id": "5f56629a.41d4bc",
     "type": "switchNode",
     "name": "switch ac1_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1594.5,
-    "y": 765,
-    "z": "f0bdac73.5c8b08",
+    "x": 1660.53125,
+    "y": 769.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "bd5afe60.0d7eb8"
+        "8a66ca.58098938"
       ]
     ]
   },
   {
-    "id": "bc753ec1.7895e",
+    "id": "88ead0cd.822bb",
     "type": "switchNode",
     "name": "switch ac2_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1597.5,
-    "y": 822,
-    "z": "f0bdac73.5c8b08",
+    "x": 1663.53125,
+    "y": 826.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "688c01f9.3034f8"
+        "955fbd96.c1d04"
       ]
     ]
   },
   {
-    "id": "68aca326.79a5c4",
+    "id": "166443d5.94dbbc",
     "type": "switchNode",
     "name": "switch ac1_peer_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_peer_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1603.5,
-    "y": 874,
-    "z": "f0bdac73.5c8b08",
+    "x": 1669.53125,
+    "y": 878.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "9b0c1592.8e3b1"
+        "4db2da85.85e3f4"
       ]
     ]
   },
   {
-    "id": "4df426f9.add138",
+    "id": "2e267b3e.323f94",
     "type": "switchNode",
     "name": "switch ac2_peer_ip",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_peer_ip'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1604.5,
-    "y": 929,
-    "z": "f0bdac73.5c8b08",
+    "x": 1670.53125,
+    "y": 933.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "2cc17c57.778524"
+        "b13a698.e747198"
       ]
     ]
   },
   {
-    "id": "7b807eaa.43ad18",
+    "id": "291e6ccb.4ad7e4",
     "type": "switchNode",
     "name": "switch ac1_svlan",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_svlan'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1616.5,
-    "y": 978,
-    "z": "f0bdac73.5c8b08",
+    "x": 1682.53125,
+    "y": 982.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "495c6f54.c6c1"
+        "551bf76.d690308"
       ]
     ]
   },
   {
-    "id": "aeb88291.366bb",
+    "id": "c859e422.4eadc8",
     "type": "switchNode",
     "name": "switch ac2_svlan",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_svlan'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1609.5,
-    "y": 1029,
-    "z": "f0bdac73.5c8b08",
+    "x": 1675.53125,
+    "y": 1033.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "f6a8ab99.9bdd08"
+        "dc1c7d76.2b839"
       ]
     ]
   },
   {
-    "id": "7d79c207.4a89ac",
+    "id": "335bcb16.8452b4",
     "type": "switchNode",
     "name": "switch ac1_protocol",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_protocol'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1602.5,
-    "y": 1087,
-    "z": "f0bdac73.5c8b08",
+    "x": 1668.53125,
+    "y": 1091.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "d62ba27.6f7c2e"
+        "4da810c6.50b18"
       ]
     ]
   },
   {
-    "id": "7b628f48.c22598",
+    "id": "b8ac331e.cf80f",
     "type": "switchNode",
     "name": "switch ac2_protocol",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_protocol'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1603.5,
-    "y": 1147,
-    "z": "f0bdac73.5c8b08",
+    "x": 1669.53125,
+    "y": 1151.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "c9a16999.043798"
+        "44c491a0.0f4c8"
       ]
     ]
   },
   {
-    "id": "f4a82fcb.89b23",
+    "id": "eddb16e2.7d3ca8",
     "type": "switchNode",
     "name": "switch ac1_protocol_bgp_as",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_protocol_bgp_as'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1597.5,
-    "y": 1333,
-    "z": "f0bdac73.5c8b08",
+    "x": 1663.53125,
+    "y": 1337.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "51172d80.d16d84"
+        "b3981d6b.c0a51"
       ]
     ]
   },
   {
-    "id": "9f057f5a.21a718",
+    "id": "445b45a7.1c9e2c",
     "type": "switchNode",
     "name": "switch ac2_protocol_bgp_as",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_protocol_bgp_as'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1603.5,
-    "y": 1384,
-    "z": "f0bdac73.5c8b08",
+    "x": 1669.53125,
+    "y": 1388.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "541f74d7.9ae7c4"
+        "d1610ea6.e197e"
       ]
     ]
   },
   {
-    "id": "c28375dc.9cf31",
+    "id": "ff841f48.1f039",
     "type": "switchNode",
     "name": "switch af_type",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'af_type'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1570.5,
-    "y": 1475,
-    "z": "f0bdac73.5c8b08",
+    "x": 1636.53125,
+    "y": 1479.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "433d764e.56026"
+        "e0fac181.ab5ff"
       ]
     ]
   },
   {
-    "id": "f87542c8.b42238",
+    "id": "c58b51de.9dcfb",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1775.5,
-    "y": 143,
-    "z": "f0bdac73.5c8b08",
+    "x": 1841.53125,
+    "y": 147.99996948242188,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "8037bd5.ffecf4"
+        "e6e45965.586a08"
       ]
     ]
   },
   {
-    "id": "1b29c3a2.67f81c",
+    "id": "22ac483f.40cd08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1781.5,
-    "y": 196,
-    "z": "f0bdac73.5c8b08",
+    "x": 1847.53125,
+    "y": 200.99996948242188,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "8f7a26de.1385e"
+        "48d17e6e.f36ff"
       ]
     ]
   },
   {
-    "id": "6e3aae9.70d855",
+    "id": "38b6d1b6.17180e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1790.5,
-    "y": 258,
-    "z": "f0bdac73.5c8b08",
+    "x": 1856.53125,
+    "y": 262.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "7e165873.b921b8"
+        "b956de5c.88109"
       ]
     ]
   },
   {
-    "id": "3a603034.e9efa",
+    "id": "486c488e.0a32b8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1788.5,
-    "y": 321,
-    "z": "f0bdac73.5c8b08",
+    "x": 1854.53125,
+    "y": 325.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "83cebdf0.5d9d88"
+        "6c41f36c.55709c"
       ]
     ]
   },
   {
-    "id": "a8e565d2.d10748",
+    "id": "915000f3.1120f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1793.5,
-    "y": 383,
-    "z": "f0bdac73.5c8b08",
+    "x": 1859.53125,
+    "y": 387.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "be068d69.761ee8"
+        "681b49b2.42ea78"
       ]
     ]
   },
   {
-    "id": "907f12f7.ac643",
+    "id": "f4543b5c.8e0d38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1785.5,
-    "y": 441,
-    "z": "f0bdac73.5c8b08",
+    "x": 1851.53125,
+    "y": 445.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "403c491d.5a2bf"
+        "f14e641f.9e6788"
       ]
     ]
   },
   {
-    "id": "1c1a9f73.56aea1",
+    "id": "5f3dc9f6.e27f38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1786.5,
-    "y": 504,
-    "z": "f0bdac73.5c8b08",
+    "x": 1852.53125,
+    "y": 508.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "d04a64a0.07df1"
+        "9606bc15.8d1a2"
       ]
     ]
   },
   {
-    "id": "80e772d.f39d31",
+    "id": "e42f30ff.07bec",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1785.5,
-    "y": 573,
-    "z": "f0bdac73.5c8b08",
+    "x": 1851.53125,
+    "y": 577.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "5cd5a2d.68f96dc"
+        "79d385f0.7efcac"
       ]
     ]
   },
   {
-    "id": "41098a93.695abc",
+    "id": "88f3112.2d2fdf",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1782.5,
-    "y": 641,
-    "z": "f0bdac73.5c8b08",
+    "x": 1848.53125,
+    "y": 645.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "83a050e0.27157"
+        "58081f21.095c5"
       ]
     ]
   },
   {
-    "id": "b357553d.e05988",
+    "id": "b0791125.97403",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1781.5,
-    "y": 705,
-    "z": "f0bdac73.5c8b08",
+    "x": 1847.53125,
+    "y": 709.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "973fa53a.ec107"
+        "68b74f12.22fc9"
       ]
     ]
   },
   {
-    "id": "bd5afe60.0d7eb8",
+    "id": "8a66ca.58098938",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1754.5,
-    "y": 763,
-    "z": "f0bdac73.5c8b08",
+    "x": 1820.53125,
+    "y": 767.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "6563e244.afa0a4"
+        "6cb618b4.84d5e8"
       ]
     ]
   },
   {
-    "id": "688c01f9.3034f8",
+    "id": "955fbd96.c1d04",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1756.5,
-    "y": 820,
-    "z": "f0bdac73.5c8b08",
+    "x": 1822.53125,
+    "y": 824.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "ea03192c.fa34d8"
+        "3ee47e4b.3ebf92"
       ]
     ]
   },
   {
-    "id": "9b0c1592.8e3b1",
+    "id": "4db2da85.85e3f4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1792.5,
-    "y": 871,
-    "z": "f0bdac73.5c8b08",
+    "x": 1858.53125,
+    "y": 875.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "27144be0.d6e57c"
+        "348c4435.8ca42c"
       ]
     ]
   },
   {
-    "id": "2cc17c57.778524",
+    "id": "b13a698.e747198",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1797.5,
-    "y": 934,
-    "z": "f0bdac73.5c8b08",
+    "x": 1863.53125,
+    "y": 938.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "af57a2a3.2224"
+        "64d72468.0aecbc"
       ]
     ]
   },
   {
-    "id": "495c6f54.c6c1",
+    "id": "551bf76.d690308",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1793.5,
-    "y": 983,
-    "z": "f0bdac73.5c8b08",
+    "x": 1859.53125,
+    "y": 987.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "395b1e98.d76342"
+        "f2be5987.ec3938"
       ]
     ]
   },
   {
-    "id": "f6a8ab99.9bdd08",
+    "id": "dc1c7d76.2b839",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1777.5,
-    "y": 1032,
-    "z": "f0bdac73.5c8b08",
+    "x": 1843.53125,
+    "y": 1036.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "be2b6f25.ac0e3"
+        "e0e7c091.70bda"
       ]
     ]
   },
   {
-    "id": "d62ba27.6f7c2e",
+    "id": "4da810c6.50b18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1774.5,
-    "y": 1085,
-    "z": "f0bdac73.5c8b08",
+    "x": 1840.53125,
+    "y": 1089.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "b57fe3af.1292c"
+        "924d0335.b5bfa"
       ]
     ]
   },
   {
-    "id": "c9a16999.043798",
+    "id": "44c491a0.0f4c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1787.5,
-    "y": 1144,
-    "z": "f0bdac73.5c8b08",
+    "x": 1853.53125,
+    "y": 1148.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "863327dc.5149a8"
+        "880724d2.0ba428"
       ]
     ]
   },
   {
-    "id": "51172d80.d16d84",
+    "id": "b3981d6b.c0a51",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1805.5,
-    "y": 1330,
-    "z": "f0bdac73.5c8b08",
+    "x": 1871.53125,
+    "y": 1334.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "fa6d5b00.b5cee8"
+        "4b8babb9.30ffb4"
       ]
     ]
   },
   {
-    "id": "541f74d7.9ae7c4",
+    "id": "d1610ea6.e197e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1812.5,
-    "y": 1380,
-    "z": "f0bdac73.5c8b08",
+    "x": 1878.53125,
+    "y": 1384.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "90ad7a71.fa1e48"
+        "6ee6ff69.e803d"
       ]
     ]
   },
   {
-    "id": "433d764e.56026",
+    "id": "e0fac181.ab5ff",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1774.5,
-    "y": 1484,
-    "z": "f0bdac73.5c8b08",
+    "x": 1840.53125,
+    "y": 1488.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "15acea8e.b09f55"
+        "a979c4a1.40a538"
       ]
     ]
   },
   {
-    "id": "8037bd5.ffecf4",
+    "id": "e6e45965.586a08",
     "type": "set",
     "name": "set topology",
     "xml": "<set>\n<parameter name='prop.l3vpn.topology' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1970.5,
-    "y": 144,
-    "z": "f0bdac73.5c8b08",
+    "x": 2036.53125,
+    "y": 148.99996948242188,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "8f7a26de.1385e",
+    "id": "48d17e6e.f36ff",
     "type": "set",
     "name": "set technology",
     "xml": "<set>\n<parameter name='prop.l3vpn.technology' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1960.5,
-    "y": 198,
-    "z": "f0bdac73.5c8b08",
+    "x": 2026.53125,
+    "y": 202.99996948242188,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "7e165873.b921b8",
+    "id": "b956de5c.88109",
     "type": "set",
     "name": "set site1_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.site1_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1964.5,
-    "y": 255,
-    "z": "f0bdac73.5c8b08",
+    "x": 2030.53125,
+    "y": 259.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "83cebdf0.5d9d88",
+    "id": "6c41f36c.55709c",
     "type": "set",
     "name": "set site2_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.site2_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1967.5,
-    "y": 314,
-    "z": "f0bdac73.5c8b08",
+    "x": 2033.53125,
+    "y": 318.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "be068d69.761ee8",
+    "id": "681b49b2.42ea78",
     "type": "set",
     "name": "set sna1_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna1_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1975.5,
-    "y": 376,
-    "z": "f0bdac73.5c8b08",
+    "x": 2041.53125,
+    "y": 380.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "403c491d.5a2bf",
+    "id": "f14e641f.9e6788",
     "type": "set",
     "name": "set sna2_name",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna2_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1967.5,
-    "y": 436,
-    "z": "f0bdac73.5c8b08",
+    "x": 2033.53125,
+    "y": 440.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "d04a64a0.07df1",
+    "id": "9606bc15.8d1a2",
     "type": "set",
     "name": "set pe1_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.pe1_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1964.5,
-    "y": 496,
-    "z": "f0bdac73.5c8b08",
+    "x": 2030.53125,
+    "y": 500.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "5cd5a2d.68f96dc",
+    "id": "79d385f0.7efcac",
     "type": "set",
     "name": "set pe2_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.pe2_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1960.5,
-    "y": 567,
-    "z": "f0bdac73.5c8b08",
+    "x": 2026.53125,
+    "y": 571.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "83a050e0.27157",
+    "id": "58081f21.095c5",
     "type": "set",
     "name": "set ac1_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1953.5,
-    "y": 633,
-    "z": "f0bdac73.5c8b08",
+    "x": 2019.53125,
+    "y": 637.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "973fa53a.ec107",
+    "id": "68b74f12.22fc9",
     "type": "set",
     "name": "set ac2_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1956.5,
-    "y": 700,
-    "z": "f0bdac73.5c8b08",
+    "x": 2022.53125,
+    "y": 704.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "6563e244.afa0a4",
+    "id": "6cb618b4.84d5e8",
     "type": "set",
     "name": "set ac1_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1932.5,
-    "y": 766,
-    "z": "f0bdac73.5c8b08",
+    "x": 1998.53125,
+    "y": 770.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "ea03192c.fa34d8",
+    "id": "3ee47e4b.3ebf92",
     "type": "set",
     "name": "set ac2_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1936.5,
-    "y": 820,
-    "z": "f0bdac73.5c8b08",
+    "x": 2002.53125,
+    "y": 824.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "27144be0.d6e57c",
+    "id": "348c4435.8ca42c",
     "type": "set",
     "name": "set ac1_peer_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_peer_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1984.5,
-    "y": 875,
-    "z": "f0bdac73.5c8b08",
+    "x": 2050.53125,
+    "y": 879.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "af57a2a3.2224",
+    "id": "64d72468.0aecbc",
     "type": "set",
     "name": "set ac2_peer_ip",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_peer_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1980.5,
-    "y": 930,
-    "z": "f0bdac73.5c8b08",
+    "x": 2046.53125,
+    "y": 934.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "395b1e98.d76342",
+    "id": "f2be5987.ec3938",
     "type": "set",
     "name": "set ac1_svlan",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_svlan' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1974.5,
-    "y": 985,
-    "z": "f0bdac73.5c8b08",
+    "x": 2040.53125,
+    "y": 989.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "be2b6f25.ac0e3",
+    "id": "e0e7c091.70bda",
     "type": "set",
     "name": "set ac2_svlan",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_svlan' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1971.5,
-    "y": 1038,
-    "z": "f0bdac73.5c8b08",
+    "x": 2037.53125,
+    "y": 1042.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "b57fe3af.1292c",
+    "id": "924d0335.b5bfa",
     "type": "set",
     "name": "set ac1_protocol",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_protocol' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1969.5,
-    "y": 1095,
-    "z": "f0bdac73.5c8b08",
+    "x": 2035.53125,
+    "y": 1099.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "863327dc.5149a8",
+    "id": "880724d2.0ba428",
     "type": "set",
     "name": "set ac2_protocol",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_protocol' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1978.5,
-    "y": 1147,
-    "z": "f0bdac73.5c8b08",
+    "x": 2044.53125,
+    "y": 1151.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "fa6d5b00.b5cee8",
+    "id": "4b8babb9.30ffb4",
     "type": "set",
     "name": "set ac1_protocol_bgp_as",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_protocol_bgp_as' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n<parameter name='prop.l3vpn.peer1-ip' value='`$prop.l3vpn.ac1_ip`' />\n",
     "comments": "",
-    "x": 2072.5,
-    "y": 1351,
-    "z": "f0bdac73.5c8b08",
+    "x": 2138.53125,
+    "y": 1355.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "90ad7a71.fa1e48",
+    "id": "6ee6ff69.e803d",
     "type": "set",
     "name": "set ac2_protocol_bgp_as",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_protocol_bgp_as' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n<parameter name='prop.l3vpn.peer2-ip' value='`$prop.l3vpn.ac2_ip`' />\n",
     "comments": "",
-    "x": 2084.5,
-    "y": 1400,
-    "z": "f0bdac73.5c8b08",
+    "x": 2150.53125,
+    "y": 1404.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "15acea8e.b09f55",
+    "id": "a979c4a1.40a538",
     "type": "set",
     "name": "set af_type",
     "xml": "<set>\n<parameter name='prop.l3vpn.af_type' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1968.5,
-    "y": 1494,
-    "z": "f0bdac73.5c8b08",
+    "x": 2034.53125,
+    "y": 1498.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "acc5dbef.ee3348",
+    "id": "179dd935.bb3747",
     "type": "record",
     "name": "record",
-    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"L3VPN-Config\"/>\n<parameter name=\"field4\" value=\"`l3vpn.name`\"/>\n<parameter name=\"field5\" value=\"`$prop.l3vpn.name`\"/>\n<parameter name=\"field6\" value=\"`l3vpn.topology`\"/>\n<parameter name=\"field7\" value=\"`$prop.l3vpn.topology`\"/>\n<parameter name=\"field8\" value=\"`l3vpn.site1_name`\"/>\n<parameter name=\"field9\" value=\"`$prop.l3vpn.site1_name`\"/>\n<parameter name=\"field10\" value=\"`l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field11\" value=\"`$prop.l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field12\" value=\"`l3vpn.entry1-id`\"/>\n<parameter name=\"field13\" value=\"`$prop.l3vpn.entry1-id`\"/>\n<parameter name=\"field14\" value=\"`l3vpn.sna1_name`\"/>\n<parameter name=\"field15\" value=\"`$prop.l3vpn.sna1_name`\"/>\n<parameter name=\"field16\" value=\"`l3vpn.pe1_id`\"/>\n<parameter name=\"field17\" value=\"`$prop.l3vpn.pe1_id`\"/>\n<parameter name=\"field18\" value=\"`l3vpn.ac1_id`\"/>\n<parameter name=\"field19\" value=\"`$prop.l3vpn.ac1_id`\"/>\n<parameter name=\"field20\" value=\"`l3vpn.sna1_svlan`\"/>\n<parameter name=\"field21\" value=\"`$prop.l3vpn.sna1_svlan`\"/>\n<parameter name=\"field22\" value=\"`l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"field23\" value=\"`$prop.l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"field24\" value=\"`l3vpn.ac1-ip`\"/>\n<parameter name=\"field25\" value=\"`$prop.l3vpn.ac1-ip`\"/>\n<parameter name=\"field26\" value=\"`l3vpn.ac1_protocol`\"/>\n<parameter name=\"field27\" value=\"`$prop.l3vpn.ac1_protocol`\"/>\n<parameter name=\"field28\" value=\"`l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field29\" value=\"`$prop.l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field30\" value=\"`l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field31\" value=\"`$prop.l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field32\" value=\"`l3vpn.peer1-ip`\"/>\n<parameter name=\"field33\" value=\"`$prop.l3vpn.peer1-ip`\"/>\n<parameter name=\"field34\" value=\"`l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field35\" value=\"`$prop.l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field36\" value=\"`l3vpn.vrf1-id`\"/>\n<parameter name=\"field37\" value=\"`$prop.l3vpn.vrf1-id`\"/>\n<parameter name=\"field38\" value=\"`l3vpn.site2_name`\"/>\n<parameter name=\"field39\" value=\"`$prop.l3vpn.site2_name`\"/>\n<parameter name=\"field40\" value=\"`l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field41\" value=\"`$prop.l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field42\" value=\"`l3vpn.entry2-id`\"/>\n<parameter name=\"field43\" value=\"`$prop.l3vpn.entry2-id`\"/>\n<parameter name=\"field44\" value=\"`l3vpn.sna2_name`\"/>\n<parameter name=\"field45\" value=\"`$prop.l3vpn.sna2_name`\"/>\n<parameter name=\"field46\" value=\"`l3vpn.pe2_id`\"/>\n<parameter name=\"field47\" value=\"`$prop.l3vpn.pe2_id`\"/>\n<parameter name=\"field48\" value=\"`l3vpn.ac2_id`\"/>\n<parameter name=\"field49\" value=\"`$prop.l3vpn.ac2_id`\"/>\n<parameter name=\"field50\" value=\"`l3vpn.sna2_svlan`\"/>\n<parameter name=\"field51\" value=\"`$prop.l3vpn.sna2_svlan`\"/>\n<parameter name=\"field52\" value=\"`l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"field53\" value=\"`$prop.l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"field54\" value=\"`l3vpn.ac2-ip`\"/>\n<parameter name=\"field55\" value=\"`$prop.l3vpn.ac2-ip`\"/>\n<parameter name=\"field56\" value=\"`l3vpn.ac2_protocol`\"/>\n<parameter name=\"field57\" value=\"`$prop.l3vpn.ac2_protocol`\"/>\n<parameter name=\"field58\" value=\"`l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field59\" value=\"`$prop.l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field60\" value=\"`l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field61\" value=\"`$prop.l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field62\" value=\"`l3vpn.peer2-ip`\"/>\n<parameter name=\"field63\" value=\"`$prop.l3vpn.peer2-ip`\"/>\n<parameter name=\"field64\" value=\"`l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field65\" value=\"`$prop.l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field66\" value=\"`l3vpn.vrf2-id`\"/>\n<parameter name=\"field67\" value=\"`$prop.l3vpn.vrf2-id`\"/>\n<parameter name=\"field68\" value=\"`l3vpn.af_type`\"/>\n<parameter name=\"field69\" value=\"`$prop.l3vpn.af_type`\"/>\n",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"L3VPN-Config\"/>\n<parameter name=\"field4\" value=\"`l3vpn.name`\"/>\n<parameter name=\"field5\" value=\"`$prop.l3vpn.name`\"/>\n<parameter name=\"field6\" value=\"`l3vpn.topology`\"/>\n<parameter name=\"field7\" value=\"`$prop.l3vpn.topology`\"/>\n<parameter name=\"field8\" value=\"`l3vpn.site1_name`\"/>\n<parameter name=\"field9\" value=\"`$prop.l3vpn.site1_name`\"/>\n<parameter name=\"field10\" value=\"`l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field11\" value=\"`$prop.l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field12\" value=\"`l3vpn.entry1-id`\"/>\n<parameter name=\"field13\" value=\"`$prop.l3vpn.entry1-id`\"/>\n<parameter name=\"field14\" value=\"`l3vpn.sna1_name`\"/>\n<parameter name=\"field15\" value=\"`$prop.l3vpn.sna1_name`\"/>\n<parameter name=\"field16\" value=\"`l3vpn.pe1_id`\"/>\n<parameter name=\"field17\" value=\"`$prop.l3vpn.pe1_id`\"/>\n<parameter name=\"field18\" value=\"`l3vpn.ac1_id`\"/>\n<parameter name=\"field19\" value=\"`$prop.l3vpn.ac1_id`\"/>\n<parameter name=\"field20\" value=\"`l3vpn.sna1_svlan`\"/>\n<parameter name=\"field21\" value=\"`$prop.l3vpn.sna1_svlan`\"/>\n<parameter name=\"field22\" value=\"`l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"field23\" value=\"`$prop.l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"field24\" value=\"`l3vpn.ac1-ip`\"/>\n<parameter name=\"field25\" value=\"`$prop.l3vpn.ac1-ip`\"/>\n<parameter name=\"field26\" value=\"`l3vpn.ac1_protocol`\"/>\n<parameter name=\"field27\" value=\"`$prop.l3vpn.ac1_protocol`\"/>\n<parameter name=\"field28\" value=\"`l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field29\" value=\"`$prop.l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field30\" value=\"`l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field31\" value=\"`$prop.l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field32\" value=\"`l3vpn.peer1-ip`\"/>\n<parameter name=\"field33\" value=\"`$prop.l3vpn.peer1-ip`\"/>\n<parameter name=\"field34\" value=\"`l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field35\" value=\"`$prop.l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field36\" value=\"`l3vpn.vrf1-id`\"/>\n<parameter name=\"field37\" value=\"`$prop.l3vpn.vrf1-id`\"/>\n<parameter name=\"field38\" value=\"`l3vpn.site2_name`\"/>\n<parameter name=\"field39\" value=\"`$prop.l3vpn.site2_name`\"/>\n<parameter name=\"field40\" value=\"`l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field41\" value=\"`$prop.l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field42\" value=\"`l3vpn.entry2-id`\"/>\n<parameter name=\"field43\" value=\"`$prop.l3vpn.entry2-id`\"/>\n<parameter name=\"field44\" value=\"`l3vpn.sna2_name`\"/>\n<parameter name=\"field45\" value=\"`$prop.l3vpn.sna2_name`\"/>\n<parameter name=\"field46\" value=\"`l3vpn.pe2_id`\"/>\n<parameter name=\"field47\" value=\"`$prop.l3vpn.pe2_id`\"/>\n<parameter name=\"field48\" value=\"`l3vpn.ac2_id`\"/>\n<parameter name=\"field49\" value=\"`$prop.l3vpn.ac2_id`\"/>\n<parameter name=\"field50\" value=\"`l3vpn.sna2_svlan`\"/>\n<parameter name=\"field51\" value=\"`$prop.l3vpn.sna2_svlan`\"/>\n<parameter name=\"field52\" value=\"`l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"field53\" value=\"`$prop.l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"field54\" value=\"`l3vpn.ac2-ip`\"/>\n<parameter name=\"field55\" value=\"`$prop.l3vpn.ac2-ip`\"/>\n<parameter name=\"field56\" value=\"`l3vpn.ac2_protocol`\"/>\n<parameter name=\"field57\" value=\"`$prop.l3vpn.ac2_protocol`\"/>\n<parameter name=\"field58\" value=\"`l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field59\" value=\"`$prop.l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field60\" value=\"`l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field61\" value=\"`$prop.l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field62\" value=\"`l3vpn.peer2-ip`\"/>\n<parameter name=\"field63\" value=\"`$prop.l3vpn.peer2-ip`\"/>\n<parameter name=\"field64\" value=\"`l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field65\" value=\"`$prop.l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field66\" value=\"`l3vpn.vrf2-id`\"/>\n<parameter name=\"field67\" value=\"`$prop.l3vpn.vrf2-id`\"/>\n<parameter name=\"field68\" value=\"`l3vpn.af_type`\"/>\n<parameter name=\"field69\" value=\"`$prop.l3vpn.af_type`\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 719,
-    "y": 985.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 780.03125,
+    "y": 922,
+    "z": "e07ef8ab.015e18",
     "wires": [
       []
     ]
   },
   {
-    "id": "e2132fcb.e54328",
+    "id": "37b4efd2.368ed",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 700,
-    "y": 1131.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 766.03125,
+    "y": 1136,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "fc787a60.02b",
-        "3f2ca116.1448fe",
-        "943ab515.9c9a88"
+        "5f9ac484.077c9c",
+        "c18acb56.b83a78",
+        "cd078531.a90828"
       ]
     ]
   },
   {
-    "id": "fc787a60.02b",
+    "id": "5f9ac484.077c9c",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 655,
-    "y": 1048,
-    "z": "f0bdac73.5c8b08",
+    "x": 721.03125,
+    "y": 1052.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "ef26a584.d90698"
+        "1d6cf5f8.2491ba"
       ]
     ]
   },
   {
-    "id": "3f2ca116.1448fe",
+    "id": "c18acb56.b83a78",
     "type": "outcomeTrue",
     "name": "l3vpn-sptn",
     "xml": "<outcome value='l3vpn-sptn'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 844,
-    "y": 1235,
-    "z": "f0bdac73.5c8b08",
+    "x": 910.03125,
+    "y": 1239.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "ee76e905.760cf"
+        "e7cb4067.6cda1"
       ]
     ]
   },
   {
-    "id": "943ab515.9c9a88",
+    "id": "cd078531.a90828",
     "type": "outcomeTrue",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 840,
-    "y": 1279,
-    "z": "f0bdac73.5c8b08",
+    "x": 906.03125,
+    "y": 1283.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "a1a89b00.18e668"
+        "416a0e63.5f9fd"
       ]
     ]
   },
   {
-    "id": "a1a89b00.18e668",
+    "id": "416a0e63.5f9fd",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Unexpected error retrieving vpn binding\" />\n\n",
     "comments": "",
-    "x": 1023,
-    "y": 1278,
-    "z": "f0bdac73.5c8b08",
+    "x": 1089.03125,
+    "y": 1282.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "c225d084.2fc3d8",
+    "id": "e431fd19.db908",
     "type": "execute",
     "name": "execute vpn-policy2-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vpn-policy2-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 808,
-    "y": 509,
-    "z": "f0bdac73.5c8b08",
+    "x": 874.03125,
+    "y": 513.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "9f4eb3ab.50d678"
+        "e47d8379.95768"
       ]
     ]
   },
   {
-    "id": "9f4eb3ab.50d678",
+    "id": "e47d8379.95768",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1033,
-    "y": 511.9999694824219,
-    "z": "f0bdac73.5c8b08",
+    "x": 1099.03125,
+    "y": 516.9999389648438,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "9e489083.518d3"
+        "40959179.398c3"
       ]
     ]
   },
   {
-    "id": "9e489083.518d3",
+    "id": "40959179.398c3",
     "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 generation vpn policy ID\" />\n",
     "comments": "",
-    "x": 1214,
-    "y": 509.9999694824219,
-    "z": "f0bdac73.5c8b08",
+    "x": 1280.03125,
+    "y": 514.9999389648438,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "6a15cb31.6626a4",
+    "id": "60db19ec.521588",
     "type": "set",
     "name": "set policy entry",
     "xml": "<set>\n<parameter name='prop.l3vpn.entry1-id' value='1' />\n<parameter name='prop.l3vpn.entry2-id' value='1' />\n\n",
     "comments": "",
-    "x": 794,
-    "y": 557,
-    "z": "f0bdac73.5c8b08",
+    "x": 860.03125,
+    "y": 561.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "bc0654d.b4c1928",
+    "id": "d251597.7e75fa8",
     "type": "execute",
     "name": "execute split ac1-route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac1-route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2198,
-    "y": 1207,
-    "z": "f0bdac73.5c8b08",
+    "x": 2264.03125,
+    "y": 1211.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "333b151b.f48562",
-        "f82f2f6f.ba3178"
+        "ae511c3e.94835",
+        "845f5d8b.5aedb"
       ]
     ]
   },
   {
-    "id": "f8750aec.0b434",
+    "id": "3d30a696.2b7b1a",
     "type": "switchNode",
     "name": "switch ac2_route",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_route'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1599,
-    "y": 1255,
-    "z": "f0bdac73.5c8b08",
+    "x": 1665.03125,
+    "y": 1259.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "9b788c28.bb9ff8"
+        "9a5b5bf2.72a888"
       ]
     ]
   },
   {
-    "id": "3493b1b1.d0be5e",
+    "id": "b523547.75bb8a8",
     "type": "switchNode",
     "name": "switch ac1_route",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_route'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1600,
-    "y": 1206,
-    "z": "f0bdac73.5c8b08",
+    "x": 1666.03125,
+    "y": 1210.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "b4e99b4d.04cb9"
+        "9ff44c29.6405d"
       ]
     ]
   },
   {
-    "id": "b4e99b4d.04cb9",
+    "id": "9ff44c29.6405d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1772,
-    "y": 1204,
-    "z": "f0bdac73.5c8b08",
+    "x": 1838.03125,
+    "y": 1208.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "16bee176.348f1f"
+        "2e411316.00315c"
       ]
     ]
   },
   {
-    "id": "9b788c28.bb9ff8",
+    "id": "9a5b5bf2.72a888",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1785,
-    "y": 1263,
-    "z": "f0bdac73.5c8b08",
+    "x": 1851.03125,
+    "y": 1267.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "d1dc0cd3.5bc328"
+        "32e0dd94.666fd2"
       ]
     ]
   },
   {
-    "id": "9133f5.ce552c08",
+    "id": "5f19aec4.6ad74",
     "type": "set",
     "name": "set ac1_route",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac1_route' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2169,
-    "y": 1155,
-    "z": "f0bdac73.5c8b08",
+    "x": 2235.03125,
+    "y": 1159.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "4ee51926.384fd8",
+    "id": "9023cfe1.d4f31",
     "type": "set",
     "name": "set ac2_route",
     "xml": "<set>\n<parameter name='prop.l3vpn.ac2_route' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 2167,
-    "y": 1255,
-    "z": "f0bdac73.5c8b08",
+    "x": 2233.03125,
+    "y": 1259.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "50cad229.565bbc",
+    "id": "41f4f428.bf7e9c",
     "type": "execute",
     "name": "execute split ac2-route",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac2-route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route2\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2191,
-    "y": 1300,
-    "z": "f0bdac73.5c8b08",
+    "x": 2257.03125,
+    "y": 1304.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "322f767c.4c3332",
-        "f711611e.94f868"
+        "4dbe6198.e585d",
+        "a3ddc382.f46b1"
       ]
     ]
   },
   {
-    "id": "16bee176.348f1f",
+    "id": "2e411316.00315c",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1923,
-    "y": 1204,
-    "z": "f0bdac73.5c8b08",
+    "x": 1989.03125,
+    "y": 1208.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "9133f5.ce552c08",
-        "bc0654d.b4c1928"
+        "5f19aec4.6ad74",
+        "d251597.7e75fa8"
       ]
     ]
   },
   {
-    "id": "d1dc0cd3.5bc328",
+    "id": "32e0dd94.666fd2",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1924,
-    "y": 1263,
-    "z": "f0bdac73.5c8b08",
+    "x": 1990.03125,
+    "y": 1267.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "4ee51926.384fd8",
-        "50cad229.565bbc"
+        "9023cfe1.d4f31",
+        "41f4f428.bf7e9c"
       ]
     ]
   },
   {
-    "id": "fdf946de.e32c5",
+    "id": "6a3a805.948d08",
     "type": "execute",
     "name": "execute vrf1-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vrf1-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 793,
-    "y": 610.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 859.03125,
+    "y": 615,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "2a44ccf.3f0eab4"
+        "f9f8e182.59549"
       ]
     ]
   },
   {
-    "id": "c90552d6.d68d2",
+    "id": "77fa32c0.09c32c",
     "type": "execute",
     "name": "execute vrf2-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vrf2-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 790.3333740234375,
-    "y": 667.3332824707031,
-    "z": "f0bdac73.5c8b08",
+    "x": 856.3646240234375,
+    "y": 672.333251953125,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "de0cfccd.b9e3"
+        "b3b56f86.3d1b4"
       ]
     ]
   },
   {
-    "id": "de0cfccd.b9e3",
+    "id": "b3b56f86.3d1b4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1040.3333740234375,
-    "y": 673.3332824707031,
-    "z": "f0bdac73.5c8b08",
+    "x": 1106.3646240234375,
+    "y": 678.333251953125,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "d657f9c0.1d236"
+        "346cd637.94b0aa"
       ]
     ]
   },
   {
-    "id": "2a44ccf.3f0eab4",
+    "id": "f9f8e182.59549",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1040,
-    "y": 614.9999694824219,
-    "z": "f0bdac73.5c8b08",
+    "x": 1106.03125,
+    "y": 619.9999389648438,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "bef436b0.97b6c8"
+        "417e4c2f.a2f9c4"
       ]
     ]
   },
   {
-    "id": "bef436b0.97b6c8",
+    "id": "417e4c2f.a2f9c4",
     "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 generation vpn policy ID\" />\n",
     "comments": "",
-    "x": 1221,
-    "y": 612.9999694824219,
-    "z": "f0bdac73.5c8b08",
+    "x": 1287.03125,
+    "y": 617.9999389648438,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "d657f9c0.1d236",
+    "id": "346cd637.94b0aa",
     "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 generation vpn policy ID\" />\n",
     "comments": "",
-    "x": 1221.3333740234375,
-    "y": 671.3332824707031,
-    "z": "f0bdac73.5c8b08",
+    "x": 1287.3646240234375,
+    "y": 676.333251953125,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "ef26a584.d90698",
+    "id": "1d6cf5f8.2491ba",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 822,
-    "y": 1048,
-    "z": "f0bdac73.5c8b08",
+    "x": 888.03125,
+    "y": 1052.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "ea6e7cc2.759108",
-        "3b2cff3e.76e6d",
-        "ec543af.60d7dc8",
-        "81408502.df9e98"
+        "1fd5d87a.f37a68",
+        "f5fc661b.cec638",
+        "43e96ef8.0066a",
+        "be278e7d.aed"
       ]
     ]
   },
   {
-    "id": "3b2cff3e.76e6d",
+    "id": "f5fc661b.cec638",
     "type": "execute",
     "name": "execute RestApiCallNode IPWAN Site Config",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`\"/>\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=\"site-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smsitetemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`\"/>\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=\"site-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1093,
-    "y": 1098,
-    "z": "f0bdac73.5c8b08",
+    "x": 1165.03125,
+    "y": 1174,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "4a301b10.4617ec",
-        "41cb92ed.fecc84"
+        "52fc73ef.e7aa0c",
+        "b81affca.012b9"
       ]
     ]
   },
   {
-    "id": "ec543af.60d7dc8",
+    "id": "43e96ef8.0066a",
     "type": "execute",
     "name": "execute RestApiCallNode IPWAN VRF Config",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir +'/l3smvrftemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`\"/>\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=\"vrf-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smvrftemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`\"/>\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=\"vrf-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1090,
-    "y": 1171,
-    "z": "f0bdac73.5c8b08",
+    "x": 1145.03125,
+    "y": 1114,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "4a301b10.4617ec",
-        "41cb92ed.fecc84"
+        "52fc73ef.e7aa0c",
+        "b81affca.012b9"
       ]
     ]
   },
   {
-    "id": "333b151b.f48562",
+    "id": "ae511c3e.94835",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2416,
-    "y": 1199,
-    "z": "f0bdac73.5c8b08",
+    "x": 2482.03125,
+    "y": 1203.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "fc1f2aa8.f75b3"
+        "ea661cf9.3185a"
       ]
     ]
   },
   {
-    "id": "fc1f2aa8.f75b3",
+    "id": "ea661cf9.3185a",
     "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": 2597,
-    "y": 1197,
-    "z": "f0bdac73.5c8b08",
+    "x": 2663.03125,
+    "y": 1201.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "322f767c.4c3332",
+    "id": "4dbe6198.e585d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2414,
-    "y": 1301,
-    "z": "f0bdac73.5c8b08",
+    "x": 2480.03125,
+    "y": 1305.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "e94d25cc.c6377"
+        "2064e87c.06ee48"
       ]
     ]
   },
   {
-    "id": "e94d25cc.c6377",
+    "id": "2064e87c.06ee48",
     "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": 2595,
-    "y": 1299,
-    "z": "f0bdac73.5c8b08",
+    "x": 2661.03125,
+    "y": 1303.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "f82f2f6f.ba3178",
+    "id": "845f5d8b.5aedb",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2415,
-    "y": 1133,
-    "z": "f0bdac73.5c8b08",
+    "x": 2481.03125,
+    "y": 1137.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "c5c1b135.242a3"
+        "fe317b98.435f38"
       ]
     ]
   },
   {
-    "id": "f711611e.94f868",
+    "id": "a3ddc382.f46b1",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2411,
-    "y": 1253,
-    "z": "f0bdac73.5c8b08",
+    "x": 2477.03125,
+    "y": 1257.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "c23f470d.b8db08"
+        "c67b184d.c90998"
       ]
     ]
   },
   {
-    "id": "c5c1b135.242a3",
+    "id": "fe317b98.435f38",
     "type": "set",
     "name": "set route1 ip-prefix next-hop",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna1-route.ip-prefix' value='`$route1[0]`' />\n<parameter name='prop.l3vpn.sna1-route.next-hop' value='`$route1[1]`' />\n",
     "comments": "",
-    "x": 2622,
-    "y": 1127,
-    "z": "f0bdac73.5c8b08",
+    "x": 2688.03125,
+    "y": 1131.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "c23f470d.b8db08",
+    "id": "c67b184d.c90998",
     "type": "set",
     "name": "set route2 ip-prefix next-hop",
     "xml": "<set>\n<parameter name='prop.l3vpn.sna2-route.ip-prefix' value='`$route2[0]`' />\n<parameter name='prop.l3vpn.sna2-route.next-hop' value='`$route2[1]`' />",
     "comments": "",
-    "x": 2622,
-    "y": 1246,
-    "z": "f0bdac73.5c8b08",
+    "x": 2688.03125,
+    "y": 1250.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "e0e6781c.4e0188",
+    "id": "cbfd620a.85d71",
     "type": "execute",
     "name": "execute generate-underlay-network-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.network-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 849,
-    "y": 761.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 915.03125,
+    "y": 766,
+    "z": "e07ef8ab.015e18",
     "wires": [
       []
     ]
   },
   {
-    "id": "9875bc60.171298",
+    "id": "37c9fe5c.d39282",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 807,
-    "y": 842.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 873.03125,
+    "y": 847,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "cac4aec8.8232b8",
-        "81a4cd14.cebc38"
+        "e9c16900.4e5438",
+        "e8407f7c.3cfd8"
       ]
     ]
   },
   {
-    "id": "cac4aec8.8232b8",
+    "id": "e9c16900.4e5438",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1080.8095703125,
-    "y": 810.9524230957031,
-    "z": "f0bdac73.5c8b08",
+    "x": 1146.8408203125,
+    "y": 815.952392578125,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "52d26ca7.c68dec"
+        "8caf1520.ea5d28"
       ]
     ]
   },
   {
-    "id": "81a4cd14.cebc38",
+    "id": "e8407f7c.3cfd8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1075.666748046875,
-    "y": 856.6667175292969,
-    "z": "f0bdac73.5c8b08",
+    "x": 1141.697998046875,
+    "y": 861.6666870117188,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "5fb24d6e.9f9c94"
+        "3d0ae0cb.0b75"
       ]
     ]
   },
   {
-    "id": "52d26ca7.c68dec",
+    "id": "8caf1520.ea5d28",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1233.8095703125,
-    "y": 810.5238342285156,
-    "z": "f0bdac73.5c8b08",
+    "x": 1299.8408203125,
+    "y": 815.5238037109375,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "5fb24d6e.9f9c94",
+    "id": "3d0ae0cb.0b75",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1235.2381591796875,
-    "y": 855.5238952636719,
-    "z": "f0bdac73.5c8b08",
+    "x": 1301.2694091796875,
+    "y": 860.5238647460938,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "3a5f6ad2.fcb69e",
+    "id": "bb4e39dc.aefd28",
     "type": "set",
     "name": "set network in service-data",
     "xml": "<set>\n<parameter name=\"service-data.networks.network[$nidx].network-id\" value='`$prop.l3vpn.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\n",
     "comments": "",
-    "x": 721,
-    "y": 1330.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 787.03125,
+    "y": 1335,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "9104517f.7f262",
+    "id": "90e757cc.0959f8",
     "type": "set",
     "name": "set networkId and network-object-path",
     "xml": "<set>\n<parameter name='networkId' value='`$prop.l3vpn.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.l3vpn.network-id  + '/network-data/'` \" />",
     "comments": "",
-    "x": 750,
-    "y": 1375.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 816.03125,
+    "y": 1380,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "cbcd99ce.c72bd8",
+    "id": "8c153068.d865f",
     "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": 697,
-    "y": 1564.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 763.03125,
+    "y": 1569,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "7a9f34e2.0af57c",
+    "id": "b9935276.cc7ee",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\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`' />",
     "comments": "",
-    "x": 723,
-    "y": 1422.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 789.03125,
+    "y": 1427,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "b55f1296.840848",
+    "id": "e891bd7f.8fb2d",
     "type": "get-resource",
     "name": "get-resource pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $prop.l3vpn.pe1_id AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 798,
-    "y": 248.00003051757812,
-    "z": "f0bdac73.5c8b08",
+    "x": 864.03125,
+    "y": 253,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "b5e19965.6c52e8",
-        "b4a31e90.9f841",
-        "2f6c8f95.b1b07"
+        "65bf056c.a7d85c",
+        "fae17ce6.d5a8d",
+        "fdfd8ef.d5d287"
       ]
     ]
   },
   {
-    "id": "b5e19965.6c52e8",
+    "id": "65bf056c.a7d85c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1120,
-    "y": 138.00003051757812,
-    "z": "f0bdac73.5c8b08",
+    "x": 1186.03125,
+    "y": 143,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "a553dc.f2aa0c28"
+        "f138cb6b.a435c8"
       ]
     ]
   },
   {
-    "id": "b4a31e90.9f841",
+    "id": "fae17ce6.d5a8d",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1123.490966796875,
-    "y": 185.57406616210938,
-    "z": "f0bdac73.5c8b08",
+    "x": 1189.522216796875,
+    "y": 190.57403564453125,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "5ffc796f.6a8e6"
+        "922f5f08.50eaa"
       ]
     ]
   },
   {
-    "id": "2f6c8f95.b1b07",
+    "id": "fdfd8ef.d5d287",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1118.823974609375,
-    "y": 226.90737915039062,
-    "z": "f0bdac73.5c8b08",
+    "x": 1184.855224609375,
+    "y": 231.9073486328125,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "258408f4.196188"
+        "c6cd8782.fae7f8"
       ]
     ]
   },
   {
-    "id": "5ffc796f.6a8e6",
+    "id": "922f5f08.50eaa",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1300.0623779296875,
-    "y": 173.85980224609375,
-    "z": "f0bdac73.5c8b08",
+    "x": 1366.0936279296875,
+    "y": 178.85977172851562,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "258408f4.196188",
+    "id": "c6cd8782.fae7f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1306.5965309143066,
-    "y": 222.34657192230225,
-    "z": "f0bdac73.5c8b08",
+    "x": 1372.6277809143066,
+    "y": 227.34654140472412,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "a553dc.f2aa0c28",
+    "id": "f138cb6b.a435c8",
     "type": "set",
     "name": "set tmp.thirdparty-sdnc-id",
     "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 1324,
-    "y": 125.00003051757812,
-    "z": "f0bdac73.5c8b08",
+    "x": 1390.03125,
+    "y": 130,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "5c189e4b.93fcf8",
+    "id": "56419be7.895d24",
     "type": "save",
     "name": "save underlay configuration in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $prop.l3vpn.network-id' >\n<parameter name='configuration-id' value='`$prop.l3vpn.network-id`' />\n<parameter name='configuration-type' value='underlay' />\n<parameter name='orchestration-status' value='Created' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.l3vpn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 742,
-    "y": 1472.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 808.03125,
+    "y": 1477,
+    "z": "e07ef8ab.015e18",
     "wires": [
       []
     ]
   },
   {
-    "id": "6a04e23f.5461dc",
+    "id": "a13270b7.6c1f5",
     "type": "save",
     "name": "save service relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-id' >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"/network/configurations/configuration\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.l3vpn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"configuration.configuration-type\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"underlay\" />",
     "comments": "",
     "outputs": 1,
-    "x": 734,
-    "y": 1518.0000305175781,
-    "z": "f0bdac73.5c8b08",
+    "x": 800.03125,
+    "y": 1523,
+    "z": "e07ef8ab.015e18",
     "wires": [
       []
     ]
   },
   {
-    "id": "4838189c.cc5c2",
+    "id": "a0a289d3.8a3128",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1246.5,
-    "y": 400,
-    "z": "f0bdac73.5c8b08",
-    "wires": [
-      [
-        "3d658710.cc53a",
-        "3ffa7de9.3d22aa",
-        "664b1b62.1edb04",
-        "34505a72.fd91d6",
-        "7e10e5c0.fe770c",
-        "13208c8b.098ffb",
-        "746f494e.5eb71",
-        "234c66fc.f3b94a",
-        "57e3e674.d18598",
-        "b57b62d6.ecd3f8",
-        "19af71a4.6ac59e",
-        "f7634e7a.60329",
-        "ef48199.418d9e8",
-        "bc753ec1.7895e",
-        "68aca326.79a5c4",
-        "4df426f9.add138",
-        "7b807eaa.43ad18",
-        "aeb88291.366bb",
-        "7d79c207.4a89ac",
-        "7b628f48.c22598",
-        "f4a82fcb.89b23",
-        "9f057f5a.21a718",
-        "c28375dc.9cf31",
-        "3493b1b1.d0be5e",
-        "f8750aec.0b434"
-      ]
-    ]
-  },
-  {
-    "id": "81408502.df9e98",
+    "x": 1312.53125,
+    "y": 404.9999694824219,
+    "z": "e07ef8ab.015e18",
+    "wires": [
+      [
+        "8ed22fd9.4d3dc",
+        "efdd2674.739ce8",
+        "f576c53a.7be778",
+        "f5da2a66.76d6a8",
+        "9322169f.7e6468",
+        "41e22f2d.675b9",
+        "fc7aed60.65dde",
+        "3fbbe309.27a1fc",
+        "a2bdcc47.ae6fd",
+        "5ff7d202.bbe52c",
+        "70478129.46c8",
+        "5b2c84b5.c4133c",
+        "5f56629a.41d4bc",
+        "88ead0cd.822bb",
+        "166443d5.94dbbc",
+        "2e267b3e.323f94",
+        "291e6ccb.4ad7e4",
+        "c859e422.4eadc8",
+        "335bcb16.8452b4",
+        "b8ac331e.cf80f",
+        "eddb16e2.7d3ca8",
+        "445b45a7.1c9e2c",
+        "ff841f48.1f039",
+        "b523547.75bb8a8",
+        "3d30a696.2b7b1a"
+      ]
+    ]
+  },
+  {
+    "id": "be278e7d.aed",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 967,
-    "y": 915,
-    "z": "f0bdac73.5c8b08",
+    "x": 1033.03125,
+    "y": 919.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "38a0724b.4de246",
-        "756c4519.f37034"
+        "33fe71db.48126e",
+        "3c08e3ae.fb245c"
       ]
     ]
   },
   {
-    "id": "38a0724b.4de246",
+    "id": "33fe71db.48126e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1202,
-    "y": 893,
-    "z": "f0bdac73.5c8b08",
+    "x": 1268.03125,
+    "y": 897.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "a121e319.bf2cd8"
+        "b2de4cc8.de5ec"
       ]
     ]
   },
   {
-    "id": "756c4519.f37034",
+    "id": "3c08e3ae.fb245c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1194.25,
-    "y": 946.6428833007812,
-    "z": "f0bdac73.5c8b08",
+    "x": 1260.28125,
+    "y": 951.6428527832031,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "e1f11752.4c0f58"
+        "49c53683.778b88"
       ]
     ]
   },
   {
-    "id": "e1f11752.4c0f58",
+    "id": "49c53683.778b88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
     "comments": "",
-    "x": 1347,
-    "y": 946.3929443359375,
-    "z": "f0bdac73.5c8b08",
+    "x": 1413.03125,
+    "y": 951.3929138183594,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "a121e319.bf2cd8",
+    "id": "b2de4cc8.de5ec",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
     "comments": "",
-    "x": 1356,
-    "y": 894,
-    "z": "f0bdac73.5c8b08",
+    "x": 1422.03125,
+    "y": 898.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": []
   },
   {
-    "id": "4a301b10.4617ec",
+    "id": "52fc73ef.e7aa0c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1382,
-    "y": 1066,
-    "z": "f0bdac73.5c8b08",
+    "x": 1448.03125,
+    "y": 1070.9999694824219,
+    "z": "e07ef8ab.015e18",
     "wires": [
       []
     ]
   },
   {
-    "id": "41cb92ed.fecc84",
+    "id": "b81affca.012b9",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1389.25,
-    "y": 1160.642822265625,
-    "z": "f0bdac73.5c8b08",
+    "x": 1455.28125,
+    "y": 1165.6427917480469,
+    "z": "e07ef8ab.015e18",
     "wires": [
       [
-        "ef1bae96.039368"
+        "5c541133.bfa8d"
       ]
     ]
   },
   {
-    "id": "ef1bae96.039368",
+    "id": "5c541133.bfa8d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing 3rd party controller rest api\" />\n",
     "comments": "",
-    "x": 1361,
-    "y": 1345.3929443359375,
-    "z": "f0bdac73.5c8b08",
+    "x": 1427.03125,
+    "y": 1350.3929138183594,
+    "z": "e07ef8ab.015e18",
     "wires": []
+  },
+  {
+    "id": "fb767200.4ff718",
+    "type": "execute",
+    "name": "execute Properties",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 757,
+    "y": 991,
+    "z": "e07ef8ab.015e18",
+    "wires": [
+      []
+    ]
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
index 3cea5298..5d46c148 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "d563afb0.056168",
+    "id": "1bc16ce.3c28013",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 92,
-    "y": 121.33333587646484,
-    "z": "89eca582.be817",
+    "x": 87,
+    "y": 114.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "f7c87a2f.fb9cf"
+        "97da490c.021388"
       ]
     ]
   },
   {
-    "id": "f7c87a2f.fb9cf",
+    "id": "97da490c.021388",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,877 +22,892 @@
     "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": 304.00000381469727,
-    "y": 193.33335304260254,
-    "z": "89eca582.be817",
+    "x": 299.00000381469727,
+    "y": 186.11100959777832,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "37f24cdb.d75cb4"
+        "3dca7f57.a19ca8"
       ]
     ]
   },
   {
-    "id": "37f24cdb.d75cb4",
+    "id": "3dca7f57.a19ca8",
     "type": "method",
     "name": "method network-topology-operation-delete",
     "xml": "<method rpc='network-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 292.0001220703125,
-    "y": 281.33333587646484,
-    "z": "89eca582.be817",
+    "x": 287.0001220703125,
+    "y": 274.1109924316406,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "968f84c1.36e27"
+        "2917b139.6003be"
       ]
     ]
   },
   {
-    "id": "968f84c1.36e27",
+    "id": "2917b139.6003be",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 568.0000305175781,
-    "y": 289.3333492279053,
-    "z": "89eca582.be817",
+    "x": 563.0000305175781,
+    "y": 282.11100578308105,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "ae3d965a.4a7378",
-        "b83c4e05.5eb538",
-        "fc04e5a4.52eb5",
-        "a964f2cc.8cf37",
-        "92a504dc.ec13d8",
-        "229c0a0d.36236e",
-        "5b36b323.b34d7c",
-        "6331818b.c6bfc",
-        "e6735147.08a6d8"
+        "93de9a8e.85cd28",
+        "8a99a44.0aea6d8",
+        "b9e067fb.af43c8",
+        "8f63fe5a.ce23c",
+        "6e9a7fc8.6e80c8",
+        "4f853de5.1d70d4",
+        "80aa2c3b.44b74",
+        "c6199aa8.b4cf08",
+        "cd746090.90a5a",
+        "e9b167f.6457618"
       ]
     ]
   },
   {
-    "id": "ae3d965a.4a7378",
+    "id": "93de9a8e.85cd28",
     "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": 889,
-    "y": 72.33333587646484,
-    "z": "89eca582.be817",
+    "x": 884,
+    "y": 65.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       []
     ]
   },
   {
-    "id": "b83c4e05.5eb538",
+    "id": "8a99a44.0aea6d8",
     "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 = $tmp.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 833,
-    "y": 517.3333053588867,
-    "z": "89eca582.be817",
+    "x": 828,
+    "y": 510.1109619140625,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "3ddcae6d.d600c2",
-        "8879d867.b4938",
-        "24d0dda7.8f860a"
+        "3ab5ee96.e1d5ea",
+        "5289c8c7.4bcd4",
+        "756a44de.032acc"
       ]
     ]
   },
   {
-    "id": "3ddcae6d.d600c2",
+    "id": "3ab5ee96.e1d5ea",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1071,
-    "y": 473.33333587646484,
-    "z": "89eca582.be817",
+    "x": 1066,
+    "y": 466.1109924316406,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "2875c9d1.a679ce"
+        "e5229a2a.d65d6"
       ]
     ]
   },
   {
-    "id": "8879d867.b4938",
+    "id": "5289c8c7.4bcd4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1075.490966796875,
-    "y": 514.9074020385742,
-    "z": "89eca582.be817",
+    "x": 1070.490966796875,
+    "y": 507.68505859375,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "2fdf1df8.d37b9a"
+        "84a50f20.350108"
       ]
     ]
   },
   {
-    "id": "24d0dda7.8f860a",
+    "id": "756a44de.032acc",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1068.823974609375,
-    "y": 566.2406539916992,
-    "z": "89eca582.be817",
+    "x": 1063.823974609375,
+    "y": 559.018310546875,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "d6d9101d.068098"
+        "ad52005e.b9cf1"
       ]
     ]
   },
   {
-    "id": "2fdf1df8.d37b9a",
+    "id": "84a50f20.350108",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Network model is_bound_to_vpn=true but no vpn_binding is present\" />\n\n",
     "comments": "",
-    "x": 1251.0623779296875,
-    "y": 513.1931076049805,
-    "z": "89eca582.be817",
+    "x": 1246.0623779296875,
+    "y": 505.97076416015625,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "d6d9101d.068098",
+    "id": "ad52005e.b9cf1",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Unexpected error retrieving vpn binding\" />\n\n",
     "comments": "",
-    "x": 1229.5965576171875,
-    "y": 564.6798629760742,
-    "z": "89eca582.be817",
+    "x": 1224.5965576171875,
+    "y": 557.45751953125,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "fc04e5a4.52eb5",
+    "id": "b9e067fb.af43c8",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 851,
-    "y": 250.33333587646484,
-    "z": "89eca582.be817",
+    "x": 846,
+    "y": 243.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "21f32325.9d7694"
+        "dba902b2.65b6e"
       ]
     ]
   },
   {
-    "id": "21f32325.9d7694",
+    "id": "dba902b2.65b6e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1132.8333740234375,
-    "y": 228.66667938232422,
-    "z": "89eca582.be817",
+    "x": 1127.8333740234375,
+    "y": 221.4443359375,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "15f7b5bc.24b652",
-        "58a03af6.4686fc",
-        "83edb691.4ecc08"
+        "6dbc1962.e67808",
+        "a7f93024.722988",
+        "84a77140.b8364"
       ]
     ]
   },
   {
-    "id": "15f7b5bc.24b652",
+    "id": "6dbc1962.e67808",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1341,
-    "y": 189.33333587646484,
-    "z": "89eca582.be817",
+    "x": 1336,
+    "y": 182.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "57533497.32b74c"
+        "5945c6d2.51585"
       ]
     ]
   },
   {
-    "id": "57533497.32b74c",
+    "id": "5945c6d2.51585",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1528,
-    "y": 189.33333587646484,
-    "z": "89eca582.be817",
+    "x": 1523,
+    "y": 182.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "636e0cba.4ad824"
+        "7ba84df2.2f3aec"
       ]
     ]
   },
   {
-    "id": "636e0cba.4ad824",
+    "id": "7ba84df2.2f3aec",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.l3vpn.name' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1696,
-    "y": 189.93334197998047,
-    "z": "89eca582.be817",
+    "x": 1691,
+    "y": 182.71099853515625,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "58a03af6.4686fc",
+    "id": "a7f93024.722988",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1346,
-    "y": 243.93331146240234,
-    "z": "89eca582.be817",
+    "x": 1341,
+    "y": 236.71096801757812,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "49b85e52.02df98"
+        "24243087.264e7"
       ]
     ]
   },
   {
-    "id": "49b85e52.02df98",
+    "id": "24243087.264e7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1529.9999389648438,
-    "y": 248.93331146240234,
-    "z": "89eca582.be817",
+    "x": 1524.9999389648438,
+    "y": 241.71096801757812,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "8bbe0d91.97e45"
+        "4b08822f.ede664"
       ]
     ]
   },
   {
-    "id": "8bbe0d91.97e45",
+    "id": "4b08822f.ede664",
     "type": "set",
     "name": "set service-type",
     "xml": "<set>\n<parameter name='prop.l3vpn.service-type' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1698.9999389648438,
-    "y": 246.93331146240234,
-    "z": "89eca582.be817",
+    "x": 1693.9999389648438,
+    "y": 239.71096801757812,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "2875c9d1.a679ce",
+    "id": "e5229a2a.d65d6",
     "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.esr-system-info[0].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.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].serviceUrl`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
     "comments": "",
-    "x": 1257,
-    "y": 470.3333053588867,
-    "z": "89eca582.be817",
+    "x": 1252,
+    "y": 463.1109619140625,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "e7464274.0f82b8",
+    "id": "8892b470.2ab318",
     "type": "execute",
     "name": "execute REST DELETE VPN",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice=' + $prop.l3vpn.name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice=' + $prop.l3vpn.name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1579,
-    "y": 685.3333129882812,
-    "z": "89eca582.be817",
+    "x": 1574,
+    "y": 678.110969543457,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "9b0fa013.788a28",
-        "19c42608.424b9a"
+        "6ace128e.38bbf4",
+        "e03ea1f6.8ae24"
       ]
     ]
   },
   {
-    "id": "a964f2cc.8cf37",
+    "id": "8f63fe5a.ce23c",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 792,
-    "y": 621.3333358764648,
-    "z": "89eca582.be817",
+    "x": 787,
+    "y": 614.1109924316406,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "93ec2320.02d11"
+        "cf2b0eea.34d2e"
       ]
     ]
   },
   {
-    "id": "93ec2320.02d11",
+    "id": "cf2b0eea.34d2e",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1049,
-    "y": 622.3333129882812,
-    "z": "89eca582.be817",
+    "x": 1044,
+    "y": 615.110969543457,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "4e922d10.8ba70c"
+        "46db16ed.796608"
       ]
     ]
   },
   {
-    "id": "92a504dc.ec13d8",
+    "id": "6e9a7fc8.6e80c8",
     "type": "switchNode",
     "name": "switch service-data.networks.network_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 831,
-    "y": 145.33333587646484,
-    "z": "89eca582.be817",
+    "x": 826,
+    "y": 138.11099243164062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "8e028d38.9057d",
-        "c340ac4a.71f85"
+        "53ed314.a330f5",
+        "eeed55fd.c22298"
       ]
     ]
   },
   {
-    "id": "8e028d38.9057d",
+    "id": "53ed314.a330f5",
     "type": "other",
     "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1276,
-    "y": 71.3333969116211,
-    "z": "89eca582.be817",
+    "x": 1271,
+    "y": 64.11105346679688,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "ac7b7cef.c3a35"
+        "7b50ad9a.577e8c"
       ]
     ]
   },
   {
-    "id": "ac7b7cef.c3a35",
+    "id": "7b50ad9a.577e8c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1466.7774658203125,
-    "y": 58.22234344482422,
-    "z": "89eca582.be817",
+    "x": 1461.7774658203125,
+    "y": 51,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "c340ac4a.71f85",
+    "id": "eeed55fd.c22298",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1160.0003662109375,
-    "y": 136.33341217041016,
-    "z": "89eca582.be817",
+    "x": 1155.0003662109375,
+    "y": 129.11106872558594,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "8cbfe4b9.2a2368"
+        "29041a71.02b546"
       ]
     ]
   },
   {
-    "id": "8cbfe4b9.2a2368",
+    "id": "29041a71.02b546",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1331.2698974609375,
-    "y": 119.88794708251953,
-    "z": "89eca582.be817",
+    "x": 1326.2698974609375,
+    "y": 112.66560363769531,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "7a7f5cb9.3ef364",
-        "89dd7f04.eed92"
+        "3af5398b.f7aa0e",
+        "4821e95f.09e458"
       ]
     ]
   },
   {
-    "id": "7a7f5cb9.3ef364",
+    "id": "3af5398b.f7aa0e",
     "type": "for",
     "name": "for nidx..service-data.networks.network[]",
     "xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1629.285888671875,
-    "y": 100.76195526123047,
-    "z": "89eca582.be817",
+    "x": 1624.285888671875,
+    "y": 93.53961181640625,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "b49be6d2.09dbc8"
+        "21827fa6.3c3c7"
       ]
     ]
   },
   {
-    "id": "89dd7f04.eed92",
+    "id": "4821e95f.09e458",
     "type": "switchNode",
     "name": "switch tmp.nidx ",
     "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1550.5872802734375,
-    "y": 143.7451400756836,
-    "z": "89eca582.be817",
+    "x": 1545.5872802734375,
+    "y": 136.52279663085938,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "ab419b0d.e9521"
+        "4af90ffc.0818b"
       ]
     ]
   },
   {
-    "id": "ab419b0d.e9521",
+    "id": "4af90ffc.0818b",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1751.015869140625,
-    "y": 149.3165512084961,
-    "z": "89eca582.be817",
+    "x": 1746.015869140625,
+    "y": 142.09420776367188,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "8e89ca22.c1f468"
+        "98ba5173.0d34e"
       ]
     ]
   },
   {
-    "id": "b49be6d2.09dbc8",
+    "id": "21827fa6.3c3c7",
     "type": "switchNode",
     "name": "switch networkid found",
     "xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1939.7144775390625,
-    "y": 99.01204681396484,
-    "z": "89eca582.be817",
+    "x": 1934.7144775390625,
+    "y": 91.78970336914062,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "92fa60c6.e61928"
+        "22099867.c65e3"
       ]
     ]
   },
   {
-    "id": "8e89ca22.c1f468",
+    "id": "98ba5173.0d34e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1922.4443359375,
-    "y": 149.45940399169922,
-    "z": "89eca582.be817",
+    "x": 1917.4443359375,
+    "y": 142.237060546875,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "92fa60c6.e61928",
+    "id": "22099867.c65e3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2145.666748046875,
-    "y": 97.90477752685547,
-    "z": "89eca582.be817",
+    "x": 2140.666748046875,
+    "y": 90.68243408203125,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "13e93e78.dc98f2"
+        "44687f12.3eae5"
       ]
     ]
   },
   {
-    "id": "13e93e78.dc98f2",
+    "id": "44687f12.3eae5",
     "type": "set",
     "name": "set tmp.nidx and ctx.network-data",
     "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
     "comments": "",
-    "x": 2384.198486328125,
-    "y": 93.65477752685547,
-    "z": "89eca582.be817",
+    "x": 2379.198486328125,
+    "y": 86.43243408203125,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "229c0a0d.36236e",
+    "id": "4f853de5.1d70d4",
     "type": "block",
     "name": "block : saveNetworkData",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 810,
-    "y": 711.3333358764648,
-    "z": "89eca582.be817",
+    "x": 805,
+    "y": 704.1109924316406,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "2f2a571f.f701d8",
-        "ad0ac3a3.801d88",
-        "3a891d55.fcf27a",
-        "4dbcadac.7cacd4"
+        "191edb15.f0a32d",
+        "7bfb16ed.b031d8",
+        "3a334836.fa7ed",
+        "cc07591b.5791f"
       ]
     ]
   },
   {
-    "id": "5b36b323.b34d7c",
+    "id": "80aa2c3b.44b74",
     "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": 762.6665649414062,
-    "y": 929.666618347168,
-    "z": "89eca582.be817",
+    "x": 757.6665649414062,
+    "y": 922.4442749023438,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "3a891d55.fcf27a",
+    "id": "3a334836.fa7ed",
     "type": "set",
     "name": "copy input to service-data",
     "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n",
     "comments": "",
-    "x": 1103.0000076293945,
-    "y": 691.6666479110718,
-    "z": "89eca582.be817",
+    "x": 1098.0000076293945,
+    "y": 684.4443044662476,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "2f2a571f.f701d8",
+    "id": "191edb15.f0a32d",
     "type": "set",
     "name": "set networkId",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
     "comments": "",
-    "x": 1067.2895622253418,
-    "y": 735.3844947814941,
-    "z": "89eca582.be817",
+    "x": 1062.2895622253418,
+    "y": 728.1621513366699,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "ad0ac3a3.801d88",
+    "id": "7bfb16ed.b031d8",
     "type": "set",
     "name": "set object-path",
     "xml": "<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/'` \" />\n \n",
     "comments": "",
-    "x": 1073.0039291381836,
-    "y": 772.5273866653442,
-    "z": "89eca582.be817",
+    "x": 1068.0039291381836,
+    "y": 765.30504322052,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "4dbcadac.7cacd4",
+    "id": "cc07591b.5791f",
     "type": "set",
     "name": "set network-level-oper-status",
     "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Deleted' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
     "comments": "",
-    "x": 1116.9999389648438,
-    "y": 819.6666059494019,
-    "z": "89eca582.be817",
+    "x": 1111.9999389648438,
+    "y": 812.4442625045776,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "6331818b.c6bfc",
+    "id": "c6199aa8.b4cf08",
     "type": "get-resource",
     "name": "get-resource pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $prop.l3vpn.pe1_id AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 789,
-    "y": 395.2223434448242,
-    "z": "89eca582.be817",
+    "x": 784,
+    "y": 388,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "2c36397a.e13af6",
-        "81511490.7b5318",
-        "8ef29169.d30308"
+        "eb78427.8aeffc",
+        "9468b1f6.acd4a8",
+        "8869b2de.4cd318"
       ]
     ]
   },
   {
-    "id": "2c36397a.e13af6",
+    "id": "eb78427.8aeffc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 983,
-    "y": 333.2223434448242,
-    "z": "89eca582.be817",
+    "x": 978,
+    "y": 326,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "69eaa950.7e3dd"
+        "68cda5fa.8580d4"
       ]
     ]
   },
   {
-    "id": "81511490.7b5318",
+    "id": "9468b1f6.acd4a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 992.490966796875,
-    "y": 375.79637908935547,
-    "z": "89eca582.be817",
+    "x": 987.490966796875,
+    "y": 368.57403564453125,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "a2279b64.597d58"
+        "f68a2741.7b13e"
       ]
     ]
   },
   {
-    "id": "8ef29169.d30308",
+    "id": "8869b2de.4cd318",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 985.823974609375,
-    "y": 424.1296920776367,
-    "z": "89eca582.be817",
+    "x": 980.823974609375,
+    "y": 416.9073486328125,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "48d06926.05169"
+        "ff173828.c81cc"
       ]
     ]
   },
   {
-    "id": "a2279b64.597d58",
+    "id": "f68a2741.7b13e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1178.0623779296875,
-    "y": 377.08211517333984,
-    "z": "89eca582.be817",
+    "x": 1173.0623779296875,
+    "y": 369.8597717285156,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "48d06926.05169",
+    "id": "ff173828.c81cc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1174.5965576171875,
-    "y": 427.5688705444336,
-    "z": "89eca582.be817",
+    "x": 1169.5965576171875,
+    "y": 420.3465270996094,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "69eaa950.7e3dd",
+    "id": "68cda5fa.8580d4",
     "type": "set",
     "name": "set tmp.thirdparty-sdnc-id",
     "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 1197,
-    "y": 329.2223434448242,
-    "z": "89eca582.be817",
+    "x": 1192,
+    "y": 322,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "83edb691.4ecc08",
+    "id": "84a77140.b8364",
     "type": "switchNode",
     "name": "switch pe1_id",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'pe1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1348,
-    "y": 290.2223434448242,
-    "z": "89eca582.be817",
+    "x": 1343,
+    "y": 283,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "6271005d.f22478"
+        "16fa329d.f3dce5"
       ]
     ]
   },
   {
-    "id": "6271005d.f22478",
+    "id": "16fa329d.f3dce5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1534,
-    "y": 299.2223434448242,
-    "z": "89eca582.be817",
+    "x": 1529,
+    "y": 292,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "170629d3.536056"
+        "b53db17c.0ef078"
       ]
     ]
   },
   {
-    "id": "170629d3.536056",
+    "id": "b53db17c.0ef078",
     "type": "set",
     "name": "set pe1_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.pe1_id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1717,
-    "y": 303.2223434448242,
-    "z": "89eca582.be817",
+    "x": 1712,
+    "y": 296,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "e6735147.08a6d8",
+    "id": "cd746090.90a5a",
     "type": "delete",
     "name": "delete underlay configuration in AAI",
     "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 820,
-    "y": 857.2223434448242,
-    "z": "89eca582.be817",
+    "x": 815,
+    "y": 850,
+    "z": "e87b72fe.07c73",
     "wires": [
       []
     ]
   },
   {
-    "id": "390c3473.62cfd4",
+    "id": "599b3e84.010d1",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1602,
-    "y": 613,
-    "z": "89eca582.be817",
+    "x": 1597,
+    "y": 605.7776565551758,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "114e384f.cecfb8",
-        "a016d52e.8ce4a8"
+        "d3f6644d.349f88",
+        "3ae81ceb.b03874"
       ]
     ]
   },
   {
-    "id": "114e384f.cecfb8",
+    "id": "d3f6644d.349f88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1842,
-    "y": 576,
-    "z": "89eca582.be817",
+    "x": 1837,
+    "y": 568.7776565551758,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "600363c2.6867f4"
+        "7b5e645e.7d6674"
       ]
     ]
   },
   {
-    "id": "a016d52e.8ce4a8",
+    "id": "3ae81ceb.b03874",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1849.25,
-    "y": 642.6428833007812,
-    "z": "89eca582.be817",
+    "x": 1844.25,
+    "y": 635.420539855957,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "e5ef3b3f.f1e878"
+        "50b8cd7f.3d5c64"
       ]
     ]
   },
   {
-    "id": "e5ef3b3f.f1e878",
+    "id": "50b8cd7f.3d5c64",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
     "comments": "",
-    "x": 2030,
-    "y": 641.3929443359375,
-    "z": "89eca582.be817",
+    "x": 2025,
+    "y": 634.1706008911133,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "600363c2.6867f4",
+    "id": "7b5e645e.7d6674",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
     "comments": "",
-    "x": 2027,
-    "y": 573,
-    "z": "89eca582.be817",
+    "x": 2022,
+    "y": 565.7776565551758,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "9b0fa013.788a28",
+    "id": "6ace128e.38bbf4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1799,
-    "y": 698,
-    "z": "89eca582.be817",
+    "x": 1794,
+    "y": 690.7776565551758,
+    "z": "e87b72fe.07c73",
     "wires": [
       []
     ]
   },
   {
-    "id": "19c42608.424b9a",
+    "id": "e03ea1f6.8ae24",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1800.25,
-    "y": 761.642822265625,
-    "z": "89eca582.be817",
+    "x": 1795.25,
+    "y": 754.4204788208008,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "6961c23b.26892c"
+        "2b054857.56f558"
       ]
     ]
   },
   {
-    "id": "6961c23b.26892c",
+    "id": "2b054857.56f558",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing 3rd party controller rest api\" />\n",
     "comments": "",
-    "x": 1966,
-    "y": 764.3929443359375,
-    "z": "89eca582.be817",
+    "x": 1961,
+    "y": 757.1706008911133,
+    "z": "e87b72fe.07c73",
     "wires": []
   },
   {
-    "id": "4e922d10.8ba70c",
+    "id": "46db16ed.796608",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1273,
-    "y": 624,
-    "z": "89eca582.be817",
+    "x": 1268,
+    "y": 616.7776565551758,
+    "z": "e87b72fe.07c73",
     "wires": [
       [
-        "390c3473.62cfd4",
-        "e7464274.0f82b8"
+        "599b3e84.010d1",
+        "8892b470.2ab318"
       ]
     ]
+  },
+  {
+    "id": "e9b167f.6457618",
+    "type": "execute",
+    "name": "execute Properties",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 798,
+    "y": 564,
+    "z": "e87b72fe.07c73",
+    "wires": [
+      []
+    ]
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index 7f4eb8ff..c0046db3 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -153,7 +153,6 @@
                             <outcome value="success">

                                 <set>

                                     <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />

-                                    <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />

                                     <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />

                                     <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />

                                 </set>

@@ -171,6 +170,10 @@
                                 </return>

                             </outcome>

                         </get-resource>

+                        <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">

+                            <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties" />

+                            <parameter name="contextPrefix" value="prop" />

+                        </execute>

                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

                             <parameter name="logger" value="message-log" />

                             <parameter name="field1" value="__TIMESTAMP__" />

@@ -184,27 +187,48 @@
                             <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />

                             <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />

                         </record>

+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />

+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />

+                            <parameter name="format" value="json" />

+                            <parameter name="httpMethod" value="post" />

+                            <parameter name="responsePrefix" value="token-result" />

+                            <outcome value="success">

+                                <set>

+                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />

+                                </set>

+                            </outcome>

+                            <outcome value="failure">

+                                <return status="failure">

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

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

+                                    <parameter name="error-message" value="Error executing get token rest api" />

+                                </return>

+                            </outcome>

+                        </execute>

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

                             <outcome value="L3-DCI">

                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3-dci-connects-template.json'`" />

+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3-dci-connects-template.json'`" />

                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />

                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

                                     <parameter name="format" value="json" />

                                     <parameter name="httpMethod" value="post" />

                                     <parameter name="responsePrefix" value="restapi-result" />

+                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                                 </execute>

                             </outcome>

                             <outcome value="L2-DCI">

                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l2-dci-connects-template.json'`" />

+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l2-dci-connects-template.json'`" />

                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />

                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

                                     <parameter name="format" value="json" />

                                     <parameter name="httpMethod" value="post" />

                                     <parameter name="responsePrefix" value="restapi-result" />

+                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                                 </execute>

                             </outcome>

                         </switch>

@@ -350,7 +374,6 @@
                             <outcome value="success">

                                 <set>

                                     <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />

-                                    <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />

                                     <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />

                                     <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />

                                 </set>

@@ -368,6 +391,10 @@
                                 </return>

                             </outcome>

                         </get-resource>

+                        <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">

+                            <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties" />

+                            <parameter name="contextPrefix" value="prop" />

+                        </execute>

                         <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

                             <parameter name="logger" value="message-log" />

                             <parameter name="field1" value="__TIMESTAMP__" />

@@ -381,27 +408,48 @@
                             <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />

                             <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />

                         </record>

+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />

+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />

+                            <parameter name="format" value="json" />

+                            <parameter name="httpMethod" value="post" />

+                            <parameter name="responsePrefix" value="token-result" />

+                            <outcome value="success">

+                                <set>

+                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />

+                                </set>

+                            </outcome>

+                            <outcome value="failure">

+                                <return status="failure">

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

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

+                                    <parameter name="error-message" value="Error executing get token rest api" />

+                                </return>

+                            </outcome>

+                        </execute>

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

                             <outcome value="L3-DCI">

                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3-dci-connects-template.json'`" />

+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3-dci-connects-template.json'`" />

                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />

                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

                                     <parameter name="format" value="json" />

                                     <parameter name="httpMethod" value="post" />

                                     <parameter name="responsePrefix" value="restapi-result" />

+                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                                 </execute>

                             </outcome>

                             <outcome value="L2-DCI">

                                 <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l2-dci-connects-template.json'`" />

+                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l2-dci-connects-template.json'`" />

                                     <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />

                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

                                     <parameter name="format" value="json" />

                                     <parameter name="httpMethod" value="post" />

                                     <parameter name="responsePrefix" value="restapi-result" />

+                                    <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                                 </execute>

                             </outcome>

                         </switch>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
index 251f1b40..1883baf8 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
@@ -45,6 +45,10 @@
                      </return>

                   </outcome>

                </get-resource>

+               <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">

+                  <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties" />

+                  <parameter name="contextPrefix" value="prop" />

+               </execute>

                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

                   <parameter name="logger" value="message-log" />

                   <parameter name="field1" value="__TIMESTAMP__" />

@@ -58,6 +62,25 @@
                   <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />

                   <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />

                </record>

+               <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

+                  <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />

+                  <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />

+                  <parameter name="format" value="json" />

+                  <parameter name="httpMethod" value="post" />

+                  <parameter name="responsePrefix" value="token-result" />

+                  <outcome value="success">

+                     <set>

+                        <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />

+                     </set>

+                  </outcome>

+                  <outcome value="failure">

+                     <return status="failure">

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

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

+                        <parameter name="error-message" value="Error executing get token rest api" />

+                     </return>

+                  </outcome>

+               </execute>

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

                   <outcome value="L3-DCI">

                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

@@ -67,6 +90,7 @@
                         <parameter name="format" value="json" />

                         <parameter name="httpMethod" value="delete" />

                         <parameter name="responsePrefix" value="restapi-result" />

+                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                      </execute>

                   </outcome>

                   <outcome value="L2-DCI">

@@ -77,6 +101,7 @@
                         <parameter name="format" value="json" />

                         <parameter name="httpMethod" value="delete" />

                         <parameter name="responsePrefix" value="restapi-result" />

+                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                      </execute>

                   </outcome>

                </switch>

@@ -117,6 +142,10 @@
                      </return>

                   </outcome>

                </get-resource>

+               <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">

+                  <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties" />

+                  <parameter name="contextPrefix" value="prop" />

+               </execute>

                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">

                   <parameter name="logger" value="message-log" />

                   <parameter name="field1" value="__TIMESTAMP__" />

@@ -130,6 +159,25 @@
                   <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />

                   <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />

                </record>

+               <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

+                  <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />

+                  <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />

+                  <parameter name="format" value="json" />

+                  <parameter name="httpMethod" value="post" />

+                  <parameter name="responsePrefix" value="token-result" />

+                  <outcome value="success">

+                     <set>

+                        <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />

+                     </set>

+                  </outcome>

+                  <outcome value="failure">

+                     <return status="failure">

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

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

+                        <parameter name="error-message" value="Error executing get token rest api" />

+                     </return>

+                  </outcome>

+               </execute>

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

                   <outcome value="L3-DCI">

                      <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

@@ -139,6 +187,7 @@
                         <parameter name="format" value="json" />

                         <parameter name="httpMethod" value="delete" />

                         <parameter name="responsePrefix" value="restapi-result" />

+                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                      </execute>

                   </outcome>

                   <outcome value="L2-DCI">

@@ -149,6 +198,7 @@
                         <parameter name="format" value="json" />

                         <parameter name="httpMethod" value="delete" />

                         <parameter name="responsePrefix" value="restapi-result" />

+                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                      </execute>

                   </outcome>

                </switch>

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
index a04d924a..76a52b58 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
@@ -247,7 +247,6 @@
                 <outcome value="success">

                     <set>

                         <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />

-                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />

                         <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />

                         <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />

                     </set>

@@ -394,11 +393,15 @@
                 <parameter name="field68" value="`l3vpn.af_type`" />

                 <parameter name="field69" value="`$prop.l3vpn.af_type`" />

             </record>

+            <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">

+                <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties" />

+                <parameter name="contextPrefix" value="prop" />

+            </execute>

             <switch test="`$prop.l3vpn.service-type`">

                 <outcome value="l3vpn-ipwan">

                     <block atomic="true">

                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir + '/actokentemplate.json'`" />

+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />

                             <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />

                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

@@ -417,7 +420,7 @@
                             </outcome>

                         </execute>

                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir + '/l3smvpntemplate.json'`" />

+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/l3smvpntemplate.json'`" />

                             <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'`" />

                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

@@ -435,13 +438,13 @@
                             </outcome>

                         </execute>

                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'`" />

-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`" />

+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3smvrftemplate.json'`" />

+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`" />

                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

-                            <parameter name="responsePrefix" value="site-result" />

+                            <parameter name="responsePrefix" value="vrf-result" />

                             <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                             <outcome value="success" />

                             <outcome value="failure">

@@ -453,13 +456,13 @@
                             </outcome>

                         </execute>

                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir +'/l3smvrftemplate.json'`" />

-                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`" />

+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3smsitetemplate.json'`" />

+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`" />

                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

-                            <parameter name="responsePrefix" value="vrf-result" />

+                            <parameter name="responsePrefix" value="site-result" />

                             <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />

                             <outcome value="success" />

                             <outcome value="failure">

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
index d4d41943..87deaa5d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml
@@ -85,7 +85,6 @@
                 <outcome value="success">

                     <set>

                         <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].serviceUrl`" />

-                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />

                         <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />

                         <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />

                     </set>

@@ -105,11 +104,15 @@
                     </return>

                 </outcome>

             </get-resource>

+            <execute plugin="org.onap.ccsdk.sli.plugins.prop.PropertiesNode" method="readProperties">

+                <parameter name="fileName" value="%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties" />

+                <parameter name="contextPrefix" value="prop" />

+            </execute>

             <switch test="`$prop.l3vpn.service-type`">

                 <outcome value="l3vpn-ipwan">

                     <block atomic="true">

                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.templateDir + '/actokentemplate.json'`" />

+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/actokentemplate.json'`" />

                             <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`" />

                             <parameter name="format" value="json" />

                             <parameter name="httpMethod" value="post" />

@@ -128,7 +131,7 @@
                             </outcome>

                         </execute>

                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">

-                            <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3smvpntemplate.json'`" />

+                            <parameter name="templateFileName" value="`$prop.restapi.templateDir +'/l3smvpntemplate.json'`" />

                             <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice=' + $prop.l3vpn.name`" />

                             <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />

                             <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />

diff --git a/platform-logic/restapi-templates/src/main/json/actokentemplate.json b/platform-logic/restapi-templates/src/main/json/actokentemplate.json
new file mode 100644
index 00000000..31bf0ee2
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/actokentemplate.json
@@ -0,0 +1,25 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+{
+  "userName": ${prop.sdncRestApi.thirdpartySdnc.user},
+  "password": ${prop.sdncRestApi.thirdpartySdnc.password}
+}
diff --git a/platform-logic/restapi-templates/src/main/json/l2-dci-connects-template.json b/platform-logic/restapi-templates/src/main/json/l2-dci-connects-template.json
new file mode 100644
index 00000000..f1807568
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/l2-dci-connects-template.json
@@ -0,0 +1,29 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : SDN-C
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+{
+  "l2-dci-connect": {
+    "id": ${prop.dci-connects.id},
+    "name": ${prop.dci-connects.name},
+    "description": ${prop.dci-connects.description},
+    "network_id": ${prop.dci-connects.local_networks[0]},
+    "evpn_irts": ${prop.dci-connects.evpn_irts},
+    "evpn_erts": ${prop.dci-connects.evpn_erts},
+    "vni": ${prop.dci-connects.vni}
+  }
+}
diff --git a/platform-logic/restapi-templates/src/main/json/l3-dci-connects-template.json b/platform-logic/restapi-templates/src/main/json/l3-dci-connects-template.json
new file mode 100644
index 00000000..c011b077
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/l3-dci-connects-template.json
@@ -0,0 +1,34 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 Intel Corp. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+{
+  "l3-dci-connect": {
+    "id": ${prop.dci-connects.id},
+    "name": ${prop.dci-connects.name},
+    "description": ${prop.dci-connects.description},
+    "router_id": ${prop.dci-connects.router_id},
+    "firewall_enable": false,
+    "local_networks": ${prop.dci-connects.local_networks},
+    "local_network_all": false,
+    "evpn_irts": ${prop.dci-connects.evpn_irts},
+    "evpn_erts": ${prop.dci-connects.evpn_erts},
+    "l3_vni": ${prop.dci-connects.vni}
+  }
+}
diff --git a/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json b/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json
new file mode 100644
index 00000000..016879c3
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/l3smsitetemplate.json
@@ -0,0 +1,183 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+{
+  "site":[
+  {
+  "site-id": ${prop.l3vpn.site1_name},
+  "vpn-policies": {
+    "vpn-policy": [
+      {
+        "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id},
+        "entries": [
+          {
+            "id": ${prop.l3vpn.entry1-id},
+            "vpn": {
+              "vpn-id": ${prop.l3vpn.name},
+              "site-role": "huawei-ac-net-l3vpn-svc:any-to-any-role"
+            }
+          }
+        ]
+      }
+    ]
+  },
+  "site-network-accesses": {
+    "site-network-access": [
+      {
+        "site-network-access-id": ${prop.l3vpn.sna1_name},
+        "bearer": {
+          "appointed-access": {
+            "ne-id": ${prop.l3vpn.pe1_id},
+            "ltp-id": ${prop.l3vpn.ac1_id},
+            "vlan": {
+              "type": "huawei-ac-net-l3vpn-svc:vlan-dot1q",
+              "vlan-id": ${prop.l3vpn.sna1_svlan}
+            }
+          }
+        },
+        "ip-connection": {
+          "ipv4": {
+            "address-allocation-type": "huawei-ac-net-l3vpn-svc:static-address",
+            "addresses": {
+              "provider-address": ${prop.l3vpn.ac1-peer-ip},
+              "customer-address": ${prop.l3vpn.ac1-ip},
+              "mask": "24"
+            }
+          }
+        },
+        "service": {
+          "mtu": "1500"
+        },
+        "routing-protocols": {
+          "routing-protocol": [
+            {
+              "type": ${prop.l3vpn.ac1_protocol},
+              "static": {
+                "cascaded-lan-prefixes": [
+                  {
+                    "ipv4-lan-prefixes": [
+                      {
+                        "ip-prefix": ${prop.l3vpn.sna1-route.ip-prefix},
+                        "next-hop": ${prop.l3vpn.sna1-route.next-hop}
+                      }
+                    ]
+                  }
+                ]
+              }
+              "bgp": {
+                "peers": [
+                  {
+                    "peer-ip": ${prop.l3vpn.peer1-ip},
+                    "remote-as": ${prop.l3vpn.ac1_protocol_bgp_as}
+                  }
+                ]
+              }
+            }
+            }
+          ]
+        },
+        "vpn-attachment": {
+          "vpn-policy-id": ${prop.l3vpn.name}
+        }
+      }
+    ]
+  },
+  {
+    "site-id": ${prop.l3vpn.site2_name},
+    "vpn-policies": {
+    "vpn-policy": [
+      {
+        "vpn-policy-id": ${prop.l3vpn.vpn-policy2-id},
+        "entries": [
+        {
+          "id": ${prop.l3vpn.entry2-id},
+          "vpn": {
+          "vpn-id": ${prop.l3vpn.name},
+          "site-role": "huawei-ac-net-l3vpn-svc:any-to-any-role"
+          }
+        }
+        ]
+      }
+      ]
+    },
+    "site-network-accesses": {
+    "site-network-access": [
+      {
+        "site-network-access-id": ${prop.l3vpn.sna2_name},
+      "bearer": {
+        "appointed-access": {
+          "ne-id": ${prop.l3vpn.pe2_id},
+      "ltp-id": ${prop.l3vpn.ac2_id},
+      "vlan": {
+        "type": "huawei-ac-net-l3vpn-svc:vlan-dot1q",
+        "vlan-id": ${prop.l3vpn.sna2_svlan}
+    }
+    }
+    },
+      "ip-connection": {
+        "ipv4": {
+          "address-allocation-type": "huawei-ac-net-l3vpn-svc:static-address",
+          "addresses": {
+            "provider-address": ${prop.l3vpn.ac2-peer-ip},
+      "customer-address": ${prop.l3vpn.ac2-ip},
+      "mask": "24"
+      }
+    }
+    },
+      "service": {
+        "mtu": "1500"
+      },
+      "routing-protocols": {
+        "routing-protocol": [
+          {
+            "type": ${prop.l3vpn.ac2_protocol},
+            "static": {
+              "cascaded-lan-prefixes": [
+                {
+                  "ipv4-lan-prefixes": [
+                    {
+                      "ip-prefix": ${prop.l3vpn.sna2-route.ip-prefix},
+                      "next-hop": ${prop.l3vpn.sna2-route.next-hop}
+                  }
+                  ]
+                }
+              ]
+            }
+            "bgp": {
+              "peers": [
+                {
+                  "peer-ip": ${prop.l3vpn.peer2-ip},
+                  "remote-as": ${prop.l3vpn.ac2_protocol_bgp_as}
+                }
+              ]
+            }
+          }
+        ]
+      },
+      "vpn-attachment": {
+        "vpn-policy-id": ${prop.l3vpn.name}
+    }
+    }
+    ]
+  }
+ ]
+}
+
diff --git a/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json b/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json
new file mode 100644
index 00000000..67f127ce
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/l3smvpntemplate.json
@@ -0,0 +1,31 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+{
+  "vpn-service": [
+    {
+      "vpn-id": ${prop.l3vpn.name},
+      "customer-name": "huawei",
+      "vpn-service-topology": ${prop.l3vpn.topology},
+      "route-exchange-policy": "huawei-ac-net-l3vpn-svc:vpnv4-way"
+    }
+  ]
+}
diff --git a/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json b/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json
new file mode 100644
index 00000000..732af278
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/l3smvrftemplate.json
@@ -0,0 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : SDN-C
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * 						reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+{
+    "vrf-attribute": [
+        {
+            "vrf-attribute-id": ${prop.l3vpn.vrf1-id},
+            "ne-id": ${prop.l3vpn.pe1_id},
+            "vpn-policy-id": ${prop.l3vpn.vpn-policy1-id}
+        },
+        {
+            "vrf-attribute-id": ${prop.l3vpn.vrf2-id},
+            "ne-id": ${prop.l3vpn.pe2_id},
+            "vpn-policy-id": ${prop.l3vpn.vpn-policy2-id}
+        }
+    ]
+}