From 42fb5723b7b11e94fc7d5ab901ae293b7fd67d7f Mon Sep 17 00:00:00 2001
From: "ramu.n" <ramu.n@huawei.com>
Date: Tue, 14 Nov 2017 20:05:30 +0530
Subject: Update underlay DG for delete flow

*Need to store vrf ids which are reuired during delete
*Add delete network from MDSAL data store

Change-Id: I411c01f90a2a186e2d72f570c30ae8ecdd8d5b15
Issue-Id: SDNC-188
Signed-off-by: Ramu N <ramu.n@huawei.com>

Former-commit-id: f28363f0fae83efa9cb09ddd61fd995ccdf8498c
---
 ...nnects-network-topology-operation-activate.json | 1518 +++++++++---------
 ...ects-network-topology-operation-deactivate.json |  502 +++---
 ...URCE-API_network-topology-operation-create.json | 1610 ++++++++++----------
 ...URCE-API_network-topology-operation-delete.json | 1067 ++++++++-----
 ...onnects-network-topology-operation-activate.xml |  142 +-
 ...nects-network-topology-operation-deactivate.xml |  136 +-
 ...OURCE-API_network-topology-operation-create.xml |   10 +
 ...OURCE-API_network-topology-operation-delete.xml |  165 +-
 8 files changed, 2758 insertions(+), 2392 deletions(-)

(limited to 'platform-logic')

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 5bbee453..5f91a3d2 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": "efadabab.b5cb18",
+    "id": "9a2121f0.ab226",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 161.03125,
-    "y": 58.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 94.03125,
+    "y": 32.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "ba4efe38.fe52f"
+        "28432de4.829522"
       ]
     ]
   },
   {
-    "id": "ba4efe38.fe52f",
+    "id": "28432de4.829522",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,2193 +22,2153 @@
     "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": 377.53125,
-    "y": 120.53125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 310.53125,
+    "y": 94.53125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "7f023f5f.1b1c1"
+        "7b6afe55.703bf"
       ]
     ]
   },
   {
-    "id": "7f023f5f.1b1c1",
+    "id": "7b6afe55.703bf",
     "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": 285.5312805175781,
-    "y": 215.53123474121094,
-    "z": "1d7d5b1a.5d6895",
+    "x": 218.53128051757812,
+    "y": 189.53123474121094,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "e1d5d7b9.ae02f8"
+        "7aac1d87.9d5a54"
       ]
     ]
   },
   {
-    "id": "e1d5d7b9.ae02f8",
+    "id": "7aac1d87.9d5a54",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 583.3645935058594,
-    "y": 223.3645782470703,
-    "z": "1d7d5b1a.5d6895",
+    "x": 516.3645935058594,
+    "y": 197.3645782470703,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "66ae34bb.465bdc",
-        "f39d0958.e0ee98",
-        "9338de7d.f59b5",
-        "80e65684.a81798",
-        "44b13ee0.f42ab"
+        "cb7a0f33.08841",
+        "41001981.644338",
+        "d0276d0c.b633e",
+        "3620f5be.990eda",
+        "2b8696d6.909b7a"
       ]
     ]
   },
   {
-    "id": "f39d0958.e0ee98",
+    "id": "41001981.644338",
     "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": 973.3645935058594,
-    "y": 88.36457824707031,
-    "z": "1d7d5b1a.5d6895",
+    "x": 906.3645935058594,
+    "y": 62.36457824707031,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       []
     ]
   },
   {
-    "id": "605eaf8f.084d",
+    "id": "fbe61431.dcd008",
     "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": 1491.3648834228516,
-    "y": 361.364639043808,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1424.3648834228516,
+    "y": 335.364639043808,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "bfa446d7.0384a8"
+        "bde6b624.723588"
       ]
     ]
   },
   {
-    "id": "bfa446d7.0384a8",
+    "id": "bde6b624.723588",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1738.3647918701172,
-    "y": 359.36460852622986,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1671.3647918701172,
+    "y": 333.36460852622986,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "2241976d.6a72e8",
-        "923aebd8.9492b8",
-        "2f701681.5a3f2a",
-        "7ed4d1f2.e0fb2",
-        "c165c87.d2de838",
-        "9f9caa1e.b9ba18",
-        "fd1390eb.db4fe",
-        "dc38e2a3.7cbf5",
-        "6fbbb836.ada618"
+        "98af934f.de5ca",
+        "3f901ccb.13f7e4",
+        "fd071c4f.c5a93",
+        "3bc28b07.5abd24",
+        "d7ef4fd8.01b03",
+        "23f59b17.2b7104",
+        "ac8abe82.f1ed7",
+        "abada83e.899ad8",
+        "8275a286.575d3"
       ]
     ]
   },
   {
-    "id": "2241976d.6a72e8",
+    "id": "98af934f.de5ca",
     "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": 2225.36515045166,
-    "y": 235.36472511291504,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2158.36515045166,
+    "y": 209.36472511291504,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "78ea1224.bc5bac"
+        "e685ff47.0f8c6"
       ]
     ]
   },
   {
-    "id": "923aebd8.9492b8",
+    "id": "3f901ccb.13f7e4",
     "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": 2253.36515045166,
-    "y": 289.3647108078003,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2186.36515045166,
+    "y": 263.3647108078003,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "3eb5f34b.fabb6c"
+        "92cb9e5c.495d"
       ]
     ]
   },
   {
-    "id": "2f701681.5a3f2a",
+    "id": "fd071c4f.c5a93",
     "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": 2242.3649368286133,
-    "y": 420.364670753479,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2175.3649368286133,
+    "y": 394.364670753479,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "db1938c9.795a18"
+        "611f6a53.2c5e34"
       ]
     ]
   },
   {
-    "id": "7ed4d1f2.e0fb2",
+    "id": "3bc28b07.5abd24",
     "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": 2250.6506729125977,
-    "y": 481.6504240036011,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2183.6506729125977,
+    "y": 455.6504240036011,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "666446e9.c89ea8"
+        "375c46a9.18d9fa"
       ]
     ]
   },
   {
-    "id": "c165c87.d2de838",
+    "id": "d7ef4fd8.01b03",
     "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": 2251.650733947754,
-    "y": 545.6503947973251,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2184.650733947754,
+    "y": 519.6503947973251,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "16c5b91c.f31b17"
+        "7f0820af.096cd"
       ]
     ]
   },
   {
-    "id": "9f9caa1e.b9ba18",
+    "id": "23f59b17.2b7104",
     "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": 2222.650703430176,
-    "y": 608.650426864624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2155.650703430176,
+    "y": 582.650426864624,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "918dfdc3.aa336"
+        "4089b1ef.cda1c"
       ]
     ]
   },
   {
-    "id": "78ea1224.bc5bac",
+    "id": "e685ff47.0f8c6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2440.36515045166,
-    "y": 234.36472511291504,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2373.36515045166,
+    "y": 208.36472511291504,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "4bf931c1.dd806"
+        "51bd251c.e4250c"
       ]
     ]
   },
   {
-    "id": "3eb5f34b.fabb6c",
+    "id": "92cb9e5c.495d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2451.36515045166,
-    "y": 289.3647108078003,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2384.36515045166,
+    "y": 263.3647108078003,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "55b0ea54.6a4d14"
+        "22a14741.398828"
       ]
     ]
   },
   {
-    "id": "db1938c9.795a18",
+    "id": "611f6a53.2c5e34",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2447.3649368286133,
-    "y": 419.364670753479,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2380.3649368286133,
+    "y": 393.364670753479,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "874dab5.61e2258"
+        "41aaa6a9.d85078"
       ]
     ]
   },
   {
-    "id": "666446e9.c89ea8",
+    "id": "375c46a9.18d9fa",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2452.6506729125977,
-    "y": 480.6504240036011,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2385.6506729125977,
+    "y": 454.6504240036011,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "3adcbd29.e08a92"
+        "df1889e8.640458"
       ]
     ]
   },
   {
-    "id": "16c5b91c.f31b17",
+    "id": "7f0820af.096cd",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2447.650733947754,
-    "y": 542.6503947973251,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2380.650733947754,
+    "y": 516.6503947973251,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "4c2a55f8.8427bc"
+        "c98004ad.61e968"
       ]
     ]
   },
   {
-    "id": "918dfdc3.aa336",
+    "id": "4089b1ef.cda1c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2428.650703430176,
-    "y": 608.650426864624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2361.650703430176,
+    "y": 582.650426864624,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "18742d4d.86f243"
+        "66980c68.e238a4"
       ]
     ]
   },
   {
-    "id": "55b0ea54.6a4d14",
+    "id": "22a14741.398828",
     "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": 2633.36515045166,
-    "y": 282.3647108078003,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2566.36515045166,
+    "y": 256.3647108078003,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "874dab5.61e2258",
+    "id": "41aaa6a9.d85078",
     "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": 2638.3651580810547,
-    "y": 412.3647575378418,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2571.3651580810547,
+    "y": 386.3647575378418,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "18742d4d.86f243",
+    "id": "66980c68.e238a4",
     "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": 2598.650703430176,
-    "y": 600.650426864624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2531.650703430176,
+    "y": 574.650426864624,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "66ae34bb.465bdc",
+    "id": "cb7a0f33.08841",
     "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": 806.6504211425781,
-    "y": 1186.0789794921875,
-    "z": "1d7d5b1a.5d6895",
+    "x": 739.6504211425781,
+    "y": 1160.0789794921875,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "fd1390eb.db4fe",
+    "id": "ac8abe82.f1ed7",
     "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": 2236.5316848754883,
-    "y": 176.53135681152344,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2169.5316848754883,
+    "y": 150.53135681152344,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "c0671fb5.a1596"
+        "893c0950.32cf08"
       ]
     ]
   },
   {
-    "id": "c0671fb5.a1596",
+    "id": "893c0950.32cf08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2434.5316848754883,
-    "y": 176.53135681152344,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2367.5316848754883,
+    "y": 150.53135681152344,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "4df90ce2.99e144"
+        "96a16277.d8925"
       ]
     ]
   },
   {
-    "id": "4df90ce2.99e144",
+    "id": "96a16277.d8925",
     "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": 2616.5316848754883,
-    "y": 169.53135681152344,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2549.5316848754883,
+    "y": 143.53135681152344,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "dc38e2a3.7cbf5",
+    "id": "abada83e.899ad8",
     "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": 2260.0314712524414,
-    "y": 355.5312967300415,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2193.0314712524414,
+    "y": 329.5312967300415,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "b00f6243.0a48"
+        "1782d68.c5bab2a"
       ]
     ]
   },
   {
-    "id": "b00f6243.0a48",
+    "id": "1782d68.c5bab2a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2458.0314712524414,
-    "y": 355.5312967300415,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2391.0314712524414,
+    "y": 329.5312967300415,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "2e41bbcc.a6d6e4"
+        "c20d9d61.613f4"
       ]
     ]
   },
   {
-    "id": "9338de7d.f59b5",
+    "id": "d0276d0c.b633e",
     "type": "block",
     "name": "block : execute",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 807.0311813354492,
-    "y": 596.5312957763672,
-    "z": "1d7d5b1a.5d6895",
+    "x": 740.0311813354492,
+    "y": 570.5312957763672,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "c6f41a63.9856e8",
-        "e91af8d8.1aa348",
-        "d35fd906.7c7fe8"
+        "c757fa0f.e50b68",
+        "72f61efd.b156e",
+        "4214f6f2.3f8798"
       ]
     ]
   },
   {
-    "id": "c6f41a63.9856e8",
+    "id": "c757fa0f.e50b68",
     "type": "block",
     "name": "block : executeSite1",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1099.5312423706055,
-    "y": 421.0312719345093,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1032.5312423706055,
+    "y": 395.0312719345093,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "605eaf8f.084d",
-        "5df4287.26506d8"
+        "fbe61431.dcd008",
+        "5ae98389.5ebcac"
       ]
     ]
   },
   {
-    "id": "e91af8d8.1aa348",
+    "id": "72f61efd.b156e",
     "type": "block",
     "name": "block : executeSite2",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1116.5312881469727,
-    "y": 937.0312547683716,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1049.5312881469727,
+    "y": 911.0312547683716,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "ba12a388.ca536",
-        "5df4287.26506d8"
+        "9f956db.3ed2b9",
+        "5ae98389.5ebcac"
       ]
     ]
   },
   {
-    "id": "4ba9c3e9.e8390c",
+    "id": "f0009f7e.40e02",
     "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": 2211.031494140625,
-    "y": 756.0311889648438,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2144.031494140625,
+    "y": 730.0311889648438,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "4d059d56.ac7354"
+        "f550858e.14e1d8"
       ]
     ]
   },
   {
-    "id": "a5aeb648.cbf968",
+    "id": "5318cc5a.897f04",
     "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": 2235.0318450927734,
-    "y": 815.031195640564,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2168.0318450927734,
+    "y": 789.031195640564,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "44b5c7cb.6c0ad8",
-        "f5c82290.f1663"
+        "bcd540c3.4e804",
+        "69713a16.fbae84"
       ]
     ]
   },
   {
-    "id": "1b41b68d.54ece9",
+    "id": "3b3ae1d4.d5835e",
     "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": 2244.031234741211,
-    "y": 1011.0311613082886,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2177.031234741211,
+    "y": 985.0311613082886,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "126609cf.3fa496"
+        "f75e99a8.64ed88"
       ]
     ]
   },
   {
-    "id": "1ea9ba64.03cfe6",
+    "id": "3ceece62.09ddd2",
     "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": 2252.3169708251953,
-    "y": 1072.3169145584106,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2185.3169708251953,
+    "y": 1046.3169145584106,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "f302ebc3.5b2b08"
+        "2cfb39ee.eacf86"
       ]
     ]
   },
   {
-    "id": "f446799d.52ab98",
+    "id": "8c9a50d3.0bead",
     "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": 2253.3170318603516,
-    "y": 1136.3168853521347,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2186.3170318603516,
+    "y": 1110.3168853521347,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "760fe723.f862b8"
+        "ff36bc65.60ac5"
       ]
     ]
   },
   {
-    "id": "12876faf.c9b22",
+    "id": "db4a0111.c3372",
     "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": 2224.3170013427734,
-    "y": 1199.3169174194336,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2157.3170013427734,
+    "y": 1173.3169174194336,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "9ec06044.5ffa5"
+        "1ba16f6b.433171"
       ]
     ]
   },
   {
-    "id": "4d059d56.ac7354",
+    "id": "f550858e.14e1d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2426.031494140625,
-    "y": 755.0311889648438,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2359.031494140625,
+    "y": 729.0311889648438,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "59ffa97c.5c0fc8"
+        "5c56e96c.6b3588"
       ]
     ]
   },
   {
-    "id": "44b5c7cb.6c0ad8",
+    "id": "bcd540c3.4e804",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2433.0318450927734,
-    "y": 815.031195640564,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2366.0318450927734,
+    "y": 789.031195640564,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "bc8f84e7.1a2c38"
+        "cd16655c.572058"
       ]
     ]
   },
   {
-    "id": "126609cf.3fa496",
+    "id": "f75e99a8.64ed88",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2449.031234741211,
-    "y": 1010.0311613082886,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2382.031234741211,
+    "y": 984.0311613082886,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "9984a813.340fe8"
+        "b3528ffb.5fd92"
       ]
     ]
   },
   {
-    "id": "f302ebc3.5b2b08",
+    "id": "2cfb39ee.eacf86",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2454.3169708251953,
-    "y": 1071.3169145584106,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2387.3169708251953,
+    "y": 1045.3169145584106,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "76d6f69c.e0f7a8"
+        "d44c3f36.87166"
       ]
     ]
   },
   {
-    "id": "760fe723.f862b8",
+    "id": "ff36bc65.60ac5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2449.3170318603516,
-    "y": 1133.3168853521347,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2382.3170318603516,
+    "y": 1107.3168853521347,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "fe22f97a.e156b8"
+        "84652cfb.a0fe1"
       ]
     ]
   },
   {
-    "id": "9ec06044.5ffa5",
+    "id": "1ba16f6b.433171",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2430.3170013427734,
-    "y": 1199.3169174194336,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2363.3170013427734,
+    "y": 1173.3169174194336,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "cab29ddd.d3511"
+        "cdec65b1.3e8048"
       ]
     ]
   },
   {
-    "id": "bc8f84e7.1a2c38",
+    "id": "cd16655c.572058",
     "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": 2615.0318450927734,
-    "y": 808.031195640564,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2548.0318450927734,
+    "y": 782.031195640564,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "9984a813.340fe8",
+    "id": "b3528ffb.5fd92",
     "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": 2640.0314559936523,
-    "y": 1003.0312480926514,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2573.0314559936523,
+    "y": 977.0312480926514,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "cab29ddd.d3511",
+    "id": "cdec65b1.3e8048",
     "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": 2600.3170013427734,
-    "y": 1191.3169174194336,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2533.3170013427734,
+    "y": 1165.3169174194336,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "da831bc2.b61118",
+    "id": "d1df56cb.2256f8",
     "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": 2261.697769165039,
-    "y": 946.1977872848511,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2194.697769165039,
+    "y": 920.1977872848511,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "1a29ba09.a33016"
+        "ef73c349.6fa5"
       ]
     ]
   },
   {
-    "id": "1a29ba09.a33016",
+    "id": "ef73c349.6fa5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2459.697769165039,
-    "y": 946.1977872848511,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2392.697769165039,
+    "y": 920.1977872848511,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "38aff846.dc0b98"
+        "7381f4dc.54e1ac"
       ]
     ]
   },
   {
-    "id": "f9349a4.bd78768",
+    "id": "4dae1658.981438",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1730.0309448242188,
-    "y": 878.0311467647552,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1663.0309448242188,
+    "y": 852.0311467647552,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "4ba9c3e9.e8390c",
-        "a5aeb648.cbf968",
-        "1b41b68d.54ece9",
-        "1ea9ba64.03cfe6",
-        "f446799d.52ab98",
-        "12876faf.c9b22",
-        "da831bc2.b61118"
+        "f0009f7e.40e02",
+        "5318cc5a.897f04",
+        "3b3ae1d4.d5835e",
+        "3ceece62.09ddd2",
+        "8c9a50d3.0bead",
+        "db4a0111.c3372",
+        "d1df56cb.2256f8"
       ]
     ]
   },
   {
-    "id": "ba12a388.ca536",
+    "id": "9f956db.3ed2b9",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1483.0310363769531,
-    "y": 880.0311772823334,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1416.0310363769531,
+    "y": 854.0311772823334,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "f9349a4.bd78768"
+        "4dae1658.981438"
       ]
     ]
   },
   {
-    "id": "4bf931c1.dd806",
+    "id": "51bd251c.e4250c",
     "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": 2622.0315322875977,
-    "y": 228.03127479553223,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2555.0315322875977,
+    "y": 202.03127479553223,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "6fbbb836.ada618",
+    "id": "8275a286.575d3",
     "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": 2241.53125,
-    "y": 678.0311889648438,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2174.53125,
+    "y": 652.0311889648438,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "c5018b38.b82348"
+        "c5076cc8.20e47"
       ]
     ]
   },
   {
-    "id": "c5018b38.b82348",
+    "id": "c5076cc8.20e47",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2447.53125,
-    "y": 678.0311889648438,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2380.53125,
+    "y": 652.0311889648438,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "85645a4.a9bb1a8"
+        "5e2bf82e.5cd788"
       ]
     ]
   },
   {
-    "id": "85645a4.a9bb1a8",
+    "id": "5e2bf82e.5cd788",
     "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": 2617.53125,
-    "y": 670.0311889648438,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2550.53125,
+    "y": 644.0311889648438,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "5df4287.26506d8",
+    "id": "5ae98389.5ebcac",
     "type": "block",
     "name": "block : sendRequest",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1395.5312690734863,
-    "y": 1437.5311946868896,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1328.5312690734863,
+    "y": 1411.5311946868896,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "1dccb94.bd57b47",
-        "5d6b118.552a3f",
-        "2eb443d1.da3d7c",
-        "6c39ea0c.ba0e9c",
-        "1fbe5a07.98eb36"
+        "a53eb6d0.3cb4d8",
+        "e89ebf4b.24d8a",
+        "a95dc9c7.507158",
+        "1c2a13ea.e2fe74"
       ]
     ]
   },
   {
-    "id": "37fa897c.a998d6",
+    "id": "f8e23e01.428c6",
     "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.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",
+    "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",
     "comments": "",
     "outputs": 1,
-    "x": 2203.5315437316895,
-    "y": 1500.5311498641968,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2453.531494140625,
+    "y": 1411.5311279296875,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       []
     ]
   },
   {
-    "id": "a2886d1e.1475a",
+    "id": "947732ea.1c0d1",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1882.0312271118164,
-    "y": 1208.530781507492,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1815.0312271118164,
+    "y": 1182.530781507492,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "59fbb9bc.1fe2b8"
+        "67b5c3a4.c5440c"
       ]
     ]
   },
   {
-    "id": "4cc401c7.12563",
+    "id": "cddd83e6.c6954",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1889.0312271118164,
-    "y": 1246.530781507492,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1822.0312271118164,
+    "y": 1220.530781507492,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "fa41b944.ad53d8"
+        "3ae7115c.f7ed0e"
       ]
     ]
   },
   {
-    "id": "499333c.6e6f8cc",
+    "id": "38e02e05.9540d2",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1881.0312271118164,
-    "y": 1288.530781507492,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1814.0312271118164,
+    "y": 1262.530781507492,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "30de8b8b.248734"
+        "9970d5b0.48c8b8"
       ]
     ]
   },
   {
-    "id": "fa41b944.ad53d8",
+    "id": "3ae7115c.f7ed0e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2046.0312271118164,
-    "y": 1250.530781507492,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1979.0312271118164,
+    "y": 1224.530781507492,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "30de8b8b.248734",
+    "id": "9970d5b0.48c8b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2039.0312271118164,
-    "y": 1297.530781507492,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1972.0312271118164,
+    "y": 1271.530781507492,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "2eb443d1.da3d7c",
+    "id": "e89ebf4b.24d8a",
     "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": 1663.262107849121,
-    "y": 1247.8385467529297,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1596.262107849121,
+    "y": 1221.8385467529297,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "a2886d1e.1475a",
-        "4cc401c7.12563",
-        "499333c.6e6f8cc"
+        "947732ea.1c0d1",
+        "cddd83e6.c6954",
+        "38e02e05.9540d2"
       ]
     ]
   },
   {
-    "id": "59fbb9bc.1fe2b8",
+    "id": "67b5c3a4.c5440c",
     "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.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<parameter name='prop.sdncRestApi.thirdpartySdnc.vendor' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`\" />\n\n",
     "comments": "",
-    "x": 2056.5311584472656,
-    "y": 1205.03076171875,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1989.5311584472656,
+    "y": 1179.03076171875,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "1dccb94.bd57b47",
+    "id": "720459ea.25c288",
     "type": "switchNode",
     "name": "switch tunnelType",
     "xml": "<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1666.5310020446777,
-    "y": 1525.0306606292725,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1916.5309524536133,
+    "y": 1436.0306386947632,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "71cfd469.6c1bec",
-        "86e8360c.b36588"
+        "2c9d3dbe.0640c2",
+        "d7544d3a.90015"
       ]
     ]
   },
   {
-    "id": "71cfd469.6c1bec",
+    "id": "2c9d3dbe.0640c2",
     "type": "outcomeTrue",
     "name": "L3-DCI",
     "xml": "<outcome value='L3-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1879.5311317443848,
-    "y": 1505.0306606292725,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2129.5310821533203,
+    "y": 1416.0306386947632,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "37fa897c.a998d6"
+        "f8e23e01.428c6"
       ]
     ]
   },
   {
-    "id": "86e8360c.b36588",
+    "id": "d7544d3a.90015",
     "type": "outcomeTrue",
     "name": "L2-DCI",
     "xml": "<outcome value='L2-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1877.5309524536133,
-    "y": 1577.0306606292725,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2127.530902862549,
+    "y": 1488.0306386947632,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "888b7367.eced7"
+        "8027a9ed.03b1a8"
       ]
     ]
   },
   {
-    "id": "59ffa97c.5c0fc8",
+    "id": "5c56e96c.6b3588",
     "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": 2600.031467437744,
-    "y": 750.0312414169312,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2533.031467437744,
+    "y": 724.0312414169312,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "888b7367.eced7",
+    "id": "8027a9ed.03b1a8",
     "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.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",
+    "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",
     "comments": "",
     "outputs": 1,
-    "x": 2197.5314979553223,
-    "y": 1577.5310859680176,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2447.531448364258,
+    "y": 1488.5310640335083,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       []
     ]
   },
   {
-    "id": "f5c82290.f1663",
+    "id": "69713a16.fbae84",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2431.531425476074,
-    "y": 874.0312252044678,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2364.531425476074,
+    "y": 848.0312252044678,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "cbfd35c2.bfcb88"
+        "4372b9a3.950648"
       ]
     ]
   },
   {
-    "id": "cbfd35c2.bfcb88",
+    "id": "4372b9a3.950648",
     "type": "set",
     "name": "set description",
     "xml": "<set>\n<parameter name='prop.dci-connects.description' value='' />\n",
     "comments": "",
-    "x": 2612.531494140625,
-    "y": 869.0311660766602,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2545.531494140625,
+    "y": 843.0311660766602,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "3adcbd29.e08a92",
+    "id": "df1889e8.640458",
     "type": "block",
     "name": "block setEvpnIrts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2634.531005859375,
-    "y": 482.5468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2567.531005859375,
+    "y": 456.5468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "ee0c28f8.e4d418",
-        "e8a5d988.95c218"
+        "6f2e130.94e59ec",
+        "dd92c777.cb7518"
       ]
     ]
   },
   {
-    "id": "ee0c28f8.e4d418",
+    "id": "6f2e130.94e59ec",
     "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": 2880.531005859375,
-    "y": 433.5468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2813.531005859375,
+    "y": 407.5468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "e8a5d988.95c218",
+    "id": "dd92c777.cb7518",
     "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": 2909.531005859375,
-    "y": 485.5468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2842.531005859375,
+    "y": 459.5468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "d28f896c.05d5c8",
-        "14de53a9.69951c"
+        "2467a20d.97d24e",
+        "f753e447.178ff8"
       ]
     ]
   },
   {
-    "id": "14de53a9.69951c",
+    "id": "f753e447.178ff8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3126.531005859375,
-    "y": 411.5468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3059.531005859375,
+    "y": 385.5468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "2beb253e.7afdaa"
+        "3fe74247.2b4ffe"
       ]
     ]
   },
   {
-    "id": "d28f896c.05d5c8",
+    "id": "2467a20d.97d24e",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3127.531005859375,
-    "y": 477.5468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3060.531005859375,
+    "y": 451.5468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "75111897.c6e698"
+        "c9fb1d3f.bb93"
       ]
     ]
   },
   {
-    "id": "75111897.c6e698",
+    "id": "c9fb1d3f.bb93",
     "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": 3308.531005859375,
-    "y": 475.5468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3241.531005859375,
+    "y": 449.5468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "cc14d3d6.a8bb8",
+    "id": "2b124117.491c4e",
     "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": 2877.031005859375,
-    "y": 576.0468769073486,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2810.031005859375,
+    "y": 550.0468769073486,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "456385de.3c8bcc",
+    "id": "2298df8c.6d9c9",
     "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": 2906.031005859375,
-    "y": 628.0468769073486,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2839.031005859375,
+    "y": 602.0468769073486,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "7302b848.08c648",
-        "5fdfc909.24b298"
+        "644f6742.689668",
+        "6d20d2f8.9ddb2c"
       ]
     ]
   },
   {
-    "id": "5fdfc909.24b298",
+    "id": "6d20d2f8.9ddb2c",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3123.031005859375,
-    "y": 554.0468769073486,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3056.031005859375,
+    "y": 528.0468769073486,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "a89b655a.a9acf8"
+        "2e47e496.1bceac"
       ]
     ]
   },
   {
-    "id": "7302b848.08c648",
+    "id": "644f6742.689668",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3124.031005859375,
-    "y": 620.0468769073486,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3057.031005859375,
+    "y": 594.0468769073486,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "c1a75157.1fffe"
+        "6a2fcced.68d914"
       ]
     ]
   },
   {
-    "id": "c1a75157.1fffe",
+    "id": "6a2fcced.68d914",
     "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": 3305.031005859375,
-    "y": 618.0468769073486,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3238.031005859375,
+    "y": 592.0468769073486,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "4c2a55f8.8427bc",
+    "id": "c98004ad.61e968",
     "type": "block",
     "name": "block setEvpnErts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2628.0308990478516,
-    "y": 538.0469341278076,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2561.0308990478516,
+    "y": 512.0469341278076,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "cc14d3d6.a8bb8",
-        "456385de.3c8bcc"
+        "2b124117.491c4e",
+        "2298df8c.6d9c9"
       ]
     ]
   },
   {
-    "id": "2beb253e.7afdaa",
+    "id": "3fe74247.2b4ffe",
     "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": 3329.0311698913574,
-    "y": 411.0468864440918,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3262.0311698913574,
+    "y": 385.0468864440918,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "7f5427c6.ab6078"
+        "c4293a61.68fc98"
       ]
     ]
   },
   {
-    "id": "7f5427c6.ab6078",
+    "id": "c4293a61.68fc98",
     "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": 3541.0316619873047,
-    "y": 411.0470390319824,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3474.0316619873047,
+    "y": 385.0470390319824,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "a89b655a.a9acf8",
+    "id": "2e47e496.1bceac",
     "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": 3322.531005859375,
-    "y": 550.0468769073486,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3255.531005859375,
+    "y": 524.0468769073486,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "26d12fff.9c7b4"
+        "13b1522d.393f1e"
       ]
     ]
   },
   {
-    "id": "26d12fff.9c7b4",
+    "id": "13b1522d.393f1e",
     "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": 3534.5314979553223,
-    "y": 550.0470294952393,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3467.5314979553223,
+    "y": 524.0470294952393,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "232c8152.10922e",
+    "id": "30d90f98.fb133",
     "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": 2893.531005859375,
-    "y": 1016.5468158721924,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2826.531005859375,
+    "y": 990.5468158721924,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "60735ad6.75f224",
+    "id": "abdf511f.438e3",
     "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": 2922.531005859375,
-    "y": 1068.5468158721924,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2855.531005859375,
+    "y": 1042.5468158721924,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "9de0af26.c612a",
-        "f23e522f.721f"
+        "8434219c.36d76",
+        "ff7f5f04.46946"
       ]
     ]
   },
   {
-    "id": "f23e522f.721f",
+    "id": "ff7f5f04.46946",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3139.531005859375,
-    "y": 994.5468158721924,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3072.531005859375,
+    "y": 968.5468158721924,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "3e0e3570.15512a"
+        "b7596a0e.6a9b38"
       ]
     ]
   },
   {
-    "id": "9de0af26.c612a",
+    "id": "8434219c.36d76",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3140.531005859375,
-    "y": 1060.5468158721924,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3073.531005859375,
+    "y": 1034.5468158721924,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "7bec3155.0aa5"
+        "e270c137.7edb"
       ]
     ]
   },
   {
-    "id": "7bec3155.0aa5",
+    "id": "e270c137.7edb",
     "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": 3321.531005859375,
-    "y": 1058.5468158721924,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3254.531005859375,
+    "y": 1032.5468158721924,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "2d50095d.e93056",
+    "id": "9085479c.4438e8",
     "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": 2890.031005859375,
-    "y": 1159.0468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2823.031005859375,
+    "y": 1133.0468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "5512a241.93c69c",
+    "id": "945a19b0.56e0a8",
     "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": 2919.031005859375,
-    "y": 1211.0468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2852.031005859375,
+    "y": 1185.0468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "2406f85.66f9d08",
-        "5ea7c0a.461a54"
+        "b9f0a76f.ce7bd8",
+        "993c331f.449f2"
       ]
     ]
   },
   {
-    "id": "5ea7c0a.461a54",
+    "id": "993c331f.449f2",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3136.031005859375,
-    "y": 1137.0468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3069.031005859375,
+    "y": 1111.0468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "29bb0627.190dea"
+        "1e3e4911.a9b5d7"
       ]
     ]
   },
   {
-    "id": "2406f85.66f9d08",
+    "id": "b9f0a76f.ce7bd8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3137.031005859375,
-    "y": 1203.0468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3070.031005859375,
+    "y": 1177.0468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "f9b95a01.7c2878"
+        "6a46228c.def50c"
       ]
     ]
   },
   {
-    "id": "f9b95a01.7c2878",
+    "id": "6a46228c.def50c",
     "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": 3318.031005859375,
-    "y": 1201.0468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3251.031005859375,
+    "y": 1175.0468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "3e0e3570.15512a",
+    "id": "b7596a0e.6a9b38",
     "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": 3342.0311698913574,
-    "y": 994.0468559265137,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3275.0311698913574,
+    "y": 968.0468559265137,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "9a59b84a.ecec98"
+        "485e43f2.9860dc"
       ]
     ]
   },
   {
-    "id": "9a59b84a.ecec98",
+    "id": "485e43f2.9860dc",
     "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": 3554.0316619873047,
-    "y": 994.0470085144043,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3487.0316619873047,
+    "y": 968.0470085144043,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "29bb0627.190dea",
+    "id": "1e3e4911.a9b5d7",
     "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": 3335.531005859375,
-    "y": 1133.0468463897705,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3268.531005859375,
+    "y": 1107.0468463897705,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "d32d9c80.701b4"
+        "d21b6ff7.014f7"
       ]
     ]
   },
   {
-    "id": "d32d9c80.701b4",
+    "id": "d21b6ff7.014f7",
     "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": 3547.5314979553223,
-    "y": 1133.0469989776611,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3480.5314979553223,
+    "y": 1107.0469989776611,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "76d6f69c.e0f7a8",
+    "id": "d44c3f36.87166",
     "type": "block",
     "name": "block setEvpnIrts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2647.531005859375,
-    "y": 1065.5468158721924,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2580.531005859375,
+    "y": 1039.5468158721924,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "232c8152.10922e",
-        "60735ad6.75f224"
+        "30d90f98.fb133",
+        "abdf511f.438e3"
       ]
     ]
   },
   {
-    "id": "fe22f97a.e156b8",
+    "id": "84652cfb.a0fe1",
     "type": "block",
     "name": "block setEvpnErts",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2641.0308990478516,
-    "y": 1121.0469036102295,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2574.0308990478516,
+    "y": 1095.0469036102295,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "2d50095d.e93056",
-        "5512a241.93c69c"
+        "9085479c.4438e8",
+        "945a19b0.56e0a8"
       ]
     ]
   },
   {
-    "id": "cb8f4f81.03f6",
+    "id": "13bf54d6.a265ab",
     "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": 1452.6979598999023,
-    "y": 1601.3646783828735,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1385.6979598999023,
+    "y": 1575.3646783828735,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       []
     ]
   },
   {
-    "id": "b671a31f.ca73a",
+    "id": "1268eeda.0db0e1",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1444.6979751586914,
-    "y": 1671.3646847009659,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1377.6979751586914,
+    "y": 1645.3646847009659,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "ac48e882.8e5458",
-        "bc7b8c68.e23fc"
+        "625ef991.1b4c98",
+        "2a48f9bb.070696"
       ]
     ]
   },
   {
-    "id": "ac48e882.8e5458",
+    "id": "625ef991.1b4c98",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1718.5075454711914,
-    "y": 1640.3170772790909,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1651.5075454711914,
+    "y": 1614.3170772790909,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "e844e350.99df9"
+        "889ad7c.f2f9c28"
       ]
     ]
   },
   {
-    "id": "bc7b8c68.e23fc",
+    "id": "2a48f9bb.070696",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1713.3647232055664,
-    "y": 1686.0313717126846,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1646.3647232055664,
+    "y": 1660.0313717126846,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "1eb190aa.78173f"
+        "ce12c01b.cd317"
       ]
     ]
   },
   {
-    "id": "e844e350.99df9",
+    "id": "889ad7c.f2f9c28",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1871.5075454711914,
-    "y": 1639.8884884119034,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1804.5075454711914,
+    "y": 1613.8884884119034,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "1eb190aa.78173f",
+    "id": "ce12c01b.cd317",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1872.936134338379,
-    "y": 1684.8885494470596,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1805.936134338379,
+    "y": 1658.8885494470596,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "55222dc2.e57ec4",
+    "id": "98adcf74.8b144",
     "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": 1416.6979598999023,
-    "y": 1743.3646869659424,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1349.6979598999023,
+    "y": 1717.3646869659424,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "d35fd906.7c7fe8",
+    "id": "4214f6f2.3f8798",
     "type": "block",
     "name": "block : saveNetworkData",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1113.0312118530273,
-    "y": 1582.6978778839111,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1046.0312118530273,
+    "y": 1556.6978778839111,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "cb8f4f81.03f6",
-        "b671a31f.ca73a",
-        "55222dc2.e57ec4",
-        "a89a8da5.fdcdb"
+        "13bf54d6.a265ab",
+        "1268eeda.0db0e1",
+        "98adcf74.8b144",
+        "ae6337fc.2f77b8"
       ]
     ]
   },
   {
-    "id": "a89a8da5.fdcdb",
+    "id": "ae6337fc.2f77b8",
     "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": 1449.0312118530273,
-    "y": 1813.0312519073486,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1382.0312118530273,
+    "y": 1787.0312519073486,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "5d6b118.552a3f",
+    "id": "a53eb6d0.3cb4d8",
     "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": 1622.364990234375,
-    "y": 1392.697998046875,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1555.364990234375,
+    "y": 1366.697998046875,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       []
     ]
   },
   {
-    "id": "228b648e.7d106c",
+    "id": "7f7ca562.d8259c",
     "type": "comment",
     "name": "TODO",
     "info": "Currently activate is done without assignment, later divide in two phases.",
     "comments": "",
-    "x": 1408.0312118530273,
-    "y": 75.69791603088379,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1341.0312118530273,
+    "y": 49.69791603088379,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "38aff846.dc0b98",
+    "id": "7381f4dc.54e1ac",
     "type": "block",
     "name": "block setLocalNetworks",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2630.531280517578,
-    "y": 945.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2563.531280517578,
+    "y": 919.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "d37b497d.93d8f8",
-        "d298e6ac.258b68"
+        "f13c2833.8ad168",
+        "e68592dd.37654"
       ]
     ]
   },
   {
-    "id": "d37b497d.93d8f8",
+    "id": "f13c2833.8ad168",
     "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": 2833.531280517578,
-    "y": 880.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2766.531280517578,
+    "y": 854.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "d298e6ac.258b68",
+    "id": "e68592dd.37654",
     "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": 2862.531280517578,
-    "y": 932.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2795.531280517578,
+    "y": 906.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "eff34a17.4d5f68",
-        "a2b7dcb4.f7dfe"
+        "18c32d19.cddf83",
+        "717aba8a.7e5bd4"
       ]
     ]
   },
   {
-    "id": "eff34a17.4d5f68",
+    "id": "18c32d19.cddf83",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3059.531280517578,
-    "y": 867.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2992.531280517578,
+    "y": 841.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "f3612128.8fa1"
+        "2bac9803.b022f8"
       ]
     ]
   },
   {
-    "id": "a2b7dcb4.f7dfe",
+    "id": "717aba8a.7e5bd4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3060.531280517578,
-    "y": 933.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2993.531280517578,
+    "y": 907.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "8c6ffd32.2208f"
+        "9f287993.deeca8"
       ]
     ]
   },
   {
-    "id": "8c6ffd32.2208f",
+    "id": "9f287993.deeca8",
     "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": 3241.531280517578,
-    "y": 931.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3174.531280517578,
+    "y": 905.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "f3612128.8fa1",
+    "id": "2bac9803.b022f8",
     "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": 3262.0314445495605,
-    "y": 866.5312900543213,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3195.0314445495605,
+    "y": 840.5312900543213,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "654fc20b.a1919c"
+        "b98f501.86efdb"
       ]
     ]
   },
   {
-    "id": "654fc20b.a1919c",
+    "id": "b98f501.86efdb",
     "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": 3534.531280517578,
-    "y": 865.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3467.531280517578,
+    "y": 839.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "e570a32e.5f1c",
-        "bdb2f778.6e3618",
-        "bc031e42.eeb7c"
+        "ff920bc5.185188",
+        "56d15342.77268c",
+        "718e79ef.506a28"
       ]
     ]
   },
   {
-    "id": "e570a32e.5f1c",
+    "id": "ff920bc5.185188",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3753.3003997802734,
-    "y": 825.7234847545624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3686.3003997802734,
+    "y": 799.7234847545624,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "c951297e.06f838"
+        "2dfe1ab5.29ac36"
       ]
     ]
   },
   {
-    "id": "bdb2f778.6e3618",
+    "id": "56d15342.77268c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3760.3003997802734,
-    "y": 863.7234847545624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3693.3003997802734,
+    "y": 837.7234847545624,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "37619.408049e7c"
+        "c8973361.4dcf1"
       ]
     ]
   },
   {
-    "id": "bc031e42.eeb7c",
+    "id": "718e79ef.506a28",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3752.3003997802734,
-    "y": 905.7234847545624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3685.3003997802734,
+    "y": 879.7234847545624,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "8357d17d.030af"
+        "965b4a77.b56118"
       ]
     ]
   },
   {
-    "id": "37619.408049e7c",
+    "id": "c8973361.4dcf1",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3917.3003997802734,
-    "y": 867.7234847545624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3850.3003997802734,
+    "y": 841.7234847545624,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "8357d17d.030af",
+    "id": "965b4a77.b56118",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3910.3003997802734,
-    "y": 914.7234847545624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3843.3003997802734,
+    "y": 888.7234847545624,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "c951297e.06f838",
+    "id": "2dfe1ab5.29ac36",
     "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": 3927.8003311157227,
-    "y": 822.2234649658203,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3860.8003311157227,
+    "y": 796.2234649658203,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "80e65684.a81798",
+    "id": "3620f5be.990eda",
     "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": 912.53125,
-    "y": 1019.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 845.53125,
+    "y": 993.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       []
     ]
   },
   {
-    "id": "44b13ee0.f42ab",
+    "id": "2b8696d6.909b7a",
     "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\" />",
+    "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`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 870.5312805175781,
-    "y": 1098.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 803.5312805175781,
+    "y": 1072.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       []
     ]
   },
   {
-    "id": "2e41bbcc.a6d6e4",
+    "id": "c20d9d61.613f4",
     "type": "block",
     "name": "block setLocalNetworks",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2661.03125,
-    "y": 352.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2594.03125,
+    "y": 326.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "636f0708.977f58",
-        "af56db03.32d938"
+        "e8def7b2.2fbf88",
+        "8e1e86c2.e5c6e8"
       ]
     ]
   },
   {
-    "id": "636f0708.977f58",
+    "id": "e8def7b2.2fbf88",
     "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": 2864.03125,
-    "y": 287.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2797.03125,
+    "y": 261.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "af56db03.32d938",
+    "id": "8e1e86c2.e5c6e8",
     "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": 2893.03125,
-    "y": 339.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 2826.03125,
+    "y": 313.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "39e07dec.1621b2",
-        "91074007.ecd89"
+        "79bfda71.3cba44",
+        "385c2789.bb9748"
       ]
     ]
   },
   {
-    "id": "39e07dec.1621b2",
+    "id": "79bfda71.3cba44",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3090.03125,
-    "y": 274.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3023.03125,
+    "y": 248.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "cb051330.3cb5b"
+        "4e5e1e98.3ee33"
       ]
     ]
   },
   {
-    "id": "91074007.ecd89",
+    "id": "385c2789.bb9748",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3091.03125,
-    "y": 340.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3024.03125,
+    "y": 314.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "573f8606.d6b8a8"
+        "31b680e7.4204f"
       ]
     ]
   },
   {
-    "id": "573f8606.d6b8a8",
+    "id": "31b680e7.4204f",
     "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": 3272.03125,
-    "y": 338.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3205.03125,
+    "y": 312.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "cb051330.3cb5b",
+    "id": "4e5e1e98.3ee33",
     "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": 3292.5314140319824,
-    "y": 273.5312900543213,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3225.5314140319824,
+    "y": 247.5312900543213,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "99742942.c53d08"
+        "92921b5e.2aea28"
       ]
     ]
   },
   {
-    "id": "99742942.c53d08",
+    "id": "92921b5e.2aea28",
     "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": 3565.03125,
-    "y": 272.03125,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3498.03125,
+    "y": 246.03125,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "ce35f358.6f76e",
-        "8d00520d.551d5",
-        "2e5108cc.272428"
+        "7f44a5cd.ed61ec",
+        "94e571af.d5d5a",
+        "396567f.b05f898"
       ]
     ]
   },
   {
-    "id": "2e5108cc.272428",
+    "id": "396567f.b05f898",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3782.8003692626953,
-    "y": 312.7234847545624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3715.8003692626953,
+    "y": 286.7234847545624,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "dcf88a18.567f48"
+        "4b36101d.3eb74"
       ]
     ]
   },
   {
-    "id": "8d00520d.551d5",
+    "id": "94e571af.d5d5a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3790.8003692626953,
-    "y": 270.7234847545624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3723.8003692626953,
+    "y": 244.72348475456238,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "2d45b755.c2efb8"
+        "4dd39096.a8b53"
       ]
     ]
   },
   {
-    "id": "ce35f358.6f76e",
+    "id": "7f44a5cd.ed61ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3783.8003692626953,
-    "y": 232.72348475456238,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3716.8003692626953,
+    "y": 206.72348475456238,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "5eecb2c5.b15a1c"
+        "f52617f1.8bd0b8"
       ]
     ]
   },
   {
-    "id": "5eecb2c5.b15a1c",
+    "id": "f52617f1.8bd0b8",
     "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": 3958.3003005981445,
-    "y": 229.2234649658203,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3891.3003005981445,
+    "y": 203.2234649658203,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "2d45b755.c2efb8",
+    "id": "4dd39096.a8b53",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3947.8003692626953,
-    "y": 274.7234847545624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3880.8003692626953,
+    "y": 248.72348475456238,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "dcf88a18.567f48",
+    "id": "4b36101d.3eb74",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3940.8003692626953,
-    "y": 321.7234847545624,
-    "z": "1d7d5b1a.5d6895",
+    "x": 3873.8003692626953,
+    "y": 295.7234847545624,
+    "z": "da02cf5f.ae6f3",
     "wires": []
   },
   {
-    "id": "6c39ea0c.ba0e9c",
+    "id": "a95dc9c7.507158",
     "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",
+    "x": 1579,
+    "y": 1297,
+    "z": "da02cf5f.ae6f3",
     "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",
+    "id": "1c2a13ea.e2fe74",
+    "type": "switchNode",
+    "name": "switch vendor",
+    "xml": "<switch test=\"`$prop.sdncRestApi.thirdpartySdnc.vendor`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2150,
-    "y": 1384,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1585,
+    "y": 1436,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "952d3488.c107a8"
+        "5a0c70a7.9c1048"
       ]
     ]
   },
   {
-    "id": "6e7f216c.19692",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
+    "id": "5a0c70a7.9c1048",
+    "type": "outcomeTrue",
+    "name": "SPTN",
+    "xml": "<outcome value='SPTN'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2157.25,
-    "y": 1450.6428833007812,
-    "z": "1d7d5b1a.5d6895",
+    "x": 1739,
+    "y": 1438,
+    "z": "da02cf5f.ae6f3",
     "wires": [
       [
-        "323acdac.d34ffa"
+        "720459ea.25c288"
       ]
     ]
-  },
-  {
-    "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 43ac4a75..81bc7e9b 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": "f5a8ee3a.716df8",
+    "id": "6559b393.6f861c",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 92,
-    "y": 90,
-    "z": "4f2829e5.fc576",
+    "x": 119.03125,
+    "y": 56,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "181c6e18.5e551a"
+        "7c1b2fe9.45548"
       ]
     ]
   },
   {
-    "id": "181c6e18.5e551a",
+    "id": "7c1b2fe9.45548",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,692 +22,652 @@
     "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": 353,
-    "y": 161,
-    "z": "4f2829e5.fc576",
+    "x": 380.03125,
+    "y": 127,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "4deec5d.bc3e13c"
+        "aa816cc6.1183d"
       ]
     ]
   },
   {
-    "id": "4deec5d.bc3e13c",
+    "id": "aa816cc6.1183d",
     "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": 243,
-    "y": 246,
-    "z": "4f2829e5.fc576",
+    "x": 270.03125,
+    "y": 212,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "db590270.2247a"
+        "eac98b7a.9d5828"
       ]
     ]
   },
   {
-    "id": "db590270.2247a",
+    "id": "eac98b7a.9d5828",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 578.0000152587891,
-    "y": 246.00000953674316,
-    "z": "4f2829e5.fc576",
+    "x": 605.0312652587891,
+    "y": 212.00000953674316,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "ab4a3388.0c6b38",
-        "a32bd41.02ddda8",
-        "10699173.9d62bf",
-        "517a5a14.a94154",
-        "efd1462b.b12ac8",
-        "73a3e34f.020a74"
+        "477ac034.f205c",
+        "f8509dc8.168a7",
+        "8e2e032c.881de",
+        "68a7916a.a5311",
+        "6f360656.1dec58",
+        "7aead92.5a32728"
       ]
     ]
   },
   {
-    "id": "ab4a3388.0c6b38",
+    "id": "477ac034.f205c",
     "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": 913,
-    "y": 115,
-    "z": "4f2829e5.fc576",
+    "x": 930.0313568115234,
+    "y": 52.00000190734863,
+    "z": "5c765a65.b2ea34",
     "wires": [
       []
     ]
   },
   {
-    "id": "a32bd41.02ddda8",
+    "id": "f8509dc8.168a7",
     "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": 787,
-    "y": 1008,
-    "z": "4f2829e5.fc576",
+    "x": 814.03125,
+    "y": 974,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "9bf0ea3a.343b6",
+    "id": "c12d1dde.f4e3",
     "type": "block",
     "name": "block : sendRequest",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 974.5000305175781,
-    "y": 589.5156650543213,
-    "z": "4f2829e5.fc576",
+    "x": 1001.5312805175781,
+    "y": 555.5156650543213,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "9dd304ed.281768",
-        "efaa0ea1.0c4f18",
-        "c52f3ac0.e967a8",
-        "f2e7b7ab.8ad1d",
-        "c98e6def.0e6fb8"
+        "4ec4fd77.ad10f4",
+        "aa980a06.38e9b8",
+        "e11c9638.70d6a8",
+        "376cb70c.ff4a7"
       ]
     ]
   },
   {
-    "id": "b2910a08.b9547",
+    "id": "5870b6d9.9c5e38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1506.999927520752,
-    "y": 386.51519107818604,
-    "z": "4f2829e5.fc576",
+    "x": 1534.031177520752,
+    "y": 352.51519107818604,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "c0709608.52e74"
+        "25c20f00.fa6cf"
       ]
     ]
   },
   {
-    "id": "7302542d.935134",
+    "id": "39a6df4a.252ba",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1513.999927520752,
-    "y": 424.51519107818604,
-    "z": "4f2829e5.fc576",
+    "x": 1541.031177520752,
+    "y": 390.51519107818604,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "46e7f2ba.30df5c"
+        "3e95b312.6100ac"
       ]
     ]
   },
   {
-    "id": "c3c5a87c.e92ec",
+    "id": "f0e345da.109628",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1505.999927520752,
-    "y": 466.51519107818604,
-    "z": "4f2829e5.fc576",
+    "x": 1533.031177520752,
+    "y": 432.51519107818604,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "c4b5e7cb.79f558"
+        "3f665015.a6a47"
       ]
     ]
   },
   {
-    "id": "46e7f2ba.30df5c",
+    "id": "3e95b312.6100ac",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1670.999927520752,
-    "y": 428.51519107818604,
-    "z": "4f2829e5.fc576",
+    "x": 1698.031177520752,
+    "y": 394.51519107818604,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "c4b5e7cb.79f558",
+    "id": "3f665015.a6a47",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1663.999927520752,
-    "y": 475.51519107818604,
-    "z": "4f2829e5.fc576",
+    "x": 1691.031177520752,
+    "y": 441.51519107818604,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "9dd304ed.281768",
+    "id": "e11c9638.70d6a8",
     "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": 1283.000015258789,
-    "y": 433.51519799232483,
-    "z": "4f2829e5.fc576",
+    "x": 1310.031265258789,
+    "y": 399.51519799232483,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "b2910a08.b9547",
-        "7302542d.935134",
-        "c3c5a87c.e92ec"
+        "5870b6d9.9c5e38",
+        "39a6df4a.252ba",
+        "f0e345da.109628"
       ]
     ]
   },
   {
-    "id": "c0709608.52e74",
+    "id": "25c20f00.fa6cf",
     "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.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<parameter name='prop.sdncRestApi.thirdpartySdnc.vendor' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`\" />\n\n",
     "comments": "",
-    "x": 1686.4998779296875,
-    "y": 379.01513671875,
-    "z": "4f2829e5.fc576",
+    "x": 1713.5311279296875,
+    "y": 345.01513671875,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "ad303774.891d",
+    "id": "4ae70608.d9f108",
     "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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1782.5003051757812,
-    "y": 652.5156202316284,
-    "z": "4f2829e5.fc576",
+    "x": 2109.531539916992,
+    "y": 549.5156259536743,
+    "z": "5c765a65.b2ea34",
     "wires": [
       []
     ]
   },
   {
-    "id": "efaa0ea1.0c4f18",
+    "id": "cb70d9c8.c98578",
     "type": "switchNode",
     "name": "switch tunnelType",
     "xml": "<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1245.4997634887695,
-    "y": 677.0151309967041,
-    "z": "4f2829e5.fc576",
+    "x": 1572.5309982299805,
+    "y": 574.01513671875,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "96ca330.e8be2d",
-        "cc0d585a.c5e7e"
+        "cd693888.f47b98",
+        "41c50c84.a9e5b4"
       ]
     ]
   },
   {
-    "id": "96ca330.e8be2d",
+    "id": "cd693888.f47b98",
     "type": "outcomeTrue",
     "name": "L3-DCI",
     "xml": "<outcome value='L3-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1458.4998931884766,
-    "y": 657.0151309967041,
-    "z": "4f2829e5.fc576",
+    "x": 1785.5311279296875,
+    "y": 554.01513671875,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "ad303774.891d"
+        "4ae70608.d9f108"
       ]
     ]
   },
   {
-    "id": "cc0d585a.c5e7e",
+    "id": "41c50c84.a9e5b4",
     "type": "outcomeTrue",
     "name": "L2-DCI",
     "xml": "<outcome value='L2-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1456.499713897705,
-    "y": 729.0151309967041,
-    "z": "4f2829e5.fc576",
+    "x": 1783.530948638916,
+    "y": 626.01513671875,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "bacc084b.3ec41"
+        "c9cdc266.ba884"
       ]
     ]
   },
   {
-    "id": "bacc084b.3ec41",
+    "id": "c9cdc266.ba884",
     "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\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1776.500259399414,
-    "y": 729.5155563354492,
-    "z": "4f2829e5.fc576",
+    "x": 2103.531494140625,
+    "y": 626.5155620574951,
+    "z": "5c765a65.b2ea34",
     "wires": [
       []
     ]
   },
   {
-    "id": "a2b7f400.1f465",
+    "id": "56ea174e.66fdc8",
     "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": 1036.999984741211,
-    "y": 190.51563167572021,
-    "z": "4f2829e5.fc576",
+    "x": 1064.031234741211,
+    "y": 156.51563167572021,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "225b5a0e.27e1d6"
+        "d467ada9.bc47a"
       ]
     ]
   },
   {
-    "id": "c52f3ac0.e967a8",
+    "id": "4ec4fd77.ad10f4",
     "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.3333740234375,
-    "y": 542,
-    "z": "4f2829e5.fc576",
+    "x": 1247.3646240234375,
+    "y": 508,
+    "z": "5c765a65.b2ea34",
     "wires": [
       []
     ]
   },
   {
-    "id": "225b5a0e.27e1d6",
+    "id": "d467ada9.bc47a",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1270.3334274291992,
-    "y": 190.00000762939453,
-    "z": "4f2829e5.fc576",
+    "x": 1297.3646774291992,
+    "y": 156.00000762939453,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "be8fe02b.02612",
-        "9b16a3b9.1f3098"
+        "dfb8e94f.3061f8",
+        "6ee22c97.f3fe94"
       ]
     ]
   },
   {
-    "id": "be8fe02b.02612",
+    "id": "dfb8e94f.3061f8",
     "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": 1476.6666374206543,
-    "y": 159.00000381469727,
-    "z": "4f2829e5.fc576",
+    "x": 1503.6978874206543,
+    "y": 125.00000381469727,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "97e27afd.097dc"
+        "424ca41d.d8b57c"
       ]
     ]
   },
   {
-    "id": "97e27afd.097dc",
+    "id": "424ca41d.d8b57c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1677.666732788086,
-    "y": 158.00000286102295,
-    "z": "4f2829e5.fc576",
+    "x": 1704.697982788086,
+    "y": 124.00000286102295,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "b51077df.7867c"
+        "3b8b7bc.f6de684"
       ]
     ]
   },
   {
-    "id": "b51077df.7867c",
+    "id": "3b8b7bc.f6de684",
     "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": 1851.3330841064453,
-    "y": 157.66654777526855,
-    "z": "4f2829e5.fc576",
+    "x": 1878.3643341064453,
+    "y": 123.66654777526855,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "9b16a3b9.1f3098",
+    "id": "6ee22c97.f3fe94",
     "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": 1486.6667175292969,
-    "y": 212.00000977516174,
-    "z": "4f2829e5.fc576",
+    "x": 1513.6979675292969,
+    "y": 178.00000977516174,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "f71924ef.335e7"
+        "b8f51f64.5384d"
       ]
     ]
   },
   {
-    "id": "f71924ef.335e7",
+    "id": "b8f51f64.5384d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1692.6667175292969,
-    "y": 212.00000977516174,
-    "z": "4f2829e5.fc576",
+    "x": 1719.6979675292969,
+    "y": 178.00000977516174,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "81bda338.0c501"
+        "a2c0d127.d5692"
       ]
     ]
   },
   {
-    "id": "81bda338.0c501",
+    "id": "a2c0d127.d5692",
     "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": 1861.6668167114258,
-    "y": 212.0000250339508,
-    "z": "4f2829e5.fc576",
+    "x": 1888.6980667114258,
+    "y": 178.0000250339508,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "10699173.9d62bf",
+    "id": "8e2e032c.881de",
     "type": "block",
     "name": "block : executeSite1",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 766.3333358764648,
-    "y": 191.66666412353516,
-    "z": "4f2829e5.fc576",
+    "x": 793.3645858764648,
+    "y": 157.66666412353516,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "a2b7f400.1f465",
-        "9bf0ea3a.343b6"
+        "56ea174e.66fdc8",
+        "c12d1dde.f4e3"
       ]
     ]
   },
   {
-    "id": "13dfccf8.bd0803",
+    "id": "c8ad7c0c.e274a",
     "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": 1042.0000686645508,
-    "y": 296.66663551330566,
-    "z": "4f2829e5.fc576",
+    "x": 1069.0313186645508,
+    "y": 262.66663551330566,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "9c692b97.c836f"
+        "323207f2.263c18"
       ]
     ]
   },
   {
-    "id": "9c692b97.c836f",
+    "id": "323207f2.263c18",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1270.3334350585938,
-    "y": 299.15101146698,
-    "z": "4f2829e5.fc576",
+    "x": 1297.3646850585938,
+    "y": 265.15101146698,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "3edb515.a48a22e"
+        "3c001f99.e738d"
       ]
     ]
   },
   {
-    "id": "3edb515.a48a22e",
+    "id": "3c001f99.e738d",
     "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": 1471.3333854675293,
-    "y": 299.15099716186523,
-    "z": "4f2829e5.fc576",
+    "x": 1498.3646354675293,
+    "y": 265.15099716186523,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "948a60aa.59ad7"
+        "69a68f4d.5d472"
       ]
     ]
   },
   {
-    "id": "948a60aa.59ad7",
+    "id": "69a68f4d.5d472",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1672.333480834961,
-    "y": 298.1509962081909,
-    "z": "4f2829e5.fc576",
+    "x": 1699.364730834961,
+    "y": 264.1509962081909,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "1962949c.26443b"
+        "2194fc1d.e7f094"
       ]
     ]
   },
   {
-    "id": "1962949c.26443b",
+    "id": "2194fc1d.e7f094",
     "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": 1845.9998321533203,
-    "y": 297.8175411224365,
-    "z": "4f2829e5.fc576",
+    "x": 1873.0310821533203,
+    "y": 263.8175411224365,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "517a5a14.a94154",
+    "id": "68a7916a.a5311",
     "type": "block",
     "name": "block : executeSite1",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 766.3333435058594,
-    "y": 300.8176679611206,
-    "z": "4f2829e5.fc576",
+    "x": 793.3645935058594,
+    "y": 266.8176679611206,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "13dfccf8.bd0803",
-        "9bf0ea3a.343b6"
+        "c8ad7c0c.e274a",
+        "c12d1dde.f4e3"
       ]
     ]
   },
   {
-    "id": "8eb2a0d4.825dc8",
+    "id": "c71a68d.91d3a98",
     "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": 1081.3373260498047,
-    "y": 821.8607425689697,
-    "z": "4f2829e5.fc576",
+    "x": 1108.3685760498047,
+    "y": 787.8607425689697,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "56c4779e.6fd13",
+    "id": "8529d043.0aea5",
     "type": "set",
     "name": "set networkId",
     "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
     "comments": "",
-    "x": 1075.622959136963,
-    "y": 784.7178506851196,
-    "z": "4f2829e5.fc576",
+    "x": 1102.654209136963,
+    "y": 750.7178506851196,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "efd1462b.b12ac8",
+    "id": "6f360656.1dec58",
     "type": "block",
     "name": "block : saveNetworkData",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 818.3333969116211,
-    "y": 760.6666917800903,
-    "z": "4f2829e5.fc576",
+    "x": 845.3646469116211,
+    "y": 726.6666917800903,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "56c4779e.6fd13",
-        "8eb2a0d4.825dc8",
-        "cc5c05c.b33c178",
-        "36a63a6b.ba56a6"
+        "8529d043.0aea5",
+        "c71a68d.91d3a98",
+        "b1e695ce.6afdf8",
+        "7c7891ee.131d7"
       ]
     ]
   },
   {
-    "id": "edaf65d1.c9376",
+    "id": "3da3119d.a99f0e",
     "type": "comment",
     "name": "TODO",
     "info": "Currently deactivate does deletion too, later divide in two phases.",
     "comments": "",
-    "x": 700.3333358764648,
-    "y": 54,
-    "z": "4f2829e5.fc576",
+    "x": 727.3645858764648,
+    "y": 20,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "cc5c05c.b33c178",
+    "id": "b1e695ce.6afdf8",
     "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": 1111.3334045410156,
-    "y": 741.0000038146973,
-    "z": "4f2829e5.fc576",
+    "x": 1138.3646545410156,
+    "y": 707.0000038146973,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "36a63a6b.ba56a6",
+    "id": "7c7891ee.131d7",
     "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": 1125.3333358764648,
-    "y": 868.9999618530273,
-    "z": "4f2829e5.fc576",
+    "x": 1152.3645858764648,
+    "y": 834.9999618530273,
+    "z": "5c765a65.b2ea34",
     "wires": []
   },
   {
-    "id": "73a3e34f.020a74",
+    "id": "7aead92.5a32728",
     "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": 855,
-    "y": 928,
-    "z": "4f2829e5.fc576",
+    "x": 882.03125,
+    "y": 894,
+    "z": "5c765a65.b2ea34",
     "wires": [
       []
     ]
   },
   {
-    "id": "f2e7b7ab.8ad1d",
+    "id": "aa980a06.38e9b8",
     "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",
+    "x": 1282.03125,
+    "y": 456,
+    "z": "5c765a65.b2ea34",
     "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",
+    "id": "376cb70c.ff4a7",
+    "type": "switchNode",
+    "name": "switch vendor",
+    "xml": "<switch test=\"`$prop.sdncRestApi.thirdpartySdnc.vendor`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1702,
-    "y": 537,
-    "z": "4f2829e5.fc576",
+    "x": 1239,
+    "y": 576,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "b77a0163.0800d"
+        "26c37886.1a934"
       ]
     ]
   },
   {
-    "id": "5977545b.66d21c",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
+    "id": "26c37886.1a934",
+    "type": "outcomeTrue",
+    "name": "SPTN",
+    "xml": "<outcome value='SPTN'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1709.25,
-    "y": 603.6428833007812,
-    "z": "4f2829e5.fc576",
+    "x": 1393,
+    "y": 578,
+    "z": "5c765a65.b2ea34",
     "wires": [
       [
-        "ad04fb75.6d618"
+        "cb70d9c8.c98578"
       ]
     ]
-  },
-  {
-    "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 4f1126c1..9d4e58d9 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": "c755dc6.4fb532",
+    "id": "334bd25e.3b958e",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 98,
-    "y": 69,
-    "z": "d1c71750.37b338",
+    "x": 88,
+    "y": 62.999969482421875,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "80264a38.3fce88"
+        "46c76be0.4ae1ec"
       ]
     ]
   },
   {
-    "id": "80264a38.3fce88",
+    "id": "46c76be0.4ae1ec",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,2288 +22,2312 @@
     "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": 310.00000381469727,
-    "y": 141.0000171661377,
-    "z": "d1c71750.37b338",
+    "x": 300.00000381469727,
+    "y": 134.99998664855957,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "8d5d312f.9d9cd"
+        "6216646e.335424"
       ]
     ]
   },
   {
-    "id": "8d5d312f.9d9cd",
+    "id": "6216646e.335424",
     "type": "method",
     "name": "method network-topology-operation-create",
     "xml": "<method rpc='network-topology-operation-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 298.0001220703125,
-    "y": 229,
-    "z": "d1c71750.37b338",
+    "x": 288.0001220703125,
+    "y": 222.99996948242188,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "b2241a21.76a97"
+        "ea50b732.2ea01"
       ]
     ]
   },
   {
-    "id": "b2241a21.76a97",
+    "id": "ea50b732.2ea01",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 374,
-    "y": 627.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 364,
+    "y": 621,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "5f4a6be2.122adc",
-        "3b31c47b.b0ee54",
-        "bde939b5.904ee8",
-        "e986dd0a.7fdf58",
-        "ba17de0c.0ea5e",
-        "39b02aa1.204f3e",
-        "bee6a021.504aa8",
-        "f7d82967.39b968",
-        "e292252a.39cff8",
-        "31c5a0ea.7876c",
-        "f41c462f.8589a",
-        "58848908.ffbbb",
-        "7b14c9f6.80d72",
-        "a66c7c7d.376898",
-        "30879b4d.be3994",
-        "dd6bc2bc.fdc89",
-        "d54c20dc.cf6128",
-        "b11968d4.007e68",
-        "725ceec3.c5b2"
+        "3f70abff.f62544",
+        "1db363a4.5e5bdc",
+        "675b0828.5f3f38",
+        "a0cacee0.a7a5a8",
+        "efc2210e.acb0a",
+        "3e3972fa.77b7f6",
+        "d43bb648.453b08",
+        "4946b4b6.2645f4",
+        "3c09007b.15e098",
+        "6c6c2617.940e5",
+        "68a6c57e.f14dec",
+        "26e0b74.7b173c8",
+        "d899adb0.900798",
+        "8e08cbd2.d417e8",
+        "5c73bbe5.1df864",
+        "387886dd.77b922",
+        "60cb5057.fb4318",
+        "a2104e27.ed674",
+        "c690b1cd.2300e8",
+        "b676786f.1bea58",
+        "d8859d72.093c7"
       ]
     ]
   },
   {
-    "id": "ec4c3437.b9425",
+    "id": "4a98e8a7.30e56",
     "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.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=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1121.0001831054688,
-    "y": 1000,
-    "z": "d1c71750.37b338",
+    "x": 1111.0001831054688,
+    "y": 993.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "d40cc8a7.624908",
-        "c80688e8.50ffd"
+        "a7b0af3.7ac715",
+        "ced00609.d81b48"
       ]
     ]
   },
   {
-    "id": "715951e.aa50f3",
+    "id": "76f264c.7ba0a9c",
     "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.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": 1275.0000610351562,
-    "y": 274,
-    "z": "d1c71750.37b338",
+    "x": 1265.0000610351562,
+    "y": 267.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "bde939b5.904ee8",
+    "id": "675b0828.5f3f38",
     "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": 816.6666259765625,
-    "y": 189.66665649414062,
-    "z": "d1c71750.37b338",
+    "x": 806.6666259765625,
+    "y": 183.6666259765625,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "d3d6530.ff1843"
+        "fdabde17.5c847"
       ]
     ]
   },
   {
-    "id": "257293b6.92d5cc",
+    "id": "89285d57.29b5c8",
     "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.restapi.templateDir +'/sptn-l3vpn-template.xml'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/sptn-service-l3vpn:service/snc-l3vpns'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"xml\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1053.6668701171875,
-    "y": 1261.666748046875,
-    "z": "d1c71750.37b338",
+    "x": 1043.6668701171875,
+    "y": 1255.6667175292969,
+    "z": "b1905c0.2226628",
     "wires": [
       []
     ]
   },
   {
-    "id": "3b31c47b.b0ee54",
+    "id": "1db363a4.5e5bdc",
     "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": 819.6666259765625,
-    "y": 462.66668701171875,
-    "z": "d1c71750.37b338",
+    "x": 809.6666259765625,
+    "y": 456.6666564941406,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "c0078e33.2f6078"
+        "fd6478e7.b7b91"
       ]
     ]
   },
   {
-    "id": "c0078e33.2f6078",
+    "id": "fd6478e7.b7b91",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1044.6666259765625,
-    "y": 465.6666564941406,
-    "z": "d1c71750.37b338",
+    "x": 1034.6666259765625,
+    "y": 459.6666259765625,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "c5ccda76.692ed"
+        "afc1b363.b7a39"
       ]
     ]
   },
   {
-    "id": "c5ccda76.692ed",
+    "id": "afc1b363.b7a39",
     "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": 1225.6666259765625,
-    "y": 463.6666564941406,
-    "z": "d1c71750.37b338",
+    "x": 1215.6666259765625,
+    "y": 457.6666259765625,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "5f4a6be2.122adc",
+    "id": "3f70abff.f62544",
     "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": 871.5,
-    "y": 106,
-    "z": "d1c71750.37b338",
+    "x": 861.5,
+    "y": 99.99996948242188,
+    "z": "b1905c0.2226628",
     "wires": [
       []
     ]
   },
   {
-    "id": "dd6bc2bc.fdc89",
+    "id": "5c73bbe5.1df864",
     "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": 832.5,
-    "y": 340,
-    "z": "d1c71750.37b338",
+    "x": 822.5,
+    "y": 333.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "8dbd8bc6.d1cbd8",
-        "4c28930c.3740a4",
-        "e399b426.d74ce"
+        "1b55c06c.3411f",
+        "ae5faeba.f046c",
+        "df5eda3d.a15fe"
       ]
     ]
   },
   {
-    "id": "8dbd8bc6.d1cbd8",
+    "id": "1b55c06c.3411f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1077.5,
-    "y": 286,
-    "z": "d1c71750.37b338",
+    "x": 1067.5,
+    "y": 279.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "715951e.aa50f3"
+        "76f264c.7ba0a9c"
       ]
     ]
   },
   {
-    "id": "4c28930c.3740a4",
+    "id": "ae5faeba.f046c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1080.990966796875,
-    "y": 333.57403564453125,
-    "z": "d1c71750.37b338",
+    "x": 1070.990966796875,
+    "y": 327.5740051269531,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "ed8f061.2ee11f8"
+        "943fc2bc.e3e328"
       ]
     ]
   },
   {
-    "id": "e399b426.d74ce",
+    "id": "df5eda3d.a15fe",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1076.323974609375,
-    "y": 374.9073486328125,
-    "z": "d1c71750.37b338",
+    "x": 1066.323974609375,
+    "y": 368.9073181152344,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "37b86197.b131ae"
+        "92e8f917.b6ec08"
       ]
     ]
   },
   {
-    "id": "ed8f061.2ee11f8",
+    "id": "943fc2bc.e3e328",
     "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": 1257.5623779296875,
-    "y": 321.8597717285156,
-    "z": "d1c71750.37b338",
+    "x": 1247.5623779296875,
+    "y": 315.8597412109375,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "37b86197.b131ae",
+    "id": "92e8f917.b6ec08",
     "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": 1264.0965309143066,
-    "y": 370.3465414047241,
-    "z": "d1c71750.37b338",
+    "x": 1254.0965309143066,
+    "y": 364.346510887146,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "79980939.27992",
+    "id": "a016ef4c.00b8d8",
     "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": 1609.5,
-    "y": 40.000030517578125,
-    "z": "d1c71750.37b338",
+    "x": 1599.5,
+    "y": 34,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "485e0689.38ce3"
+        "7823b220.68af5c"
       ]
     ]
   },
   {
-    "id": "6566447b.cd16fc",
+    "id": "42d21e94.8794d",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1613.4999389648438,
-    "y": 97.60000610351562,
-    "z": "d1c71750.37b338",
+    "x": 1603.4999389648438,
+    "y": 91.5999755859375,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "95810552.2e3558"
+        "fba273ef.824e7"
       ]
     ]
   },
   {
-    "id": "485e0689.38ce3",
+    "id": "7823b220.68af5c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1796.5,
-    "y": 36.000030517578125,
-    "z": "d1c71750.37b338",
+    "x": 1786.5,
+    "y": 30,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "8905bcbf.11f838"
+        "73def40f.26af94"
       ]
     ]
   },
   {
-    "id": "95810552.2e3558",
+    "id": "fba273ef.824e7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1798.4999389648438,
-    "y": 95.60000610351562,
-    "z": "d1c71750.37b338",
+    "x": 1788.4999389648438,
+    "y": 89.5999755859375,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "4a110462.b2e7b4"
+        "8f3c7f01.3f5cd8"
       ]
     ]
   },
   {
-    "id": "8905bcbf.11f838",
+    "id": "73def40f.26af94",
     "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": 1964.5,
-    "y": 36.60003662109375,
-    "z": "d1c71750.37b338",
+    "x": 1954.5,
+    "y": 30.600006103515625,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "4a110462.b2e7b4",
+    "id": "8f3c7f01.3f5cd8",
     "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": 1967.4999389648438,
-    "y": 93.60000610351562,
-    "z": "d1c71750.37b338",
+    "x": 1957.4999389648438,
+    "y": 87.5999755859375,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "db1ad825.26052",
+    "id": "141c3d3d.ab7053",
     "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": 1612.5,
-    "y": 159,
-    "z": "d1c71750.37b338",
+    "x": 1602.5,
+    "y": 152.99996948242188,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "8e30a166.dc4c3"
+        "646edb42.22d774"
       ]
     ]
   },
   {
-    "id": "612a1bef.8a1a9c",
+    "id": "4ee7a07.d59c26",
     "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": 1615.5,
-    "y": 212,
-    "z": "d1c71750.37b338",
+    "x": 1605.5,
+    "y": 205.99996948242188,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "4a904aae.350a04"
+        "1d562a47.bcc43e"
       ]
     ]
   },
   {
-    "id": "32815667.56769a",
+    "id": "5c63bd35.850224",
     "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": 1620.5,
-    "y": 274,
-    "z": "d1c71750.37b338",
+    "x": 1610.5,
+    "y": 267.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "8796222c.6fa77"
+        "5c2dde3b.616048"
       ]
     ]
   },
   {
-    "id": "d99350c4.40314",
+    "id": "58f3e289.2a7e64",
     "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": 1615.5,
-    "y": 337,
-    "z": "d1c71750.37b338",
+    "x": 1605.5,
+    "y": 330.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "f4f0e78c.aadc4"
+        "62672aa9.ed61fc"
       ]
     ]
   },
   {
-    "id": "e54a4b77.575f08",
+    "id": "95375fe3.44bc28",
     "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": 1620.5,
-    "y": 397,
-    "z": "d1c71750.37b338",
+    "x": 1610.5,
+    "y": 390.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "877c7d0f.86dd"
+        "34588a45.0b76ce"
       ]
     ]
   },
   {
-    "id": "a16ad1af.30669",
+    "id": "fe0b88f6.f80e9",
     "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": 1615.5,
-    "y": 461,
-    "z": "d1c71750.37b338",
+    "x": 1605.5,
+    "y": 454.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "d7e263ff.d62088"
+        "a6fb987c.7f515"
       ]
     ]
   },
   {
-    "id": "a9d432.f245a3d",
+    "id": "7a18b8ce.d5dc",
     "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": 1620.5,
-    "y": 523,
-    "z": "d1c71750.37b338",
+    "x": 1610.5,
+    "y": 516.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "d8f67746.e97618"
+        "92e2ca99.658f38"
       ]
     ]
   },
   {
-    "id": "89f7d244.7bed58",
+    "id": "13b6f73a.13b789",
     "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": 1635.5,
-    "y": 583,
-    "z": "d1c71750.37b338",
+    "x": 1625.5,
+    "y": 576.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "1af5cef.1a18eb1"
+        "b1abbb19.2fcad"
       ]
     ]
   },
   {
-    "id": "9e107c02.44f758",
+    "id": "fd7f4144.b3829",
     "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": 1630.5,
-    "y": 655,
-    "z": "d1c71750.37b338",
+    "x": 1620.5,
+    "y": 648.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "837e8793.ef9c9"
+        "b2c23108.34249"
       ]
     ]
   },
   {
-    "id": "37c58153.b2998e",
+    "id": "45ea1a7b.99de84",
     "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": 1629.5,
-    "y": 714,
-    "z": "d1c71750.37b338",
+    "x": 1619.5,
+    "y": 707.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "cc628d9.cda75f"
+        "cefcde62.39a058"
       ]
     ]
   },
   {
-    "id": "9ab7bd24.8d06c8",
+    "id": "2d742a69.fb645e",
     "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": 1606.5,
-    "y": 777,
-    "z": "d1c71750.37b338",
+    "x": 1596.5,
+    "y": 770.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "b6eb1b8b.204bb"
+        "97b77413.58ee48"
       ]
     ]
   },
   {
-    "id": "c98044e2.7a0fd",
+    "id": "a750a836.67c46",
     "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": 1609.5,
-    "y": 834,
-    "z": "d1c71750.37b338",
+    "x": 1599.5,
+    "y": 827.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "67413744.703078"
+        "d85c061f.502f68"
       ]
     ]
   },
   {
-    "id": "9c377089.4d9f3",
+    "id": "32c3f1e3.30689e",
     "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": 1615.5,
-    "y": 886,
-    "z": "d1c71750.37b338",
+    "x": 1605.5,
+    "y": 879.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "762be29b.5e95bc"
+        "2968f925.7ca646"
       ]
     ]
   },
   {
-    "id": "6227130a.b283dc",
+    "id": "e951ad31.5ca928",
     "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": 1616.5,
-    "y": 941,
-    "z": "d1c71750.37b338",
+    "x": 1606.5,
+    "y": 934.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "b47203e8.02223"
+        "601aa678.9a67f8"
       ]
     ]
   },
   {
-    "id": "87656c47.a73838",
+    "id": "e3393629.af0d3",
     "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": 1628.5,
-    "y": 990,
-    "z": "d1c71750.37b338",
+    "x": 1618.5,
+    "y": 983.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "f47a7f0.182ed8"
+        "a2f05df5.918ee"
       ]
     ]
   },
   {
-    "id": "9d6a7f28.4304b",
+    "id": "62f6947f.61850c",
     "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": 1621.5,
-    "y": 1041,
-    "z": "d1c71750.37b338",
+    "x": 1611.5,
+    "y": 1034.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "88ef93af.1ec22"
+        "81528be0.14be3"
       ]
     ]
   },
   {
-    "id": "b0373753.70f0a",
+    "id": "746e4da0.8ed054",
     "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": 1614.5,
-    "y": 1099,
-    "z": "d1c71750.37b338",
+    "x": 1604.5,
+    "y": 1092.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "b0c70aaf.aa196"
+        "e4005648.dfa27"
       ]
     ]
   },
   {
-    "id": "a53453dd.69ab28",
+    "id": "ce1e821a.8edd98",
     "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": 1615.5,
-    "y": 1159,
-    "z": "d1c71750.37b338",
+    "x": 1605.5,
+    "y": 1152.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "6f144e4b.8ca8a"
+        "302c5dc1.424eaa"
       ]
     ]
   },
   {
-    "id": "9abdda02.3e776",
+    "id": "ac3cc96e.e8c948",
     "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": 1609.5,
-    "y": 1345,
-    "z": "d1c71750.37b338",
+    "x": 1599.5,
+    "y": 1338.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "7db2780.3608008"
+        "b346bc87.20f83"
       ]
     ]
   },
   {
-    "id": "e12d824c.4650c8",
+    "id": "baf40051.ee5bc",
     "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": 1615.5,
-    "y": 1396,
-    "z": "d1c71750.37b338",
+    "x": 1605.5,
+    "y": 1389.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "7f6622dd.022f64"
+        "a31fc214.1ca9f"
       ]
     ]
   },
   {
-    "id": "46a813fb.9bd0f4",
+    "id": "c4c0db18.879888",
     "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": 1582.5,
-    "y": 1487,
-    "z": "d1c71750.37b338",
+    "x": 1572.5,
+    "y": 1480.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "b96483f6.45c738"
+        "abf52cdc.20fb88"
       ]
     ]
   },
   {
-    "id": "8e30a166.dc4c3",
+    "id": "646edb42.22d774",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1787.5,
-    "y": 155,
-    "z": "d1c71750.37b338",
+    "x": 1777.5,
+    "y": 148.99996948242188,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "5c246487.156d2c"
+        "107b061b.7f16b2"
       ]
     ]
   },
   {
-    "id": "4a904aae.350a04",
+    "id": "1d562a47.bcc43e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1793.5,
-    "y": 208,
-    "z": "d1c71750.37b338",
+    "x": 1783.5,
+    "y": 201.99996948242188,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "aef4e4d3.e357c"
+        "fb1300d0.70aa88"
       ]
     ]
   },
   {
-    "id": "8796222c.6fa77",
+    "id": "5c2dde3b.616048",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1802.5,
-    "y": 270,
-    "z": "d1c71750.37b338",
+    "x": 1792.5,
+    "y": 263.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "913fcc28.6f8338"
+        "e77b09fa.d7d64"
       ]
     ]
   },
   {
-    "id": "f4f0e78c.aadc4",
+    "id": "62672aa9.ed61fc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1800.5,
-    "y": 333,
-    "z": "d1c71750.37b338",
+    "x": 1790.5,
+    "y": 326.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "785ee992.13114"
+        "93f053bd.02a548"
       ]
     ]
   },
   {
-    "id": "877c7d0f.86dd",
+    "id": "34588a45.0b76ce",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1805.5,
-    "y": 395,
-    "z": "d1c71750.37b338",
+    "x": 1795.5,
+    "y": 388.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "e33dfd5b.4d737"
+        "a884a526.618c28"
       ]
     ]
   },
   {
-    "id": "d7e263ff.d62088",
+    "id": "a6fb987c.7f515",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1797.5,
-    "y": 453,
-    "z": "d1c71750.37b338",
+    "x": 1787.5,
+    "y": 446.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "a4ccc339.77b078"
+        "f7ce6bb9.9a7a9"
       ]
     ]
   },
   {
-    "id": "d8f67746.e97618",
+    "id": "92e2ca99.658f38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1798.5,
-    "y": 516,
-    "z": "d1c71750.37b338",
+    "x": 1788.5,
+    "y": 509.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "5f722601.0dd94"
+        "6aec4eb8.f320e"
       ]
     ]
   },
   {
-    "id": "1af5cef.1a18eb1",
+    "id": "b1abbb19.2fcad",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1797.5,
-    "y": 585,
-    "z": "d1c71750.37b338",
+    "x": 1787.5,
+    "y": 578.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "f5aa06de.054208"
+        "51e03a88.5af60c"
       ]
     ]
   },
   {
-    "id": "837e8793.ef9c9",
+    "id": "b2c23108.34249",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1794.5,
-    "y": 653,
-    "z": "d1c71750.37b338",
+    "x": 1784.5,
+    "y": 646.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "96cf4bf8.bd2d6"
+        "517deb3b.1a11bc"
       ]
     ]
   },
   {
-    "id": "cc628d9.cda75f",
+    "id": "cefcde62.39a058",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1793.5,
-    "y": 717,
-    "z": "d1c71750.37b338",
+    "x": 1783.5,
+    "y": 710.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "514c2d04.fd52e4"
+        "c4018004.404be"
       ]
     ]
   },
   {
-    "id": "b6eb1b8b.204bb",
+    "id": "97b77413.58ee48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1766.5,
-    "y": 775,
-    "z": "d1c71750.37b338",
+    "x": 1756.5,
+    "y": 768.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "78158e69.19003"
+        "d3532521.bb7d38"
       ]
     ]
   },
   {
-    "id": "67413744.703078",
+    "id": "d85c061f.502f68",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1768.5,
-    "y": 832,
-    "z": "d1c71750.37b338",
+    "x": 1758.5,
+    "y": 825.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "a78b99c4.9438d"
+        "e79e82f8.255518"
       ]
     ]
   },
   {
-    "id": "762be29b.5e95bc",
+    "id": "2968f925.7ca646",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1804.5,
-    "y": 883,
-    "z": "d1c71750.37b338",
+    "x": 1794.5,
+    "y": 876.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "71f0b03f.45cda"
+        "c560a215.f29018"
       ]
     ]
   },
   {
-    "id": "b47203e8.02223",
+    "id": "601aa678.9a67f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1809.5,
-    "y": 946,
-    "z": "d1c71750.37b338",
+    "x": 1799.5,
+    "y": 939.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "89aee34.3120ea"
+        "73c88606.5381e"
       ]
     ]
   },
   {
-    "id": "f47a7f0.182ed8",
+    "id": "a2f05df5.918ee",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1805.5,
-    "y": 995,
-    "z": "d1c71750.37b338",
+    "x": 1795.5,
+    "y": 988.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "767f5368.9e89f4"
+        "b6e32aaf.1d4358"
       ]
     ]
   },
   {
-    "id": "88ef93af.1ec22",
+    "id": "81528be0.14be3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1789.5,
-    "y": 1044,
-    "z": "d1c71750.37b338",
+    "x": 1779.5,
+    "y": 1037.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "84e8e875.de3c78"
+        "3da3bd09.271e42"
       ]
     ]
   },
   {
-    "id": "b0c70aaf.aa196",
+    "id": "e4005648.dfa27",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1786.5,
-    "y": 1097,
-    "z": "d1c71750.37b338",
+    "x": 1776.5,
+    "y": 1090.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "6928b887.0efe58"
+        "3008b334.6e0ccc"
       ]
     ]
   },
   {
-    "id": "6f144e4b.8ca8a",
+    "id": "302c5dc1.424eaa",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1799.5,
-    "y": 1156,
-    "z": "d1c71750.37b338",
+    "x": 1789.5,
+    "y": 1149.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "1d3a4115.7746c7"
+        "8e9dab50.3a0e28"
       ]
     ]
   },
   {
-    "id": "7db2780.3608008",
+    "id": "b346bc87.20f83",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1817.5,
-    "y": 1342,
-    "z": "d1c71750.37b338",
+    "x": 1807.5,
+    "y": 1335.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "6cea4c1f.ab47ac"
+        "b8ec5e66.c0da4"
       ]
     ]
   },
   {
-    "id": "7f6622dd.022f64",
+    "id": "a31fc214.1ca9f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1824.5,
-    "y": 1392,
-    "z": "d1c71750.37b338",
+    "x": 1814.5,
+    "y": 1385.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "e150d4b3.e7c148"
+        "d3572336.1890c"
       ]
     ]
   },
   {
-    "id": "b96483f6.45c738",
+    "id": "abf52cdc.20fb88",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1786.5,
-    "y": 1496,
-    "z": "d1c71750.37b338",
+    "x": 1776.5,
+    "y": 1489.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "637cf71c.1ca77"
+        "11091e74.b17202"
       ]
     ]
   },
   {
-    "id": "5c246487.156d2c",
+    "id": "107b061b.7f16b2",
     "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": 1982.5,
-    "y": 156,
-    "z": "d1c71750.37b338",
+    "x": 1972.5,
+    "y": 149.99996948242188,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "aef4e4d3.e357c",
+    "id": "fb1300d0.70aa88",
     "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": 1972.5,
-    "y": 210,
-    "z": "d1c71750.37b338",
+    "x": 1962.5,
+    "y": 203.99996948242188,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "913fcc28.6f8338",
+    "id": "e77b09fa.d7d64",
     "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": 1976.5,
-    "y": 267,
-    "z": "d1c71750.37b338",
+    "x": 1966.5,
+    "y": 260.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "785ee992.13114",
+    "id": "93f053bd.02a548",
     "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": 1979.5,
-    "y": 326,
-    "z": "d1c71750.37b338",
+    "x": 1969.5,
+    "y": 319.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "e33dfd5b.4d737",
+    "id": "a884a526.618c28",
     "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": 1987.5,
-    "y": 388,
-    "z": "d1c71750.37b338",
+    "x": 1977.5,
+    "y": 381.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "a4ccc339.77b078",
+    "id": "f7ce6bb9.9a7a9",
     "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": 1979.5,
-    "y": 448,
-    "z": "d1c71750.37b338",
+    "x": 1969.5,
+    "y": 441.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "5f722601.0dd94",
+    "id": "6aec4eb8.f320e",
     "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": 1976.5,
-    "y": 508,
-    "z": "d1c71750.37b338",
+    "x": 1966.5,
+    "y": 501.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "f5aa06de.054208",
+    "id": "51e03a88.5af60c",
     "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": 1972.5,
-    "y": 579,
-    "z": "d1c71750.37b338",
+    "x": 1962.5,
+    "y": 572.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "96cf4bf8.bd2d6",
+    "id": "517deb3b.1a11bc",
     "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": 1965.5,
-    "y": 645,
-    "z": "d1c71750.37b338",
+    "x": 1955.5,
+    "y": 638.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "514c2d04.fd52e4",
+    "id": "c4018004.404be",
     "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": 1968.5,
-    "y": 712,
-    "z": "d1c71750.37b338",
+    "x": 1958.5,
+    "y": 705.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "78158e69.19003",
+    "id": "d3532521.bb7d38",
     "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": 1944.5,
-    "y": 778,
-    "z": "d1c71750.37b338",
+    "x": 1934.5,
+    "y": 771.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "a78b99c4.9438d",
+    "id": "e79e82f8.255518",
     "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": 1948.5,
-    "y": 832,
-    "z": "d1c71750.37b338",
+    "x": 1938.5,
+    "y": 825.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "71f0b03f.45cda",
+    "id": "c560a215.f29018",
     "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": 1996.5,
-    "y": 887,
-    "z": "d1c71750.37b338",
+    "x": 1986.5,
+    "y": 880.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "89aee34.3120ea",
+    "id": "73c88606.5381e",
     "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": 1992.5,
-    "y": 942,
-    "z": "d1c71750.37b338",
+    "x": 1982.5,
+    "y": 935.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "767f5368.9e89f4",
+    "id": "b6e32aaf.1d4358",
     "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": 1986.5,
-    "y": 997,
-    "z": "d1c71750.37b338",
+    "x": 1976.5,
+    "y": 990.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "84e8e875.de3c78",
+    "id": "3da3bd09.271e42",
     "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": 1983.5,
-    "y": 1050,
-    "z": "d1c71750.37b338",
+    "x": 1973.5,
+    "y": 1043.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "6928b887.0efe58",
+    "id": "3008b334.6e0ccc",
     "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": 1981.5,
-    "y": 1107,
-    "z": "d1c71750.37b338",
+    "x": 1971.5,
+    "y": 1100.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "1d3a4115.7746c7",
+    "id": "8e9dab50.3a0e28",
     "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": 1990.5,
-    "y": 1159,
-    "z": "d1c71750.37b338",
+    "x": 1980.5,
+    "y": 1152.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "6cea4c1f.ab47ac",
+    "id": "b8ec5e66.c0da4",
     "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": 2084.5,
-    "y": 1363,
-    "z": "d1c71750.37b338",
+    "x": 2074.5,
+    "y": 1356.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "e150d4b3.e7c148",
+    "id": "d3572336.1890c",
     "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": 2096.5,
-    "y": 1412,
-    "z": "d1c71750.37b338",
+    "x": 2086.5,
+    "y": 1405.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "637cf71c.1ca77",
+    "id": "11091e74.b17202",
     "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": 1980.5,
-    "y": 1506,
-    "z": "d1c71750.37b338",
+    "x": 1970.5,
+    "y": 1499.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "e986dd0a.7fdf58",
+    "id": "a0cacee0.a7a5a8",
     "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.ac1_svlan`\"/>\n<parameter name=\"field21\" value=\"`$prop.l3vpn.ac1_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.ac2_svlan`\"/>\n<parameter name=\"field51\" value=\"`$prop.l3vpn.ac2_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": 726,
-    "y": 929.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 716,
+    "y": 923,
+    "z": "b1905c0.2226628",
     "wires": [
       []
     ]
   },
   {
-    "id": "ba17de0c.0ea5e",
+    "id": "d8859d72.093c7",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 611,
-    "y": 1143,
-    "z": "d1c71750.37b338",
+    "x": 601,
+    "y": 1136.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "5b3da62a.021bd8",
-        "a74379d2.de6ee8",
-        "74148b1.9b52c74"
+        "aa6051d7.d8472",
+        "6a9ebade.f8d4c4",
+        "a797d228.5ea9d"
       ]
     ]
   },
   {
-    "id": "5b3da62a.021bd8",
+    "id": "aa6051d7.d8472",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 705,
-    "y": 1070,
-    "z": "d1c71750.37b338",
+    "x": 695,
+    "y": 1063.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "e670cc16.d9893"
+        "19938969.979a37"
       ]
     ]
   },
   {
-    "id": "a74379d2.de6ee8",
+    "id": "6a9ebade.f8d4c4",
     "type": "outcomeTrue",
     "name": "l3vpn-sptn",
     "xml": "<outcome value='l3vpn-sptn'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 786,
-    "y": 1258,
-    "z": "d1c71750.37b338",
+    "x": 776,
+    "y": 1251.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "257293b6.92d5cc"
+        "89285d57.29b5c8"
       ]
     ]
   },
   {
-    "id": "74148b1.9b52c74",
+    "id": "a797d228.5ea9d",
     "type": "outcomeTrue",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 779,
-    "y": 1304,
-    "z": "d1c71750.37b338",
+    "x": 769,
+    "y": 1297.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "884fb0f6.de86a8"
+        "a197c78b.b2ba1"
       ]
     ]
   },
   {
-    "id": "884fb0f6.de86a8",
+    "id": "a197c78b.b2ba1",
     "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": 942,
-    "y": 1308,
-    "z": "d1c71750.37b338",
+    "x": 932,
+    "y": 1301.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "39b02aa1.204f3e",
+    "id": "efc2210e.acb0a",
     "type": "execute",
     "name": "execute vpn-policy1 entry id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.entry1-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 820,
-    "y": 521,
-    "z": "d1c71750.37b338",
+    "x": 810,
+    "y": 514.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "3541c627.27ccaa"
+        "a3ce796c.5c1d3"
       ]
     ]
   },
   {
-    "id": "3541c627.27ccaa",
+    "id": "a3ce796c.5c1d3",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1045,
-    "y": 523.9999694824219,
-    "z": "d1c71750.37b338",
+    "x": 1035,
+    "y": 517.9999389648438,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "8d7e37e4.d397f8"
+        "2b0059a7.529b16"
       ]
     ]
   },
   {
-    "id": "8d7e37e4.d397f8",
+    "id": "2b0059a7.529b16",
     "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": 1226,
-    "y": 521.9999694824219,
-    "z": "d1c71750.37b338",
+    "x": 1216,
+    "y": 515.9999389648438,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "521ff026.a9cd98",
+    "id": "1c90c17d.548b0f",
     "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": 2210,
-    "y": 1219,
-    "z": "d1c71750.37b338",
+    "x": 2200,
+    "y": 1212.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "3c1faef4.86a26a",
-        "9a25c35e.1e45a8"
+        "49c2f0ca.cf2d3",
+        "f5ea72ca.f5ae4"
       ]
     ]
   },
   {
-    "id": "5e4ee4bb.9cbae4",
+    "id": "3fb5f0ac.682b3",
     "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": 1611,
-    "y": 1267,
-    "z": "d1c71750.37b338",
+    "x": 1601,
+    "y": 1260.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "991718ef.73c5f8"
+        "3283940e.8ab4c4"
       ]
     ]
   },
   {
-    "id": "f615e32b.689a18",
+    "id": "e8fa40d3.8412",
     "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": 1612,
-    "y": 1218,
-    "z": "d1c71750.37b338",
+    "x": 1602,
+    "y": 1211.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "3aadf8aa.0f045"
+        "841f9419.015d28"
       ]
     ]
   },
   {
-    "id": "3aadf8aa.0f045",
+    "id": "841f9419.015d28",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1784,
-    "y": 1216,
-    "z": "d1c71750.37b338",
+    "x": 1774,
+    "y": 1209.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "5557f8d.caac508"
+        "20b6ae7f.722c42"
       ]
     ]
   },
   {
-    "id": "991718ef.73c5f8",
+    "id": "3283940e.8ab4c4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1797,
-    "y": 1275,
-    "z": "d1c71750.37b338",
+    "x": 1787,
+    "y": 1268.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "1b368566.979a53"
+        "1ced6183.ccd51e"
       ]
     ]
   },
   {
-    "id": "b7b10f53.f8112",
+    "id": "ac124744.03bff8",
     "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": 2181,
-    "y": 1167,
-    "z": "d1c71750.37b338",
+    "x": 2171,
+    "y": 1160.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "963bac78.3bad6",
+    "id": "81cb8cda.6d1ac8",
     "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": 2179,
-    "y": 1267,
-    "z": "d1c71750.37b338",
+    "x": 2169,
+    "y": 1260.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "e2a6c5f2.23e27",
+    "id": "31d73427.5a24d4",
     "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": 2203,
-    "y": 1312,
-    "z": "d1c71750.37b338",
+    "x": 2193,
+    "y": 1305.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "152bd8c5.a555ff",
-        "11ed22fb.50a315"
+        "79ee27c0.1560d",
+        "1e716ed9.5862f1"
       ]
     ]
   },
   {
-    "id": "5557f8d.caac508",
+    "id": "20b6ae7f.722c42",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1935,
-    "y": 1216,
-    "z": "d1c71750.37b338",
+    "x": 1925,
+    "y": 1209.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "b7b10f53.f8112",
-        "521ff026.a9cd98"
+        "ac124744.03bff8",
+        "1c90c17d.548b0f"
       ]
     ]
   },
   {
-    "id": "1b368566.979a53",
+    "id": "1ced6183.ccd51e",
     "type": "block",
     "name": "block atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1936,
-    "y": 1275,
-    "z": "d1c71750.37b338",
+    "x": 1926,
+    "y": 1268.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "963bac78.3bad6",
-        "e2a6c5f2.23e27"
+        "81cb8cda.6d1ac8",
+        "31d73427.5a24d4"
       ]
     ]
   },
   {
-    "id": "bee6a021.504aa8",
+    "id": "3e3972fa.77b7f6",
     "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": 805,
-    "y": 622.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 795,
+    "y": 616,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "10ac73af.2eb80c"
+        "634f24b4.8e0cd4"
       ]
     ]
   },
   {
-    "id": "f7d82967.39b968",
+    "id": "d43bb648.453b08",
     "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": 802.3333740234375,
-    "y": 679.3332824707031,
-    "z": "d1c71750.37b338",
+    "x": 792.3333740234375,
+    "y": 673.333251953125,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "49f55adf.c6c134"
+        "134b1747.a1ed89"
       ]
     ]
   },
   {
-    "id": "49f55adf.c6c134",
+    "id": "134b1747.a1ed89",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1052.3333740234375,
-    "y": 685.3332824707031,
-    "z": "d1c71750.37b338",
+    "x": 1042.3333740234375,
+    "y": 679.333251953125,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "5fc81484.4dffac"
+        "e6e1ba3d.211b3"
       ]
     ]
   },
   {
-    "id": "10ac73af.2eb80c",
+    "id": "634f24b4.8e0cd4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1052,
-    "y": 626.9999694824219,
-    "z": "d1c71750.37b338",
+    "x": 1042,
+    "y": 620.9999389648438,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "36fdab86.85bda4"
+        "f08db05b.65ee68"
       ]
     ]
   },
   {
-    "id": "36fdab86.85bda4",
+    "id": "f08db05b.65ee68",
     "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": 1233,
-    "y": 624.9999694824219,
-    "z": "d1c71750.37b338",
+    "x": 1223,
+    "y": 618.9999389648438,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "5fc81484.4dffac",
+    "id": "e6e1ba3d.211b3",
     "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": 1233.3333740234375,
-    "y": 683.3332824707031,
-    "z": "d1c71750.37b338",
+    "x": 1223.3333740234375,
+    "y": 677.333251953125,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "e670cc16.d9893",
+    "id": "19938969.979a37",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 838,
-    "y": 1135,
-    "z": "d1c71750.37b338",
+    "x": 828,
+    "y": 1128.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "ec4c3437.b9425",
-        "c47fb352.4e0cc",
-        "59489a1b.74de3c",
-        "e652cb3f.9ae0d"
+        "4a98e8a7.30e56",
+        "45ed0ae2.aa3684",
+        "d76dde.a5a8222",
+        "873707de.4b4938"
       ]
     ]
   },
   {
-    "id": "c47fb352.4e0cc",
+    "id": "45ed0ae2.aa3684",
     "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.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=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1106,
-    "y": 1219,
-    "z": "d1c71750.37b338",
+    "x": 1096,
+    "y": 1212.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "d40cc8a7.624908",
-        "df1ccdd8.7bf27"
+        "a7b0af3.7ac715",
+        "5b1c0e49.45a8a8"
       ]
     ]
   },
   {
-    "id": "59489a1b.74de3c",
+    "id": "d76dde.a5a8222",
     "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.restapi.templateDir +'/l3smvrftemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi: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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"vrf-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1120,
-    "y": 1122,
-    "z": "d1c71750.37b338",
+    "x": 1110,
+    "y": 1115.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "d40cc8a7.624908",
-        "550c17e5.cfd818"
+        "a7b0af3.7ac715",
+        "a1139f25.6746c"
       ]
     ]
   },
   {
-    "id": "3c1faef4.86a26a",
+    "id": "49c2f0ca.cf2d3",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2428,
-    "y": 1211,
-    "z": "d1c71750.37b338",
+    "x": 2418,
+    "y": 1204.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "d2c4705e.e17128"
+        "3810cf64.b01548"
       ]
     ]
   },
   {
-    "id": "d2c4705e.e17128",
+    "id": "3810cf64.b01548",
     "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": 2609,
-    "y": 1209,
-    "z": "d1c71750.37b338",
+    "x": 2599,
+    "y": 1202.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "152bd8c5.a555ff",
+    "id": "79ee27c0.1560d",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2426,
-    "y": 1313,
-    "z": "d1c71750.37b338",
+    "x": 2416,
+    "y": 1306.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "5215918e.cf6238"
+        "92d0c467.dd3bc8"
       ]
     ]
   },
   {
-    "id": "5215918e.cf6238",
+    "id": "92d0c467.dd3bc8",
     "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": 2607,
-    "y": 1311,
-    "z": "d1c71750.37b338",
+    "x": 2597,
+    "y": 1304.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "9a25c35e.1e45a8",
+    "id": "f5ea72ca.f5ae4",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2427,
-    "y": 1145,
-    "z": "d1c71750.37b338",
+    "x": 2417,
+    "y": 1138.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "2af54113.06bac6"
+        "842cbe45.ff51d8"
       ]
     ]
   },
   {
-    "id": "11ed22fb.50a315",
+    "id": "1e716ed9.5862f1",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2423,
-    "y": 1265,
-    "z": "d1c71750.37b338",
+    "x": 2413,
+    "y": 1258.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "9994d830.e649d"
+        "f22dbcb6.0cf78"
       ]
     ]
   },
   {
-    "id": "2af54113.06bac6",
+    "id": "842cbe45.ff51d8",
     "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": 2634,
-    "y": 1139,
-    "z": "d1c71750.37b338",
+    "x": 2624,
+    "y": 1132.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "9994d830.e649d",
+    "id": "f22dbcb6.0cf78",
     "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": 2634,
-    "y": 1258,
-    "z": "d1c71750.37b338",
+    "x": 2624,
+    "y": 1251.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "e292252a.39cff8",
+    "id": "4946b4b6.2645f4",
     "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": 861,
-    "y": 773.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 851,
+    "y": 767,
+    "z": "b1905c0.2226628",
     "wires": [
       []
     ]
   },
   {
-    "id": "31c5a0ea.7876c",
+    "id": "3c09007b.15e098",
     "type": "switchNode",
     "name": "switch service-data.networks_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 819,
-    "y": 854.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 809,
+    "y": 848,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "e20b349f.c8503",
-        "816d3d6d.6345a8"
+        "e6d49c8.04a73e",
+        "928abf9d.17e3a8"
       ]
     ]
   },
   {
-    "id": "e20b349f.c8503",
+    "id": "e6d49c8.04a73e",
     "type": "other",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1092.8095703125,
-    "y": 822.9524230957031,
-    "z": "d1c71750.37b338",
+    "x": 1082.8095703125,
+    "y": 816.952392578125,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "4ecd5064.971558"
+        "a786c98a.f21ac"
       ]
     ]
   },
   {
-    "id": "816d3d6d.6345a8",
+    "id": "928abf9d.17e3a8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1087.666748046875,
-    "y": 868.6667175292969,
-    "z": "d1c71750.37b338",
+    "x": 1077.666748046875,
+    "y": 862.6666870117188,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "947799f0.0e982"
+        "58a5992a.3c5588"
       ]
     ]
   },
   {
-    "id": "4ecd5064.971558",
+    "id": "a786c98a.f21ac",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='0' />\n",
     "comments": "",
-    "x": 1245.8095703125,
-    "y": 822.5238342285156,
-    "z": "d1c71750.37b338",
+    "x": 1235.8095703125,
+    "y": 816.5238037109375,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "947799f0.0e982",
+    "id": "58a5992a.3c5588",
     "type": "set",
     "name": "set nidx",
     "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
     "comments": "",
-    "x": 1247.2381591796875,
-    "y": 867.5238952636719,
-    "z": "d1c71750.37b338",
+    "x": 1237.2381591796875,
+    "y": 861.5238647460938,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "f41c462f.8589a",
+    "id": "6c6c2617.940e5",
     "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",
+    "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": 733,
-    "y": 1342.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 723,
+    "y": 1336,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "58848908.ffbbb",
+    "id": "68a6c57e.f14dec",
     "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": 762,
-    "y": 1387.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 754,
+    "y": 1482,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "7b14c9f6.80d72",
+    "id": "26e0b74.7b173c8",
     "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": 709,
-    "y": 1576.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 678,
+    "y": 1696,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "a66c7c7d.376898",
+    "id": "d899adb0.900798",
     "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": 735,
-    "y": 1434.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 722,
+    "y": 1531,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "30879b4d.be3994",
+    "id": "8e08cbd2.d417e8",
     "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": 810,
-    "y": 260.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 800,
+    "y": 254,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "48cba823.32bfc",
-        "fe778394.3d9298",
-        "a675b2b2.a64298"
+        "df2735fd.61f1e8",
+        "63fc7927.79a528",
+        "81648fb3.dcd7d8"
       ]
     ]
   },
   {
-    "id": "48cba823.32bfc",
+    "id": "df2735fd.61f1e8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1132,
-    "y": 150.00003051757812,
-    "z": "d1c71750.37b338",
+    "x": 1122,
+    "y": 144,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "8bb789cd.2a1608"
+        "9d008f77.afdad"
       ]
     ]
   },
   {
-    "id": "fe778394.3d9298",
+    "id": "63fc7927.79a528",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1135.490966796875,
-    "y": 197.57406616210938,
-    "z": "d1c71750.37b338",
+    "x": 1125.490966796875,
+    "y": 191.57403564453125,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "8f58e126.403b1"
+        "91ed21e1.d136e"
       ]
     ]
   },
   {
-    "id": "a675b2b2.a64298",
+    "id": "81648fb3.dcd7d8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1130.823974609375,
-    "y": 238.90737915039062,
-    "z": "d1c71750.37b338",
+    "x": 1120.823974609375,
+    "y": 232.9073486328125,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "8d89cc4d.eb7678"
+        "5af66dea.2e7014"
       ]
     ]
   },
   {
-    "id": "8f58e126.403b1",
+    "id": "91ed21e1.d136e",
     "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": 1312.0623779296875,
-    "y": 185.85980224609375,
-    "z": "d1c71750.37b338",
+    "x": 1302.0623779296875,
+    "y": 179.85977172851562,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "8d89cc4d.eb7678",
+    "id": "5af66dea.2e7014",
     "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": 1318.5965309143066,
-    "y": 234.34657192230225,
-    "z": "d1c71750.37b338",
+    "x": 1308.5965309143066,
+    "y": 228.34654140472412,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "8bb789cd.2a1608",
+    "id": "9d008f77.afdad",
     "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": 1336,
-    "y": 137.00003051757812,
-    "z": "d1c71750.37b338",
+    "x": 1326,
+    "y": 131,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "d54c20dc.cf6128",
+    "id": "387886dd.77b922",
     "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='configuration-sub-type' value='l3vpn' />\n<parameter name='orchestration-status' value='Created' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$prop.l3vpn.network-id`' />\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": 754,
-    "y": 1484.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 733,
+    "y": 1590,
+    "z": "b1905c0.2226628",
     "wires": [
       []
     ]
   },
   {
-    "id": "b11968d4.007e68",
+    "id": "60cb5057.fb4318",
     "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-instance-id \n         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/configurations/configuration/' + $prop.l3vpn.network-id`\" />\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`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 746,
-    "y": 1530.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 726,
+    "y": 1646,
+    "z": "b1905c0.2226628",
     "wires": [
       []
     ]
   },
   {
-    "id": "d3d6530.ff1843",
+    "id": "fdabde17.5c847",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1258.5,
-    "y": 412,
-    "z": "d1c71750.37b338",
-    "wires": [
-      [
-        "79980939.27992",
-        "6566447b.cd16fc",
-        "db1ad825.26052",
-        "612a1bef.8a1a9c",
-        "32815667.56769a",
-        "d99350c4.40314",
-        "e54a4b77.575f08",
-        "a16ad1af.30669",
-        "a9d432.f245a3d",
-        "89f7d244.7bed58",
-        "9e107c02.44f758",
-        "37c58153.b2998e",
-        "9ab7bd24.8d06c8",
-        "c98044e2.7a0fd",
-        "9c377089.4d9f3",
-        "6227130a.b283dc",
-        "87656c47.a73838",
-        "9d6a7f28.4304b",
-        "b0373753.70f0a",
-        "a53453dd.69ab28",
-        "9abdda02.3e776",
-        "e12d824c.4650c8",
-        "46a813fb.9bd0f4",
-        "f615e32b.689a18",
-        "5e4ee4bb.9cbae4"
-      ]
-    ]
-  },
-  {
-    "id": "e652cb3f.9ae0d",
+    "x": 1248.5,
+    "y": 405.9999694824219,
+    "z": "b1905c0.2226628",
+    "wires": [
+      [
+        "a016ef4c.00b8d8",
+        "42d21e94.8794d",
+        "141c3d3d.ab7053",
+        "4ee7a07.d59c26",
+        "5c63bd35.850224",
+        "58f3e289.2a7e64",
+        "95375fe3.44bc28",
+        "fe0b88f6.f80e9",
+        "7a18b8ce.d5dc",
+        "13b6f73a.13b789",
+        "fd7f4144.b3829",
+        "45ea1a7b.99de84",
+        "2d742a69.fb645e",
+        "a750a836.67c46",
+        "32c3f1e3.30689e",
+        "e951ad31.5ca928",
+        "e3393629.af0d3",
+        "62f6947f.61850c",
+        "746e4da0.8ed054",
+        "ce1e821a.8edd98",
+        "ac3cc96e.e8c948",
+        "baf40051.ee5bc",
+        "c4c0db18.879888",
+        "e8fa40d3.8412",
+        "3fb5f0ac.682b3"
+      ]
+    ]
+  },
+  {
+    "id": "873707de.4b4938",
     "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\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 979,
-    "y": 927,
-    "z": "d1c71750.37b338",
+    "x": 969,
+    "y": 920.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "5108fa21.828c5c",
-        "4ae0e1c.42791a"
+        "7ec3a0d9.74ab38",
+        "d68f58c.e668e28"
       ]
     ]
   },
   {
-    "id": "5108fa21.828c5c",
+    "id": "7ec3a0d9.74ab38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1214,
-    "y": 905,
-    "z": "d1c71750.37b338",
+    "x": 1204,
+    "y": 898.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "8a3a1639.1431d"
+        "1169f76b.30c241"
       ]
     ]
   },
   {
-    "id": "4ae0e1c.42791a",
+    "id": "d68f58c.e668e28",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1206.25,
-    "y": 958.6428833007812,
-    "z": "d1c71750.37b338",
+    "x": 1196.25,
+    "y": 952.6428527832031,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "a0998cd9.40253"
+        "f88bda1b.6ed7c8"
       ]
     ]
   },
   {
-    "id": "a0998cd9.40253",
+    "id": "f88bda1b.6ed7c8",
     "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": 1359,
-    "y": 958.3929443359375,
-    "z": "d1c71750.37b338",
+    "x": 1349,
+    "y": 952.3929138183594,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "8a3a1639.1431d",
+    "id": "1169f76b.30c241",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
-    "x": 1368,
-    "y": 906,
-    "z": "d1c71750.37b338",
+    "x": 1358,
+    "y": 899.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "d40cc8a7.624908",
+    "id": "a7b0af3.7ac715",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1394,
-    "y": 1078,
-    "z": "d1c71750.37b338",
+    "x": 1384,
+    "y": 1071.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "28652dba.d39e02"
+        "18af9724.8ec0e1"
       ]
     ]
   },
   {
-    "id": "550c17e5.cfd818",
+    "id": "a1139f25.6746c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1401.25,
-    "y": 1172.642822265625,
-    "z": "d1c71750.37b338",
+    "x": 1391.25,
+    "y": 1166.6427917480469,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "d57e2b04.e0fea"
+        "d91cb09e.e11ad8"
       ]
     ]
   },
   {
-    "id": "d57e2b04.e0fea",
+    "id": "d91cb09e.e11ad8",
     "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 Create vrf rest api\" />\n",
     "comments": "",
-    "x": 1373,
-    "y": 1357.3929443359375,
-    "z": "d1c71750.37b338",
+    "x": 1363,
+    "y": 1351.3929138183594,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "725ceec3.c5b2",
+    "id": "a2104e27.ed674",
     "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": 702.96875,
-    "y": 998.0000305175781,
-    "z": "d1c71750.37b338",
+    "x": 692.96875,
+    "y": 992,
+    "z": "b1905c0.2226628",
     "wires": [
       []
     ]
   },
   {
-    "id": "28652dba.d39e02",
+    "id": "18af9724.8ec0e1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1234,
-    "y": 1409,
-    "z": "d1c71750.37b338",
+    "x": 1224,
+    "y": 1402.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       []
     ]
   },
   {
-    "id": "df1ccdd8.7bf27",
+    "id": "5b1c0e49.45a8a8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1324,
-    "y": 1473,
-    "z": "d1c71750.37b338",
+    "x": 1314,
+    "y": 1466.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "948b66a6.ef156"
+        "b1419921.c878d"
       ]
     ]
   },
   {
-    "id": "948b66a6.ef156",
+    "id": "b1419921.c878d",
     "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 Create site rest api\" />\n",
     "comments": "",
-    "x": 1353.75,
-    "y": 1530.7501220703125,
-    "z": "d1c71750.37b338",
+    "x": 1343.75,
+    "y": 1524.7500915527344,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "359e3cd1.226de4",
+    "id": "b1d48b0e.d19db",
     "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 Create vpn rest api\" />\n",
     "comments": "",
-    "x": 1210,
-    "y": 1061,
-    "z": "d1c71750.37b338",
+    "x": 1200,
+    "y": 1054.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": []
   },
   {
-    "id": "c80688e8.50ffd",
+    "id": "ced00609.d81b48",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1065,
-    "y": 1058,
-    "z": "d1c71750.37b338",
+    "x": 1055,
+    "y": 1051.9999694824219,
+    "z": "b1905c0.2226628",
     "wires": [
       [
-        "359e3cd1.226de4"
+        "b1d48b0e.d19db"
       ]
     ]
+  },
+  {
+    "id": "b676786f.1bea58",
+    "type": "set",
+    "name": "set vrf in network-data",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.network-input-parameters.param[$pidx].name' value='vrf1_id' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.network-input-parameters.param[$pidx].value' value='`$prop.l3vpn.vrf1-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.network-input-parameters.param[$pidx+1].name' value='vrf2_id' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.network-input-parameters.param[$pidx+1].value' value='`$prop.l3vpn.vrf2-id`d' />\n<parameter name='service-data.networks.network[$nidx].network_data.network-request-input.network-input-parameters.param_length' value='`$pidx+2`' />",
+    "comments": "",
+    "x": 705,
+    "y": 1420,
+    "z": "b1905c0.2226628",
+    "wires": []
+  },
+  {
+    "id": "c690b1cd.2300e8",
+    "type": "set",
+    "name": "set pidx",
+    "xml": "<set>\n<parameter name='pidx' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' />",
+    "comments": "",
+    "x": 704,
+    "y": 1377,
+    "z": "b1905c0.2226628",
+    "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 3c8257f1..cdc84ac1 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": "1bc16ce.3c28013",
+    "id": "ba06c89a.024e98",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 87,
-    "y": 114.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 113.03125,
+    "y": 95.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "97da490c.021388"
+        "35e8925f.3178be"
       ]
     ]
   },
   {
-    "id": "97da490c.021388",
+    "id": "35e8925f.3178be",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,892 +22,1245 @@
     "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": 299.00000381469727,
-    "y": 186.11100959777832,
-    "z": "e87b72fe.07c73",
+    "x": 325.03125381469727,
+    "y": 167.0312671661377,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "3dca7f57.a19ca8"
+        "f972abf0.8e2ed8"
       ]
     ]
   },
   {
-    "id": "3dca7f57.a19ca8",
+    "id": "f972abf0.8e2ed8",
     "type": "method",
     "name": "method network-topology-operation-delete",
     "xml": "<method rpc='network-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 287.0001220703125,
-    "y": 274.1109924316406,
-    "z": "e87b72fe.07c73",
+    "x": 313.0313720703125,
+    "y": 255.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "2917b139.6003be"
+        "61264142.433c9"
       ]
     ]
   },
   {
-    "id": "2917b139.6003be",
+    "id": "61264142.433c9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 563.0000305175781,
-    "y": 282.11100578308105,
-    "z": "e87b72fe.07c73",
+    "x": 589.0312805175781,
+    "y": 263.03126335144043,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "93de9a8e.85cd28",
-        "8a99a44.0aea6d8",
-        "b9e067fb.af43c8",
-        "8f63fe5a.ce23c",
-        "6e9a7fc8.6e80c8",
-        "4f853de5.1d70d4",
-        "80aa2c3b.44b74",
-        "c6199aa8.b4cf08",
-        "cd746090.90a5a",
-        "e9b167f.6457618"
+        "6c17c5f9.a1c91c",
+        "17a845f7.81ad5a",
+        "1c470b8.4988df5",
+        "ae6fca7d.b3be38",
+        "30cf8a2a.4aa6d6",
+        "3287501.60ecab",
+        "19bbbbde.0c4ee4",
+        "99fa60a9.97d56",
+        "a9f02234.2759e8",
+        "d94a9bb9.76a0c8",
+        "c820d47.424eda8",
+        "6c64d01.a0fff3"
       ]
     ]
   },
   {
-    "id": "93de9a8e.85cd28",
+    "id": "6c17c5f9.a1c91c",
     "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": 884,
-    "y": 65.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 910.03125,
+    "y": 46.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       []
     ]
   },
   {
-    "id": "8a99a44.0aea6d8",
+    "id": "17a845f7.81ad5a",
     "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": 828,
-    "y": 510.1109619140625,
-    "z": "e87b72fe.07c73",
+    "x": 854.03125,
+    "y": 491.0312194824219,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "3ab5ee96.e1d5ea",
-        "5289c8c7.4bcd4",
-        "756a44de.032acc"
+        "f27f6e92.d1699",
+        "2cd26321.b8d7fc",
+        "207daa4b.421516"
       ]
     ]
   },
   {
-    "id": "3ab5ee96.e1d5ea",
+    "id": "f27f6e92.d1699",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1066,
-    "y": 466.1109924316406,
-    "z": "e87b72fe.07c73",
+    "x": 1092.03125,
+    "y": 447.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "e5229a2a.d65d6"
+        "4f5e00fc.7741e"
       ]
     ]
   },
   {
-    "id": "5289c8c7.4bcd4",
+    "id": "2cd26321.b8d7fc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1070.490966796875,
-    "y": 507.68505859375,
-    "z": "e87b72fe.07c73",
+    "x": 1096.522216796875,
+    "y": 488.6053161621094,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "84a50f20.350108"
+        "2d398a89.807716"
       ]
     ]
   },
   {
-    "id": "756a44de.032acc",
+    "id": "207daa4b.421516",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1063.823974609375,
-    "y": 559.018310546875,
-    "z": "e87b72fe.07c73",
+    "x": 1089.855224609375,
+    "y": 539.9385681152344,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "ad52005e.b9cf1"
+        "8e9c4cf9.162de"
       ]
     ]
   },
   {
-    "id": "84a50f20.350108",
+    "id": "2d398a89.807716",
     "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": 1246.0623779296875,
-    "y": 505.97076416015625,
-    "z": "e87b72fe.07c73",
+    "x": 1272.0936279296875,
+    "y": 486.8910217285156,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "ad52005e.b9cf1",
+    "id": "8e9c4cf9.162de",
     "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": 1224.5965576171875,
-    "y": 557.45751953125,
-    "z": "e87b72fe.07c73",
+    "x": 1250.6278076171875,
+    "y": 538.3777770996094,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "b9e067fb.af43c8",
+    "id": "1c470b8.4988df5",
     "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": 846,
-    "y": 243.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 872.03125,
+    "y": 224.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "dba902b2.65b6e"
+        "c4d07fe0.ade9b"
       ]
     ]
   },
   {
-    "id": "dba902b2.65b6e",
+    "id": "c4d07fe0.ade9b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1127.8333740234375,
-    "y": 221.4443359375,
-    "z": "e87b72fe.07c73",
+    "x": 1153.8646240234375,
+    "y": 202.36459350585938,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "6dbc1962.e67808",
-        "a7f93024.722988",
-        "84a77140.b8364"
+        "c0182537.1ffaf8",
+        "ce9d1ad8.d1f0c8",
+        "ae7fca3e.07e458",
+        "e1b9eee0.2059b8",
+        "f7a24587.ec9238",
+        "a35f5ef6.a6cd28"
       ]
     ]
   },
   {
-    "id": "6dbc1962.e67808",
+    "id": "c0182537.1ffaf8",
     "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": 1336,
-    "y": 182.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 1362.03125,
+    "y": 163.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "5945c6d2.51585"
+        "c674745c.2d98c8"
       ]
     ]
   },
   {
-    "id": "5945c6d2.51585",
+    "id": "c674745c.2d98c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1523,
-    "y": 182.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 1549.03125,
+    "y": 163.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "7ba84df2.2f3aec"
+        "ff72bcee.d766c"
       ]
     ]
   },
   {
-    "id": "7ba84df2.2f3aec",
+    "id": "ff72bcee.d766c",
     "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": 1691,
-    "y": 182.71099853515625,
-    "z": "e87b72fe.07c73",
+    "x": 1717.03125,
+    "y": 163.63125610351562,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "a7f93024.722988",
+    "id": "ce9d1ad8.d1f0c8",
     "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 == 'serviceType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1341,
-    "y": 236.71096801757812,
-    "z": "e87b72fe.07c73",
+    "x": 1367.03125,
+    "y": 217.6312255859375,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "24243087.264e7"
+        "7439fd72.4e49b4"
       ]
     ]
   },
   {
-    "id": "24243087.264e7",
+    "id": "7439fd72.4e49b4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1524.9999389648438,
-    "y": 241.71096801757812,
-    "z": "e87b72fe.07c73",
+    "x": 1551.0311889648438,
+    "y": 222.6312255859375,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "4b08822f.ede664"
+        "4c0474c2.96c4ac"
       ]
     ]
   },
   {
-    "id": "4b08822f.ede664",
+    "id": "4c0474c2.96c4ac",
     "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": 1693.9999389648438,
-    "y": 239.71096801757812,
-    "z": "e87b72fe.07c73",
+    "x": 1720.0311889648438,
+    "y": 220.6312255859375,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "e5229a2a.d65d6",
+    "id": "4f5e00fc.7741e",
     "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.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": 1252,
-    "y": 463.1109619140625,
-    "z": "e87b72fe.07c73",
+    "x": 1278.03125,
+    "y": 444.0312194824219,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "8892b470.2ab318",
+    "id": "d58d3bad.af4188",
     "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.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`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\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=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1574,
-    "y": 678.110969543457,
-    "z": "e87b72fe.07c73",
+    "x": 1604.03125,
+    "y": 925.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "6ace128e.38bbf4",
-        "e03ea1f6.8ae24"
+        "a48f9d80.400a6",
+        "17b55d13.d0f583"
       ]
     ]
   },
   {
-    "id": "8f63fe5a.ce23c",
+    "id": "6c64d01.a0fff3",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 787,
-    "y": 614.1109924316406,
-    "z": "e87b72fe.07c73",
+    "x": 813.03125,
+    "y": 595.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "cf2b0eea.34d2e"
+        "f5f24c7e.c89f9"
       ]
     ]
   },
   {
-    "id": "cf2b0eea.34d2e",
+    "id": "f5f24c7e.c89f9",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1044,
-    "y": 615.110969543457,
-    "z": "e87b72fe.07c73",
+    "x": 1070.03125,
+    "y": 596.0312271118164,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "46db16ed.796608"
+        "730f31fc.13307"
       ]
     ]
   },
   {
-    "id": "6e9a7fc8.6e80c8",
+    "id": "ae6fca7d.b3be38",
     "type": "switchNode",
     "name": "switch service-data.networks.network_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 826,
-    "y": 138.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 852.03125,
+    "y": 119.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "53ed314.a330f5",
-        "eeed55fd.c22298"
+        "520c693e.a9d358",
+        "655f0893.61f278",
+        "4cb232f8.ebf31c"
       ]
     ]
   },
   {
-    "id": "53ed314.a330f5",
+    "id": "520c693e.a9d358",
     "type": "other",
-    "name": "outcome Null",
+    "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1271,
-    "y": 64.11105346679688,
-    "z": "e87b72fe.07c73",
+    "x": 1269.03125,
+    "y": 56.03131103515625,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "7b50ad9a.577e8c"
+        "55192e25.8885f"
       ]
     ]
   },
   {
-    "id": "7b50ad9a.577e8c",
+    "id": "55192e25.8885f",
     "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": 1461.7774658203125,
-    "y": 51,
-    "z": "e87b72fe.07c73",
+    "x": 1487.8087158203125,
+    "y": 31.920257568359375,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "eeed55fd.c22298",
+    "id": "655f0893.61f278",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1155.0003662109375,
-    "y": 129.11106872558594,
-    "z": "e87b72fe.07c73",
+    "x": 1181.0316162109375,
+    "y": 110.03132629394531,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "29041a71.02b546"
+        "f1d97fd4.8fa63"
       ]
     ]
   },
   {
-    "id": "29041a71.02b546",
+    "id": "f1d97fd4.8fa63",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1326.2698974609375,
-    "y": 112.66560363769531,
-    "z": "e87b72fe.07c73",
+    "x": 1352.3011474609375,
+    "y": 93.58586120605469,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "3af5398b.f7aa0e",
-        "4821e95f.09e458"
+        "e876eb36.5c4d68",
+        "34cad983.d68aa6"
       ]
     ]
   },
   {
-    "id": "3af5398b.f7aa0e",
+    "id": "e876eb36.5c4d68",
     "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": 1624.285888671875,
-    "y": 93.53961181640625,
-    "z": "e87b72fe.07c73",
+    "x": 1650.317138671875,
+    "y": 74.45986938476562,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "21827fa6.3c3c7"
+        "5659c979.043e78"
       ]
     ]
   },
   {
-    "id": "4821e95f.09e458",
+    "id": "34cad983.d68aa6",
     "type": "switchNode",
     "name": "switch tmp.nidx ",
     "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1545.5872802734375,
-    "y": 136.52279663085938,
-    "z": "e87b72fe.07c73",
+    "x": 1571.6185302734375,
+    "y": 117.44305419921875,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "4af90ffc.0818b"
+        "42b4cc11.e782c4"
       ]
     ]
   },
   {
-    "id": "4af90ffc.0818b",
+    "id": "42b4cc11.e782c4",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1746.015869140625,
-    "y": 142.09420776367188,
-    "z": "e87b72fe.07c73",
+    "x": 1772.047119140625,
+    "y": 123.01446533203125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "98ba5173.0d34e"
+        "fffba6d3.fe8418"
       ]
     ]
   },
   {
-    "id": "21827fa6.3c3c7",
+    "id": "5659c979.043e78",
     "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": 1934.7144775390625,
-    "y": 91.78970336914062,
-    "z": "e87b72fe.07c73",
+    "x": 1960.7457275390625,
+    "y": 72.7099609375,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "22099867.c65e3"
+        "c95e7fc4.b303b"
       ]
     ]
   },
   {
-    "id": "98ba5173.0d34e",
+    "id": "fffba6d3.fe8418",
     "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": 1917.4443359375,
-    "y": 142.237060546875,
-    "z": "e87b72fe.07c73",
+    "x": 1943.4755859375,
+    "y": 123.15731811523438,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "22099867.c65e3",
+    "id": "c95e7fc4.b303b",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2140.666748046875,
-    "y": 90.68243408203125,
-    "z": "e87b72fe.07c73",
+    "x": 2166.697998046875,
+    "y": 71.60269165039062,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "44687f12.3eae5"
+        "6b863b90.836d94"
       ]
     ]
   },
   {
-    "id": "44687f12.3eae5",
+    "id": "6b863b90.836d94",
     "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": 2379.198486328125,
-    "y": 86.43243408203125,
-    "z": "e87b72fe.07c73",
+    "x": 2405.229736328125,
+    "y": 67.35269165039062,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "4f853de5.1d70d4",
-    "type": "block",
-    "name": "block : saveNetworkData",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 805,
-    "y": 704.1109924316406,
-    "z": "e87b72fe.07c73",
-    "wires": [
-      [
-        "191edb15.f0a32d",
-        "7bfb16ed.b031d8",
-        "3a334836.fa7ed",
-        "cc07591b.5791f"
-      ]
-    ]
-  },
-  {
-    "id": "80aa2c3b.44b74",
+    "id": "30cf8a2a.4aa6d6",
     "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": 757.6665649414062,
-    "y": 922.4442749023438,
-    "z": "e87b72fe.07c73",
-    "wires": []
-  },
-  {
-    "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": 1098.0000076293945,
-    "y": 684.4443044662476,
-    "z": "e87b72fe.07c73",
-    "wires": []
-  },
-  {
-    "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": 1062.2895622253418,
-    "y": 728.1621513366699,
-    "z": "e87b72fe.07c73",
-    "wires": []
-  },
-  {
-    "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": 1068.0039291381836,
-    "y": 765.30504322052,
-    "z": "e87b72fe.07c73",
-    "wires": []
-  },
-  {
-    "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": 1111.9999389648438,
-    "y": 812.4442625045776,
-    "z": "e87b72fe.07c73",
+    "x": 806.6978149414062,
+    "y": 941.364501953125,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "c6199aa8.b4cf08",
+    "id": "3287501.60ecab",
     "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": 784,
-    "y": 388,
-    "z": "e87b72fe.07c73",
+    "x": 810.03125,
+    "y": 368.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "eb78427.8aeffc",
-        "9468b1f6.acd4a8",
-        "8869b2de.4cd318"
+        "c2bd93d4.a50d6",
+        "50eb06db.534748",
+        "a9ca7e11.e6b52"
       ]
     ]
   },
   {
-    "id": "eb78427.8aeffc",
+    "id": "c2bd93d4.a50d6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 978,
-    "y": 326,
-    "z": "e87b72fe.07c73",
+    "x": 1004.03125,
+    "y": 306.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "68cda5fa.8580d4"
+        "70989a52.14a154"
       ]
     ]
   },
   {
-    "id": "9468b1f6.acd4a8",
+    "id": "50eb06db.534748",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 987.490966796875,
-    "y": 368.57403564453125,
-    "z": "e87b72fe.07c73",
+    "x": 1013.522216796875,
+    "y": 349.4942932128906,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "f68a2741.7b13e"
+        "a043bfd1.99253"
       ]
     ]
   },
   {
-    "id": "8869b2de.4cd318",
+    "id": "a9ca7e11.e6b52",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 980.823974609375,
-    "y": 416.9073486328125,
-    "z": "e87b72fe.07c73",
+    "x": 1006.855224609375,
+    "y": 397.8276062011719,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "ff173828.c81cc"
+        "a1cb98a2.af1948"
       ]
     ]
   },
   {
-    "id": "f68a2741.7b13e",
+    "id": "a043bfd1.99253",
     "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": 1173.0623779296875,
-    "y": 369.8597717285156,
-    "z": "e87b72fe.07c73",
+    "x": 1199.0936279296875,
+    "y": 350.780029296875,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "ff173828.c81cc",
+    "id": "a1cb98a2.af1948",
     "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": 1169.5965576171875,
-    "y": 420.3465270996094,
-    "z": "e87b72fe.07c73",
+    "x": 1195.6278076171875,
+    "y": 401.26678466796875,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "68cda5fa.8580d4",
+    "id": "70989a52.14a154",
     "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": 1192,
-    "y": 322,
-    "z": "e87b72fe.07c73",
+    "x": 1218.03125,
+    "y": 302.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "84a77140.b8364",
+    "id": "ae7fca3e.07e458",
     "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": 1343,
-    "y": 283,
-    "z": "e87b72fe.07c73",
+    "x": 1369.03125,
+    "y": 263.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "16fa329d.f3dce5"
+        "7fbf4ad7.4e3104"
       ]
     ]
   },
   {
-    "id": "16fa329d.f3dce5",
+    "id": "7fbf4ad7.4e3104",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1529,
-    "y": 292,
-    "z": "e87b72fe.07c73",
+    "x": 1555.03125,
+    "y": 272.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "b53db17c.0ef078"
+        "63b25ae1.3cec14"
       ]
     ]
   },
   {
-    "id": "b53db17c.0ef078",
+    "id": "63b25ae1.3cec14",
     "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": 1712,
-    "y": 296,
-    "z": "e87b72fe.07c73",
+    "x": 1738.03125,
+    "y": 276.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "cd746090.90a5a",
+    "id": "19bbbbde.0c4ee4",
     "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": 815,
-    "y": 850,
-    "z": "e87b72fe.07c73",
+    "x": 858.03125,
+    "y": 687.9202880859375,
+    "z": "b1a89180.b5141",
     "wires": [
       []
     ]
   },
   {
-    "id": "599b3e84.010d1",
+    "id": "1f654f28.833041",
     "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\"/>",
+    "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\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1597,
-    "y": 605.7776565551758,
-    "z": "e87b72fe.07c73",
+    "x": 1623.03125,
+    "y": 586.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "d3f6644d.349f88",
-        "3ae81ceb.b03874"
+        "ca41c77.6b99238",
+        "b6f946b3.5d1538"
       ]
     ]
   },
   {
-    "id": "d3f6644d.349f88",
+    "id": "ca41c77.6b99238",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1837,
-    "y": 568.7776565551758,
-    "z": "e87b72fe.07c73",
+    "x": 1863.03125,
+    "y": 549.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "7b5e645e.7d6674"
+        "fb54fc36.0391d"
       ]
     ]
   },
   {
-    "id": "3ae81ceb.b03874",
+    "id": "b6f946b3.5d1538",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1844.25,
-    "y": 635.420539855957,
-    "z": "e87b72fe.07c73",
+    "x": 1870.28125,
+    "y": 616.3407974243164,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "50b8cd7f.3d5c64"
+        "987fca22.525748"
       ]
     ]
   },
   {
-    "id": "50b8cd7f.3d5c64",
+    "id": "987fca22.525748",
     "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": 2025,
-    "y": 634.1706008911133,
-    "z": "e87b72fe.07c73",
+    "x": 2051.03125,
+    "y": 615.0908584594727,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "7b5e645e.7d6674",
+    "id": "fb54fc36.0391d",
     "type": "set",
     "name": "set token-id",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.data.token_id' />\n",
     "comments": "",
-    "x": 2022,
-    "y": 565.7776565551758,
-    "z": "e87b72fe.07c73",
+    "x": 2048.03125,
+    "y": 546.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "6ace128e.38bbf4",
+    "id": "a48f9d80.400a6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1794,
-    "y": 690.7776565551758,
-    "z": "e87b72fe.07c73",
+    "x": 1899.03125,
+    "y": 737.6979370117188,
+    "z": "b1a89180.b5141",
     "wires": [
-      []
+      [
+        "c960eb18.e0632"
+      ]
     ]
   },
   {
-    "id": "e03ea1f6.8ae24",
+    "id": "17b55d13.d0f583",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1795.25,
-    "y": 754.4204788208008,
-    "z": "e87b72fe.07c73",
+    "x": 1851.28125,
+    "y": 978.3407592773438,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "2b054857.56f558"
+        "896de823.531688"
       ]
     ]
   },
   {
-    "id": "2b054857.56f558",
+    "id": "896de823.531688",
     "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",
+    "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 Delete VPN rest api\" />\n",
     "comments": "",
-    "x": 1961,
-    "y": 757.1706008911133,
-    "z": "e87b72fe.07c73",
+    "x": 2040.03125,
+    "y": 981.0908813476562,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "46db16ed.796608",
+    "id": "730f31fc.13307",
     "type": "block",
     "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1268,
-    "y": 616.7776565551758,
-    "z": "e87b72fe.07c73",
+    "x": 1294.03125,
+    "y": 597.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "599b3e84.010d1",
-        "8892b470.2ab318"
+        "d58d3bad.af4188",
+        "e2203ccc.e2252",
+        "d01694ec.b6d578",
+        "1f654f28.833041",
+        "298989a7.60397e"
       ]
     ]
   },
   {
-    "id": "e9b167f.6457618",
+    "id": "99fa60a9.97d56",
     "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",
+    "x": 824.03125,
+    "y": 544.9202575683594,
+    "z": "b1a89180.b5141",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "298989a7.60397e",
+    "type": "execute",
+    "name": "execute REST DELETE Site",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites/site=' + $prop.l3vpn.site1_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=\"site-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1604,
+    "y": 668,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "a48f9d80.400a6",
+        "22e4152.0989b6a"
+      ]
+    ]
+  },
+  {
+    "id": "e2203ccc.e2252",
+    "type": "execute",
+    "name": "execute REST DELETE VRF1",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi:vrf-attributes/vrf-attribute=' + $prop.l3vpn.vrf1-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=\"vrf1-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1604,
+    "y": 760,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "a48f9d80.400a6",
+        "ab599bb0.a4be38"
+      ]
+    ]
+  },
+  {
+    "id": "d01694ec.b6d578",
+    "type": "execute",
+    "name": "execute REST DELETE VRF2",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi:vrf-attributes/vrf-attribute=' + $prop.l3vpn.vrf2-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=\"vrf2-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1611,
+    "y": 846,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "a48f9d80.400a6",
+        "a7e72531.ac08f"
+      ]
+    ]
+  },
+  {
+    "id": "c960eb18.e0632",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2056,
+    "y": 734,
+    "z": "b1a89180.b5141",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "22e4152.0989b6a",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1877,
+    "y": 673,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "c62b7174.0cde6"
+      ]
+    ]
+  },
+  {
+    "id": "c62b7174.0cde6",
+    "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 Delete Site rest api\" />\n",
+    "comments": "",
+    "x": 2057.75,
+    "y": 671.7500610351562,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "ab599bb0.a4be38",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1896,
+    "y": 805,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "fd500d75.5f667"
+      ]
+    ]
+  },
+  {
+    "id": "fd500d75.5f667",
+    "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 Delete VRF1 rest api\" />\n",
+    "comments": "",
+    "x": 2076.75,
+    "y": 803.7500610351562,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "a7e72531.ac08f",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1894,
+    "y": 879,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "6fdfb503.fe47a4"
+      ]
+    ]
+  },
+  {
+    "id": "6fdfb503.fe47a4",
+    "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 Delete VRF2 rest api\" />\n",
+    "comments": "",
+    "x": 2074.75,
+    "y": 877.7500610351562,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "e1b9eee0.2059b8",
+    "type": "switchNode",
+    "name": "switch site1_name",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_name'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1472,
+    "y": 326,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "dfa9e32d.91d8d8"
+      ]
+    ]
+  },
+  {
+    "id": "f7a24587.ec9238",
+    "type": "switchNode",
+    "name": "switch vrf1_id",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'vrf1_id'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1477,
+    "y": 380.5999755859375,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "c15e7dfb.74d14"
+      ]
+    ]
+  },
+  {
+    "id": "a35f5ef6.a6cd28",
+    "type": "switchNode",
+    "name": "switch vrf2_id",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'vrf2_id'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1479,
+    "y": 426.8890075683594,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "ca400331.dc161"
+      ]
+    ]
+  },
+  {
+    "id": "dfa9e32d.91d8d8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1659,
+    "y": 326,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "9e12816.9f59e"
+      ]
+    ]
+  },
+  {
+    "id": "c15e7dfb.74d14",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1660.9999389648438,
+    "y": 385.5999755859375,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "b6297fef.ebefb"
+      ]
+    ]
+  },
+  {
+    "id": "ca400331.dc161",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1665,
+    "y": 435.8890075683594,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "b6b8b28d.368718"
+      ]
+    ]
+  },
+  {
+    "id": "9e12816.9f59e",
+    "type": "set",
+    "name": "set site1_name",
+    "xml": "<set>\n<parameter name='prop.l3vpn.site1_name' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1827,
+    "y": 326.6000061035156,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "b6297fef.ebefb",
+    "type": "set",
+    "name": "set vrf1_id",
+    "xml": "<set>\n<parameter name='prop.l3vpn.vrf1-id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1829.9999389648438,
+    "y": 383.5999755859375,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "b6b8b28d.368718",
+    "type": "set",
+    "name": "set vrf2_id",
+    "xml": "<set>\n<parameter name='prop.l3vpn.vrf2-id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1848,
+    "y": 439.8890075683594,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "4cb232f8.ebf31c",
+    "type": "outcome",
+    "name": "0",
+    "xml": "<outcome value='0'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1263,
+    "y": 20,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "55192e25.8885f"
+      ]
+    ]
+  },
+  {
+    "id": "c820d47.424eda8",
+    "type": "set",
+    "name": "set output to api handler",
+    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />\n \n",
+    "comments": "",
+    "x": 832,
+    "y": 875,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "d94a9bb9.76a0c8",
+    "type": "execute",
+    "name": "execute RestApiCallNode - DELETE network-data",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.nw-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-nw\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 908,
+    "y": 802,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "e93feae8.46a908",
+        "e4b9f022.5b775",
+        "6dfa3475.c889ec"
+      ]
+    ]
+  },
+  {
+    "id": "e93feae8.46a908",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1179.5873565673828,
+    "y": 789.289436340332,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "98b108c8.15ac98"
+      ]
+    ]
+  },
+  {
+    "id": "e4b9f022.5b775",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1175.8373184204102,
+    "y": 818.9323314651847,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "de27e6ee.26b61"
+      ]
+    ]
+  },
+  {
+    "id": "6dfa3475.c889ec",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1184.8372688293457,
+    "y": 850.4323057159781,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "de27e6ee.26b61"
+      ]
+    ]
+  },
+  {
+    "id": "98b108c8.15ac98",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1321.2433242797852,
+    "y": 785.4816055297852,
+    "z": "b1a89180.b5141",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "de27e6ee.26b61",
+    "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 updating md-sal for network-data\" />",
+    "comments": "",
+    "x": 1345.5873565673828,
+    "y": 819.6823553070426,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "a9f02234.2759e8",
+    "type": "set",
+    "name": "set tmp.nw-url",
+    "xml": "<set>\n<parameter name='tmp.nw-url' value=\"`'/restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/' \n + $network-topology-operation-input.network-information.network-id` \" />",
+    "comments": "",
+    "x": 809,
+    "y": 748,
+    "z": "b1a89180.b5141",
+    "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 c0046db3..3afa4b93 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
@@ -155,6 +155,7 @@
                                     <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.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`" />
+                                    <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />
                                 </set>
                             </outcome>
                             <outcome value="not-found">
@@ -187,49 +188,32 @@
                             <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.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.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>
+                        <switch test="`$prop.sdncRestApi.thirdpartySdnc.vendor`">
+                            <outcome value="SPTN">
+                                <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.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" />
+                                        </execute>
+                                    </outcome>
+                                    <outcome value="L2-DCI">
+                                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                                            <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" />
+                                        </execute>
+                                    </outcome>
+                                </switch>
                             </outcome>
                         </switch>
                     </block>
@@ -376,6 +360,7 @@
                                     <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.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`" />
+                                    <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />
                                 </set>
                             </outcome>
                             <outcome value="not-found">
@@ -408,49 +393,32 @@
                             <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.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.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>
+                        <switch test="`$prop.sdncRestApi.thirdpartySdnc.vendor`">
+                            <outcome value="SPTN">
+                                <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.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" />
+                                        </execute>
+                                    </outcome>
+                                    <outcome value="L2-DCI">
+                                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                                            <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" />
+                                        </execute>
+                                    </outcome>
+                                </switch>
                             </outcome>
                         </switch>
                     </block>
@@ -500,8 +468,6 @@
                 <parameter name="relationship-list.relationship[0].related-link" value="/network/configurations/configuration" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.dci.network-id`" />
-                <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-key" value="configuration.configuration-type" />
-                <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-value" value="overlay" />
             </save>
             <return status="success">
                 <parameter name="ack-final-indicator" value="Y" />
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 1883baf8..04cbb6e9 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
@@ -30,6 +30,7 @@
                         <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`" />
+                        <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />
                      </set>
                   </outcome>
                   <outcome value="not-found">
@@ -62,47 +63,32 @@
                   <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="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
-                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                        <parameter name="format" value="json" />
-                        <parameter name="httpMethod" value="delete" />
-                        <parameter name="responsePrefix" value="restapi-result" />
-                        <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="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
-                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                        <parameter name="format" value="json" />
-                        <parameter name="httpMethod" value="delete" />
-                        <parameter name="responsePrefix" value="restapi-result" />
-                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                     </execute>
+               <switch test="`$prop.sdncRestApi.thirdpartySdnc.vendor`">
+                  <outcome value="SPTN">
+                     <switch test="`$prop.dci-connects.tunnelType`">
+                        <outcome value="L3-DCI">
+                           <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                              <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
+                              <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                              <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                              <parameter name="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">
+                           <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                              <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
+                              <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                              <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                              <parameter name="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>
                   </outcome>
                </switch>
             </block>
@@ -127,6 +113,7 @@
                         <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`" />
+                        <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />
                      </set>
                   </outcome>
                   <outcome value="not-found">
@@ -159,47 +146,32 @@
                   <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="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
-                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                        <parameter name="format" value="json" />
-                        <parameter name="httpMethod" value="delete" />
-                        <parameter name="responsePrefix" value="restapi-result" />
-                        <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="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
-                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                        <parameter name="format" value="json" />
-                        <parameter name="httpMethod" value="delete" />
-                        <parameter name="responsePrefix" value="restapi-result" />
-                        <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                     </execute>
+               <switch test="`$prop.sdncRestApi.thirdpartySdnc.vendor`">
+                  <outcome value="SPTN">
+                     <switch test="`$prop.dci-connects.tunnelType`">
+                        <outcome value="L3-DCI">
+                           <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                              <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`" />
+                              <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                              <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                              <parameter name="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">
+                           <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                              <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`" />
+                              <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                              <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                              <parameter name="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>
                   </outcome>
                </switch>
             </block>
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 f4fd9eef..54585562 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
@@ -521,6 +521,16 @@
                 <parameter name="service-data.networks.network[$nidx].network-data.network-request-input." value="`$network-topology-operation-input.network-request-input.`" />
                 <parameter name="service-data.networks.network_length" value="`$nidx+1`" />
             </set>
+            <set>
+                <parameter name="pidx" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`" />
+            </set>
+            <set>
+                <parameter name="service-data.networks.network[$nidx].network-data.network-request-input.network-input-parameters.param[$pidx].name" value="vrf1_id" />
+                <parameter name="service-data.networks.network[$nidx].network-data.network-request-input.network-input-parameters.param[$pidx].value" value="`$prop.l3vpn.vrf1-id`" />
+                <parameter name="service-data.networks.network[$nidx].network-data.network-request-input.network-input-parameters.param[$pidx+1].name" value="vrf2_id" />
+                <parameter name="service-data.networks.network[$nidx].network-data.network-request-input.network-input-parameters.param[$pidx+1].value" value="`$prop.l3vpn.vrf2-id`d" />
+                <parameter name="service-data.networks.network[$nidx].network_data.network-request-input.network-input-parameters.param_length" value="`$pidx+2`" />
+            </set>
             <set>
                 <parameter name="networkId" value="`$prop.l3vpn.network-id`" />
                 <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/'` " />
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 3e2ff578..22952f50 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
@@ -4,6 +4,13 @@
         <block atomic="true">
             <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
             <switch test="`$service-data.networks.network_length`">
+                <outcome value="0">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y" />
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
+                    </return>
+                </outcome>
                 <outcome value="">
                     <return status="failure">
                         <parameter name="ack-final" value="Y" />
@@ -58,6 +65,27 @@
                             </set>
                         </outcome>
                     </switch>
+                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_name'`">
+                        <outcome value="true">
+                            <set>
+                                <parameter name="prop.l3vpn.site1_name" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'vrf1_id'`">
+                        <outcome value="true">
+                            <set>
+                                <parameter name="prop.l3vpn.vrf1-id" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'vrf2_id'`">
+                        <outcome value="true">
+                            <set>
+                                <parameter name="prop.l3vpn.vrf2-id" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
+                            </set>
+                        </outcome>
+                    </switch>
                 </block>
             </for>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $prop.l3vpn.pe1_id AND         depth = '0'" pfx="tmp.aai.pnf" local-only="false">
@@ -117,9 +145,13 @@
                             <parameter name="format" value="json" />
                             <parameter name="httpMethod" value="post" />
                             <parameter name="responsePrefix" value="token-result" />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />
+                            <parameter name="trustStorePassword" value="adminadmin" />
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />
+                            <parameter name="keyStorePassword" value="adminadmin" />
                             <outcome value="success">
                                 <set>
-                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.token_id" />
+                                    <parameter name="prop.sdncRestApi.token_id" value="$token-result.data.token_id" />
                                 </set>
                             </outcome>
                             <outcome value="failure">
@@ -131,44 +163,133 @@
                             </outcome>
                         </execute>
                         <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <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/sites/site=' + $prop.l3vpn.site1_name`" />
+                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                            <parameter name="format" value="json" />
+                            <parameter name="httpMethod" value="delete" />
+                            <parameter name="responsePrefix" value="site-result" />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />
+                            <parameter name="trustStorePassword" value="adminadmin" />
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />
+                            <parameter name="keyStorePassword" value="adminadmin" />
+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                            <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 Delete Site rest api" />
+                                </return>
+                            </outcome>
+                            <outcome value="success">
+                                <block />
+                            </outcome>
+                        </execute>
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi:vrf-attributes/vrf-attribute=' + $prop.l3vpn.vrf1-id`" />
+                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                            <parameter name="format" value="json" />
+                            <parameter name="httpMethod" value="delete" />
+                            <parameter name="responsePrefix" value="vrf1-result" />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />
+                            <parameter name="trustStorePassword" value="adminadmin" />
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />
+                            <parameter name="keyStorePassword" value="adminadmin" />
+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                            <outcome value="success">
+                                <block />
+                            </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 Delete VRF1 rest api" />
+                                </return>
+                            </outcome>
+                        </execute>
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi:vrf-attributes/vrf-attribute=' + $prop.l3vpn.vrf2-id`" />
+                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                            <parameter name="format" value="json" />
+                            <parameter name="httpMethod" value="delete" />
+                            <parameter name="responsePrefix" value="vrf2-result" />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />
+                            <parameter name="trustStorePassword" value="adminadmin" />
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />
+                            <parameter name="keyStorePassword" value="adminadmin" />
+                            <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                            <outcome value="success">
+                                <block />
+                            </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 Delete VRF2 rest api" />
+                                </return>
+                            </outcome>
+                        </execute>
+                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
                             <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`" />
                             <parameter name="format" value="json" />
                             <parameter name="httpMethod" value="delete" />
-                            <parameter name="responsePrefix" value="restapi-result" />
+                            <parameter name="responsePrefix" value="vpn-result" />
+                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks" />
+                            <parameter name="trustStorePassword" value="adminadmin" />
+                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12" />
+                            <parameter name="keyStorePassword" value="adminadmin" />
                             <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                            <outcome value="success" />
+                            <outcome value="success">
+                                <block />
+                            </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 3rd party controller rest api" />
+                                    <parameter name="error-message" value="Error executing Delete VPN rest api" />
                                 </return>
                             </outcome>
                         </execute>
                     </block>
                 </outcome>
             </switch>
-            <block atomic="true">
-                <set>
-                    <parameter name="service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />
-                    <parameter name="service-data.networks.network[$tmp.nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />
-                </set>
-                <set>
-                    <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
-                </set>
-                <set>
-                    <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/'  + $networkId  + '/network-data/'` " />
-                </set>
-                <set>
-                    <parameter name="service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status" value="Deleted" />
-                    <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`" />
-                    <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`" />
-                </set>
-            </block>
             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $network-topology-operation-input.network-information.network-id" />
+            <set>
+                <parameter name="tmp.nw-url" value="`'/restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'   + $network-topology-operation-input.network-information.network-id` " />
+            </set>
+            <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                <parameter name="restapiUrl" value="`$prop.controller.url + $tmp.nw-url`" />
+                <parameter name="restapiUser" value="`$prop.controller.user`" />
+                <parameter name="restapiPassword" value="`$prop.controller.pwd`" />
+                <parameter name="format" value="json" />
+                <parameter name="httpMethod" value="DELETE" />
+                <parameter name="responsePrefix" value="mdsal-nw" />
+                <outcome value="success">
+                    <block />
+                </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 updating md-sal for network-data" />
+                    </return>
+                </outcome>
+                <outcome value="not-found">
+                    <return status="failure">
+                        <parameter name="ack-final" value="Y" />
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="Error updating md-sal for network-data" />
+                    </return>
+                </outcome>
+            </execute>
+            <set>
+                <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
+                <parameter name="service-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/service-topology/'` " />
+            </set>
             <return status="success">
                 <parameter name="ack-final-indicator" value="Y" />
                 <parameter name="error-code" value="200" />
-- 
cgit 1.2.3-korg