From 7045ab10b43a9ae8893137378c3acac4fd6fdd1a Mon Sep 17 00:00:00 2001
From: "ramu.n" <ramu.n@huawei.com>
Date: Fri, 13 Oct 2017 17:24:24 +0530
Subject: Update overlay DGs for VoLTE use case

*Fetch network-id from network-name
*Store network information in AAI

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

Former-commit-id: 46fb55b26ff1c81b20262a50cda035c643ffafdd
---
 ...nnects-network-topology-operation-activate.json | 2814 ++++++++++----------
 ...ects-network-topology-operation-deactivate.json | 1023 ++++---
 ...onnects-network-topology-operation-activate.xml |  798 +++---
 ...nects-network-topology-operation-deactivate.xml |  365 ++-
 4 files changed, 2564 insertions(+), 2436 deletions(-)

(limited to 'platform-logic/generic-resource-api/src')

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 8ca37549..80aaa6be 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,1820 +1,1932 @@
 [
   {
-    "id":"d9348659.3343f8",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":123.47356414794922,
-    "y":36.92307662963867,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "4c36e56f.956e94",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 91.49996948242188,
+    "y": 73,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "91511e7d.e1436"
+        "38e1188a.f9fef"
       ]
     ]
   },
   {
-    "id":"91511e7d.e1436",
-    "type":"service-logic",
-    "name":"GENERIC-RESOURCE-API ${project.version}",
-    "module":"GENERIC-RESOURCE-API",
-    "version":"${project.version}",
-    "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":339.9735641479492,
-    "y":99.42307662963867,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "38e1188a.f9fef",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "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": 307.9999694824219,
+    "y": 135.5,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "fb35fe83.68171"
+        "be128d6c.f677e"
       ]
     ]
   },
   {
-    "id":"fb35fe83.68171",
-    "type":"method",
-    "name":"method dci-connects-network-topology-operation-activate",
-    "xml":"<method rpc='dci-connects-network-topology-operation-activate' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":247.97359466552734,
-    "y":194.4230613708496,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "be128d6c.f677e",
+    "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": 216,
+    "y": 230.49998474121094,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "85134fc3.6a4b9"
+        "bf628732.ed9c68"
       ]
     ]
   },
   {
-    "id":"85134fc3.6a4b9",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":545.8069076538086,
-    "y":202.25640487670898,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "bf628732.ed9c68",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 513.8333129882812,
+    "y": 238.3333282470703,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "72cde0ff.31704",
-        "590c7c68.1d2104",
-        "550a9d72.337fb4"
+        "1a1ab9fe.172d5e",
+        "c91abe90.b09f18",
+        "24a12c20.3823c4",
+        "56f7544c.7d9984",
+        "168e5d62.705303"
       ]
     ]
   },
   {
-    "id":"590c7c68.1d2104",
-    "type":"call",
-    "name":"call GENERIC-RESOURCE-API:validate-network-input-parameters",
-    "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":935.8069076538086,
-    "y":67.25640487670898,
-    "z":"14477aa.fad1e85",
-    "wires":[
-      [
-
-      ]
+    "id": "c91abe90.b09f18",
+    "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": 903.8333129882812,
+    "y": 103.33332824707031,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"7588d34b.da832c",
-    "type":"for",
-    "name":"for each network-input-parameters",
-    "xml":"<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":1453.8071975708008,
-    "y":340.25646567344666,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "ee9e843c.f2eaa8",
+    "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": 1421.8336029052734,
+    "y": 376.333389043808,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "40d47fba.cda58"
+        "6ecca6a7.b330b8"
       ]
     ]
   },
   {
-    "id":"40d47fba.cda58",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1700.8071060180664,
-    "y":338.25643515586853,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "6ecca6a7.b330b8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1668.833511352539,
+    "y": 374.33335852622986,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "e1df1ae9.cf85b8",
-        "4928a2f4.8183ac",
-        "aa1e7021.923d4",
-        "b5b55974.4394b8",
-        "c1b8667e.1e3be8",
-        "486715ba.35901c",
-        "bfa187c0.0fb398",
-        "32183c6e.e30e04",
-        "61d1802d.1434"
+        "7ec2f156.31bad8",
+        "e570d5e6.8d7958",
+        "2fe6f50.ba2558c",
+        "320c6219.91f19e",
+        "88a16009.d8acd",
+        "69aad884.29b65",
+        "d425399b.6eb9d",
+        "9c7489c7.684fa",
+        "2e60a059.b3e188"
       ]
     ]
   },
   {
-    "id":"e1df1ae9.cf85b8",
-    "type":"switchNode",
-    "name":"switch id",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2187.8074645996094,
-    "y":214.2565517425537,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "7ec2f156.31bad8",
+    "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": 2155.833869934082,
+    "y": 250.33347511291504,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "df29b873.dc0368"
+        "aa4e7849.32cd9"
       ]
     ]
   },
   {
-    "id":"4928a2f4.8183ac",
-    "type":"switchNode",
-    "name":"switch description",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_description'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2215.8074645996094,
-    "y":268.25653743743896,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "e570d5e6.8d7958",
+    "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": 2183.833869934082,
+    "y": 304.3334608078003,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "66a6f423.f8cf2c"
+        "8223ea44.b877"
       ]
     ]
   },
   {
-    "id":"aa1e7021.923d4",
-    "type":"switchNode",
-    "name":"switch routerId",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2204.8072509765625,
-    "y":399.2564973831177,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "2fe6f50.ba2558c",
+    "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": 2172.833656311035,
+    "y": 435.333420753479,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "f862419f.5a38e"
+        "b9d7a29d.1fc0a8"
       ]
     ]
   },
   {
-    "id":"b5b55974.4394b8",
-    "type":"switchNode",
-    "name":"switch importRT1",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2213.092987060547,
-    "y":460.54225063323975,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "320c6219.91f19e",
+    "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": 2181.1193923950195,
+    "y": 496.6191740036011,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "d69adf7d.fdb4a"
+        "db18baa3.a37308"
       ]
     ]
   },
   {
-    "id":"c1b8667e.1e3be8",
-    "type":"switchNode",
-    "name":"switch exportRT1",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2214.093048095703,
-    "y":524.5422214269638,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "88a16009.d8acd",
+    "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": 2182.119453430176,
+    "y": 560.6191447973251,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "83c8cb3e.493888"
+        "7071fdd7.40f6bc"
       ]
     ]
   },
   {
-    "id":"486715ba.35901c",
-    "type":"switchNode",
-    "name":"switch vni",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2185.093017578125,
-    "y":587.5422534942627,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "69aad884.29b65",
+    "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": 2153.1194229125977,
+    "y": 623.619176864624,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "9741b81e.e77848"
+        "62dcb995.73bbd"
       ]
     ]
   },
   {
-    "id":"df29b873.dc0368",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2402.8074645996094,
-    "y":213.2565517425537,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "aa4e7849.32cd9",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2370.833869934082,
+    "y": 249.33347511291504,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "2e6a3378.2c236c"
+        "13456a67.fe8996"
       ]
     ]
   },
   {
-    "id":"66a6f423.f8cf2c",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2413.8074645996094,
-    "y":268.25653743743896,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "8223ea44.b877",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2381.833869934082,
+    "y": 304.3334608078003,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "1b94cf95.06452"
+        "dd206567.023688"
       ]
     ]
   },
   {
-    "id":"f862419f.5a38e",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2409.8072509765625,
-    "y":398.2564973831177,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "b9d7a29d.1fc0a8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2377.833656311035,
+    "y": 434.333420753479,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "20e3f8cc.02b6f8"
+        "b00c15e3.57b258"
       ]
     ]
   },
   {
-    "id":"d69adf7d.fdb4a",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2415.092987060547,
-    "y":459.54225063323975,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "db18baa3.a37308",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2383.1193923950195,
+    "y": 495.6191740036011,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "4dceded7.35703"
+        "b67dfe0e.da3b68"
       ]
     ]
   },
   {
-    "id":"83c8cb3e.493888",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2410.093048095703,
-    "y":521.5422214269638,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "7071fdd7.40f6bc",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2378.119453430176,
+    "y": 557.6191447973251,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "b28306b0.c9d2a8"
+        "8e66a40c.ada548"
       ]
     ]
   },
   {
-    "id":"9741b81e.e77848",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2391.093017578125,
-    "y":587.5422534942627,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "62dcb995.73bbd",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2359.1194229125977,
+    "y": 623.619176864624,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "12fa2bd9.b56374"
+        "3d1ad610.f82f92"
       ]
     ]
   },
   {
-    "id":"1b94cf95.06452",
-    "type":"set",
-    "name":"set description",
-    "xml":"<set>\n<parameter name='prop.dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2595.8074645996094,
-    "y":261.25653743743896,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "dd206567.023688",
+    "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": 2563.833869934082,
+    "y": 297.3334608078003,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"20e3f8cc.02b6f8",
-    "type":"set",
-    "name":"set router_id",
-    "xml":"<set>\n<parameter name='prop.dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2600.807472229004,
-    "y":391.25658416748047,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "b00c15e3.57b258",
+    "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": 2568.8338775634766,
+    "y": 427.3335075378418,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"12fa2bd9.b56374",
-    "type":"set",
-    "name":"set vni",
-    "xml":"<set>\n<parameter name='prop.dci-connects.vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2561.093017578125,
-    "y":579.5422534942627,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "3d1ad610.f82f92",
+    "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": 2529.1194229125977,
+    "y": 615.619176864624,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"72cde0ff.31704",
-    "type":"returnSuccess",
-    "name":"return success",
-    "xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
-    "comments":"",
-    "x":768.0927352905273,
-    "y":1042.970775604248,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "1a1ab9fe.172d5e",
+    "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": 737.119140625,
+    "y": 1201.0477294921875,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"bfa187c0.0fb398",
-    "type":"switchNode",
-    "name":"switch name",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2198.9739990234375,
-    "y":155.4231834411621,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "d425399b.6eb9d",
+    "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": 2167.00040435791,
+    "y": 191.50010681152344,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "72ce5ab6.59c4f4"
+        "b5fa6ca4.bca08"
       ]
     ]
   },
   {
-    "id":"72ce5ab6.59c4f4",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2396.9739990234375,
-    "y":155.4231834411621,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "b5fa6ca4.bca08",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2365.00040435791,
+    "y": 191.50010681152344,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "94ddea4c.b90858"
+        "8c66be71.462ad"
       ]
     ]
   },
   {
-    "id":"94ddea4c.b90858",
-    "type":"set",
-    "name":"set name",
-    "xml":"<set>\n<parameter name='prop.dci-connects.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2578.9739990234375,
-    "y":148.4231834411621,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "8c66be71.462ad",
+    "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": 2547.00040435791,
+    "y": 184.50010681152344,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"32183c6e.e30e04",
-    "type":"switchNode",
-    "name":"switch networkName",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2222.4737854003906,
-    "y":334.4231233596802,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "9c7489c7.684fa",
+    "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": 2190.5001907348633,
+    "y": 370.5000467300415,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "cbd34ee3.99a0d"
+        "cc2233ba.9a0b28"
       ]
-    ]
+    ]
   },
   {
-    "id":"cbd34ee3.99a0d",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2420.4737854003906,
-    "y":334.4231233596802,
-    "z":"14477aa.fad1e85",
-    "wires":[
-      [
-
-      ]
+    "id": "cc2233ba.9a0b28",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2388.5001907348633,
+    "y": 370.5000467300415,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"550a9d72.337fb4",
-    "type":"block",
-    "name":"block : execute",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":769.4734954833984,
-    "y":575.4231224060059,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "24a12c20.3823c4",
+    "type": "block",
+    "name": "block : execute",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 737.4999008178711,
+    "y": 611.5000457763672,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "cfc7a47c.663e78",
-        "c5b9ee71.a7f1b",
-        "180ce8e1.cf4c47"
+        "37a31ee0.24b852",
+        "23165d49.4901aa",
+        "5c1bffb4.63e308"
       ]
     ]
   },
   {
-    "id":"cfc7a47c.663e78",
-    "type":"block",
-    "name":"block : executeSite1",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":1061.9735565185547,
-    "y":399.92309856414795,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "37a31ee0.24b852",
+    "type": "block",
+    "name": "block : executeSite1",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1029.9999618530273,
+    "y": 436.0000219345093,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "7588d34b.da832c",
-        "28717d00.ee3742"
+        "ee9e843c.f2eaa8",
+        "9f9de06d.e9691"
       ]
     ]
   },
   {
-    "id":"c5b9ee71.a7f1b",
-    "type":"block",
-    "name":"block : executeSite2",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":1078.9736022949219,
-    "y":915.9230813980103,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "23165d49.4901aa",
+    "type": "block",
+    "name": "block : executeSite2",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1047.0000076293945,
+    "y": 952.0000047683716,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "fd35f4e6.c30318",
-        "28717d00.ee3742"
+        "70a4ded.49d87a",
+        "9f9de06d.e9691"
       ]
     ]
   },
   {
-    "id":"3cb8fe79.792382",
-    "type":"switchNode",
-    "name":"switch id",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2173.473808288574,
-    "y":734.9230155944824,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "3d56dd00.415eac",
+    "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": 2141.500213623047,
+    "y": 770.9999389648438,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "95aba4ef.a6b348"
+        "e78901da.ff61b8"
       ]
     ]
   },
   {
-    "id":"c3869697.ac74a8",
-    "type":"switchNode",
-    "name":"switch description",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_description'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2197.4741592407227,
-    "y":793.9230222702026,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "fe2e1517.a2ac7",
+    "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": 2165.5005645751953,
+    "y": 829.999945640564,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "87dd7ff6.4e946",
-        "6ebb06e1.0019e8"
+        "2d58a544.c935ea",
+        "8505b154.9fb048"
       ]
     ]
   },
   {
-    "id":"28c024be.02b6cc",
-    "type":"switchNode",
-    "name":"switch routerId",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2206.47354888916,
-    "y":989.9229879379272,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "4147e9a8.080da",
+    "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": 2174.499954223633,
+    "y": 1025.9999113082886,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "c2a810a1.f17f8"
+        "f5bf01a7.290cc"
       ]
     ]
   },
   {
-    "id":"4596e3bf.5dc28c",
-    "type":"switchNode",
-    "name":"switch importRT1",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2214.7592849731445,
-    "y":1051.2087411880493,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "aef1e9ce.a6ab3",
+    "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": 2182.785690307617,
+    "y": 1087.2856645584106,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "4dd4172.45198e8"
+        "2d67d7d8.2296d"
       ]
     ]
   },
   {
-    "id":"e37ecd89.2308f",
-    "type":"switchNode",
-    "name":"switch exportRT1",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_exportRT1'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2215.759346008301,
-    "y":1115.2087119817734,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "360441dc.77ddb6",
+    "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": 2183.7857513427734,
+    "y": 1151.2856353521347,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "562841d1.af6df"
+        "fb49f623.4e5d48"
       ]
     ]
   },
   {
-    "id":"300b1c9.4943ee4",
-    "type":"switchNode",
-    "name":"switch vni",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2186.7593154907227,
-    "y":1178.2087440490723,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "2c78d4f1.048ee4",
+    "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": 2154.7857208251953,
+    "y": 1214.2856674194336,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "ea952cf3.d5472"
+        "dd227859.e75bf8"
       ]
     ]
   },
   {
-    "id":"95aba4ef.a6b348",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2388.473808288574,
-    "y":733.9230155944824,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "e78901da.ff61b8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2356.500213623047,
+    "y": 769.9999389648438,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "278a044f.dd078c"
+        "f1dbc88c.9a5b98"
       ]
     ]
   },
   {
-    "id":"87dd7ff6.4e946",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2395.4741592407227,
-    "y":793.9230222702026,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "2d58a544.c935ea",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2363.5005645751953,
+    "y": 829.999945640564,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "93ea2de.e8ac8d"
+        "432bb78.173bc48"
       ]
     ]
   },
   {
-    "id":"c2a810a1.f17f8",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2411.47354888916,
-    "y":988.9229879379272,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "f5bf01a7.290cc",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2379.499954223633,
+    "y": 1024.9999113082886,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "85948504.e0e5e8"
+        "f3e93f46.78cae8"
       ]
     ]
   },
   {
-    "id":"4dd4172.45198e8",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2416.7592849731445,
-    "y":1050.2087411880493,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "2d67d7d8.2296d",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2384.785690307617,
+    "y": 1086.2856645584106,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "36bb1ad6.f67656"
+        "e5ced29d.00d08"
       ]
     ]
   },
   {
-    "id":"562841d1.af6df",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2411.759346008301,
-    "y":1112.2087119817734,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "fb49f623.4e5d48",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2379.7857513427734,
+    "y": 1148.2856353521347,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "6259b6ca.196658"
+        "199235cd.b410ca"
       ]
     ]
   },
   {
-    "id":"ea952cf3.d5472",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2392.7593154907227,
-    "y":1178.2087440490723,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "dd227859.e75bf8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2360.7857208251953,
+    "y": 1214.2856674194336,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "255616ab.de0f5a"
+        "6a38de12.5b185"
       ]
     ]
   },
   {
-    "id":"93ea2de.e8ac8d",
-    "type":"set",
-    "name":"set description",
-    "xml":"<set>\n<parameter name='prop.dci-connects.description' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2577.4741592407227,
-    "y":786.9230222702026,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "432bb78.173bc48",
+    "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": 2545.5005645751953,
+    "y": 822.999945640564,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"85948504.e0e5e8",
-    "type":"set",
-    "name":"set router_id",
-    "xml":"<set>\n<parameter name='prop.dci-connects.router_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2602.4737701416016,
-    "y":981.92307472229,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "f3e93f46.78cae8",
+    "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": 2570.500175476074,
+    "y": 1017.9999980926514,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"255616ab.de0f5a",
-    "type":"set",
-    "name":"set vni",
-    "xml":"<set>\n<parameter name='prop.dci-connects.vni' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2562.7593154907227,
-    "y":1170.2087440490723,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "6a38de12.5b185",
+    "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": 2530.7857208251953,
+    "y": 1206.2856674194336,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"61795685.f9f748",
-    "type":"switchNode",
-    "name":"switch networkName",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2224.1400833129883,
-    "y":925.0896139144897,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "15d71463.8bcfa4",
+    "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": 2192.166488647461,
+    "y": 961.1665372848511,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "9b9d32c5.d3d4"
+        "8641ca6f.8854e"
       ]
     ]
   },
   {
-    "id":"9b9d32c5.d3d4",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2422.1400833129883,
-    "y":925.0896139144897,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "8641ca6f.8854e",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2390.166488647461,
+    "y": 961.1665372848511,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-
+        "c4b84815.27de5"
       ]
     ]
   },
   {
-    "id":"6bade79.05bd618",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1692.473258972168,
-    "y":856.9229733943939,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "415cf18c.8dc438",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1660.4996643066406,
+    "y": 892.9998967647552,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "3cb8fe79.792382",
-        "c3869697.ac74a8",
-        "28c024be.02b6cc",
-        "4596e3bf.5dc28c",
-        "e37ecd89.2308f",
-        "300b1c9.4943ee4",
-        "61795685.f9f748"
+        "3d56dd00.415eac",
+        "fe2e1517.a2ac7",
+        "4147e9a8.080da",
+        "aef1e9ce.a6ab3",
+        "360441dc.77ddb6",
+        "2c78d4f1.048ee4",
+        "15d71463.8bcfa4"
       ]
     ]
   },
   {
-    "id":"fd35f4e6.c30318",
-    "type":"for",
-    "name":"for each network-input-parameters",
-    "xml":"<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":1445.4733505249023,
-    "y":858.923003911972,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "70a4ded.49d87a",
+    "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": 1413.499755859375,
+    "y": 894.9999272823334,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "6bade79.05bd618"
-      ]
-    ]
-  },
+        "415cf18c.8dc438"
+      ]
+    ]
+  },
   {
-    "id":"2e6a3378.2c236c",
-    "type":"set",
-    "name":"set id",
-    "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2584.473846435547,
-    "y":206.9231014251709,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "13456a67.fe8996",
+    "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": 2552.5002517700195,
+    "y": 243.00002479553223,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"61d1802d.1434",
-    "type":"switchNode",
-    "name":"switch tunnelType",
-    "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":2203.973564147949,
-    "y":656.9230155944824,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "2e60a059.b3e188",
+    "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": 2171.999969482422,
+    "y": 692.9999389648438,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "7f01268.d4291d8"
+        "4b99b834.6c111"
       ]
     ]
   },
   {
-    "id":"7f01268.d4291d8",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2409.973564147949,
-    "y":656.9230155944824,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "4b99b834.6c111",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2377.999969482422,
+    "y": 692.9999389648438,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "b055aa18.813ff8"
+        "1995f2e4.a2f79d"
       ]
     ]
   },
   {
-    "id":"b055aa18.813ff8",
-    "type":"set",
-    "name":"set tunnelType",
-    "xml":"<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2579.973564147949,
-    "y":648.9230155944824,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"28717d00.ee3742",
-    "type":"block",
-    "name":"block : sendRequest",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":1357.9735832214355,
-    "y":1416.4230213165283,
-    "z":"14477aa.fad1e85",
-    "wires":[
-      [
-        "ceb4bf57.f1644",
-        "143c42a.ea474bd",
-        "69d4f592.3b2f0c",
-        "282c5c4c.028af4"
-      ]
-    ]
+    "id": "1995f2e4.a2f79d",
+    "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": 2547.999969482422,
+    "y": 684.9999389648438,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"f74530f5.a1018",
-    "type":"execute",
-    "name":"execute RestApiCallNode Activate Vxlan Tunnel",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2165.9738578796387,
-    "y":1479.4229764938354,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "9f9de06d.e9691",
+    "type": "block",
+    "name": "block : sendRequest",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1325.9999885559082,
+    "y": 1452.4999446868896,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-
+        "4abf4c0.6ba8234",
+        "f7dfb0f6.24b96",
+        "9eb66fb5.27033"
       ]
     ]
   },
   {
-    "id":"3efd235d.45b6ec",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1844.4735412597656,
-    "y":1187.4226081371307,
-    "z":"14477aa.fad1e85",
-    "wires":[
-      [
-        "e0432082.58761"
-      ]
+    "id": "13c2385e.c3283",
+    "type": "execute",
+    "name": "execute RestApiCallNode Activate Vxlan Tunnel",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2134.0002632141113,
+    "y": 1515.4998998641968,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"55a28fdf.38008",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1851.4735412597656,
-    "y":1225.4226081371307,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "cd3c6fdb.337a48",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1812.4999465942383,
+    "y": 1223.499531507492,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "2d85c47e.12b71c"
+        "9de2e39e.9d2c88"
       ]
     ]
   },
   {
-    "id":"726e6abc.90c824",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1843.4735412597656,
-    "y":1267.4226081371307,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "e94227c8.8ebae",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1819.4999465942383,
+    "y": 1261.499531507492,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "e5b22324.d97fb"
+        "2833f620.7533ba"
       ]
     ]
   },
   {
-    "id":"e0432082.58761",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2009.4735412597656,
-    "y":1176.4226081371307,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "2d9e1f4a.03602",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1811.4999465942383,
+    "y": 1303.499531507492,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-
+        "ddb11f26.1e1f6"
       ]
     ]
   },
   {
-    "id":"2d85c47e.12b71c",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-    "comments":"",
-    "x":2008.4735412597656,
-    "y":1229.4226081371307,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "2833f620.7533ba",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 1976.4999465942383,
+    "y": 1265.499531507492,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"e5b22324.d97fb",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-    "comments":"",
-    "x":2001.4735412597656,
-    "y":1276.4226081371307,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "ddb11f26.1e1f6",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 1969.4999465942383,
+    "y": 1312.499531507492,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"ceb4bf57.f1644",
-    "type":"get-resource",
-    "name":"get-resource esr-thirdparty-sdnc",
-    "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":1625.7044219970703,
-    "y":1226.7303733825684,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "4abf4c0.6ba8234",
+    "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": 1593.730827331543,
+    "y": 1262.8072967529297,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "3efd235d.45b6ec",
-        "55a28fdf.38008",
-        "726e6abc.90c824"
+        "cd3c6fdb.337a48",
+        "e94227c8.8ebae",
+        "2d9e1f4a.03602"
       ]
     ]
   },
   {
-    "id":"143c42a.ea474bd",
-    "type":"set",
-    "name":"set controller data",
-    "xml":"<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n\n",
-    "comments":"",
-    "x":1627.9735145568848,
-    "y":1335.9225814342499,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "9de2e39e.9d2c88",
+    "type": "set",
+    "name": "set controller data",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n",
+    "comments": "",
+    "x": 1986.9998779296875,
+    "y": 1219.99951171875,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"69d4f592.3b2f0c",
-    "type":"switchNode",
-    "name":"switch tunnelType",
-    "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1628.973316192627,
-    "y":1503.9224872589111,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "f7dfb0f6.24b96",
+    "type": "switchNode",
+    "name": "switch tunnelType",
+    "xml": "<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1596.9997215270996,
+    "y": 1539.9994106292725,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "871cf858.f9bdf8",
-        "4bb377eb.2cad38"
+        "88dd7f05.8bf64",
+        "ffc3e991.fbb298"
       ]
     ]
   },
   {
-    "id":"871cf858.f9bdf8",
-    "type":"outcomeTrue",
-    "name":"L3-DCI",
-    "xml":"<outcome value='L3-DCI'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1841.973445892334,
-    "y":1483.9224872589111,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "88dd7f05.8bf64",
+    "type": "outcomeTrue",
+    "name": "L3-DCI",
+    "xml": "<outcome value='L3-DCI'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1809.9998512268066,
+    "y": 1519.9994106292725,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "f74530f5.a1018"
+        "13c2385e.c3283"
       ]
     ]
   },
   {
-    "id":"4bb377eb.2cad38",
-    "type":"outcomeTrue",
-    "name":"L2-DCI",
-    "xml":"<outcome value='L2-DCI'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1839.9732666015625,
-    "y":1555.9224872589111,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "ffc3e991.fbb298",
+    "type": "outcomeTrue",
+    "name": "L2-DCI",
+    "xml": "<outcome value='L2-DCI'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1807.9996719360352,
+    "y": 1591.9994106292725,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "a57b1e86.15921"
+        "c8efabdf.31825"
       ]
     ]
   },
   {
-    "id":"278a044f.dd078c",
-    "type":"set",
-    "name":"set id",
-    "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2562.4737815856934,
-    "y":728.9230680465698,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "f1dbc88c.9a5b98",
+    "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": 2530.500186920166,
+    "y": 764.9999914169312,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"a57b1e86.15921",
-    "type":"execute",
-    "name":"execute RestApiCallNode Activate Vxlan Tunnel",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2159.9738121032715,
-    "y":1556.4229125976562,
-    "z":"14477aa.fad1e85",
-    "wires":[
-      [
-
-      ]
+    "id": "c8efabdf.31825",
+    "type": "execute",
+    "name": "execute RestApiCallNode Activate Vxlan Tunnel",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2128.000217437744,
+    "y": 1592.4998359680176,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"6ebb06e1.0019e8",
-    "type":"outcomeTrue",
-    "name":"false",
-    "xml":"<outcome value='false'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2393.9737396240234,
-    "y":852.9230518341064,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "8505b154.9fb048",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2362.000144958496,
+    "y": 888.9999752044678,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "735e68ce.3cf398"
+        "ccff44a9.224988"
       ]
     ]
   },
   {
-    "id":"735e68ce.3cf398",
-    "type":"set",
-    "name":"set description",
-    "xml":"<set>\n<parameter name='prop.dci-connects.description' value='' />\n",
-    "comments":"",
-    "x":2574.973808288574,
-    "y":847.9229927062988,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "ccff44a9.224988",
+    "type": "set",
+    "name": "set description",
+    "xml": "<set>\n<parameter name='prop.dci-connects.description' value='' />\n",
+    "comments": "",
+    "x": 2543.000213623047,
+    "y": 883.9999160766602,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"4dceded7.35703",
-    "type":"block",
-    "name":"block setEvpnIrts",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2596.973320007324,
-    "y":461.4386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "b67dfe0e.da3b68",
+    "type": "block",
+    "name": "block setEvpnIrts",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2564.999725341797,
+    "y": 497.5155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "12798a95.a33a75",
-        "f44998d.4f3fe68"
+        "3c4bea54.b82856",
+        "8b9a2579.97c4d8"
       ]
     ]
   },
   {
-    "id":"12798a95.a33a75",
-    "type":"set",
-    "name":"set evpn_irts",
-    "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_irts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2842.973320007324,
-    "y":412.4386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "3c4bea54.b82856",
+    "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": 2810.999725341797,
+    "y": 448.5155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"f44998d.4f3fe68",
-    "type":"execute",
-    "name":"split evpn_irts",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_irts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_irts\"/>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2871.973320007324,
-    "y":464.4386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "8b9a2579.97c4d8",
+    "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": 2839.999725341797,
+    "y": 500.5155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "e89fb3dc.f76c8",
-        "20275971.a03626"
+        "6faf57d4.2b98a",
+        "39a28639.e8be62"
       ]
     ]
   },
   {
-    "id":"20275971.a03626",
-    "type":"failure",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3088.973320007324,
-    "y":390.4386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "39a28639.e8be62",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3056.999725341797,
+    "y": 426.5155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "bd84905.a254d7"
+        "d250c5a8.c94c48"
       ]
     ]
   },
   {
-    "id":"e89fb3dc.f76c8",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3089.973320007324,
-    "y":456.4386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "6faf57d4.2b98a",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3057.999725341797,
+    "y": 492.5155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "abdc6840.44d668"
+        "1a465074.76a89"
       ]
     ]
   },
   {
-    "id":"abdc6840.44d668",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
-    "comments":"",
-    "x":3270.973320007324,
-    "y":454.4386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "1a465074.76a89",
+    "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": 3238.999725341797,
+    "y": 490.5155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"c11fadfd.a884b",
-    "type":"set",
-    "name":"set evpn_erts",
-    "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_erts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2839.473320007324,
-    "y":554.9387035369873,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "93246b40.56e6f",
+    "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": 2807.499725341797,
+    "y": 591.0156269073486,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"dc99c979.844158",
-    "type":"execute",
-    "name":"split evpn_erts",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_erts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_erts\"/>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2868.473320007324,
-    "y":606.9387035369873,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "1e83de39.311f02",
+    "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": 2836.499725341797,
+    "y": 643.0156269073486,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "c87ef0e2.0309f",
-        "14142012.4a22"
+        "f9ddad4a.598dd",
+        "2c373294.e4fa2e"
       ]
     ]
   },
   {
-    "id":"14142012.4a22",
-    "type":"failure",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3085.473320007324,
-    "y":532.9387035369873,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "2c373294.e4fa2e",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3053.499725341797,
+    "y": 569.0156269073486,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "90413362.f9c78"
+        "20631aad.356246"
       ]
     ]
   },
   {
-    "id":"c87ef0e2.0309f",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3086.473320007324,
-    "y":598.9387035369873,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "f9ddad4a.598dd",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3054.499725341797,
+    "y": 635.0156269073486,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "26998ef1.840202"
+        "52741d12.107614"
       ]
     ]
   },
   {
-    "id":"26998ef1.840202",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
-    "comments":"",
-    "x":3267.473320007324,
-    "y":596.9387035369873,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "52741d12.107614",
+    "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": 3235.499725341797,
+    "y": 633.0156269073486,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"b28306b0.c9d2a8",
-    "type":"block",
-    "name":"block setEvpnErts",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2590.473213195801,
-    "y":516.9387607574463,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "8e66a40c.ada548",
+    "type": "block",
+    "name": "block setEvpnErts",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2558.4996185302734,
+    "y": 553.0156841278076,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "c11fadfd.a884b",
-        "dc99c979.844158"
+        "93246b40.56e6f",
+        "1e83de39.311f02"
       ]
     ]
   },
   {
-    "id":"bd84905.a254d7",
-    "type":"for",
-    "name":"for each evpn_irts",
-    "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_irts_length`' >\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":3291.4734840393066,
-    "y":389.93871307373047,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "d250c5a8.c94c48",
+    "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": 3259.4998893737793,
+    "y": 426.0156364440918,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "71caeb55.d3b804"
+        "45b9f14c.5a8a78"
       ]
     ]
   },
   {
-    "id":"71caeb55.d3b804",
-    "type":"set",
-    "name":"set evpn_irt",
-    "xml":"<set>\n<parameter name='prop.dci-connects.evpn_irts[$idx]' value='`$tmp.dci-connects.evpn_irts[$idx]`' />\n",
-    "comments":"",
-    "x":3503.473976135254,
-    "y":389.9388656616211,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "45b9f14c.5a8a78",
+    "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": 3471.5003814697266,
+    "y": 426.0157890319824,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"90413362.f9c78",
-    "type":"for",
-    "name":"for each evpn_erts",
-    "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_erts_length`' >\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":3284.973320007324,
-    "y":528.9387035369873,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "20631aad.356246",
+    "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": 3252.999725341797,
+    "y": 565.0156269073486,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "d06ccd4c.3f23a"
+        "f124e02f.c76418"
       ]
     ]
   },
   {
-    "id":"d06ccd4c.3f23a",
-    "type":"set",
-    "name":"set evpn_ert",
-    "xml":"<set>\n<parameter name='prop.dci-connects.evpn_erts[$idx]' value='`$tmp.dci-connects.evpn_erts[$idx]`' />\n",
-    "comments":"",
-    "x":3496.9738121032715,
-    "y":528.9388561248779,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "f124e02f.c76418",
+    "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": 3465.000217437744,
+    "y": 565.0157794952393,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"71fe8767.b40368",
-    "type":"set",
-    "name":"set evpn_irts",
-    "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_irts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2855.973320007324,
-    "y":995.438642501831,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "796a7af8.8352e4",
+    "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": 2823.999725341797,
+    "y": 1031.5155658721924,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"d661df7a.c1d68",
-    "type":"execute",
-    "name":"split evpn_irts",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_irts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_irts\"/>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2884.973320007324,
-    "y":1047.438642501831,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "60fc19ba.39f018",
+    "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": 2852.999725341797,
+    "y": 1083.5155658721924,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "f7a12052.b8c45",
-        "ab4bc48f.87e7b8"
+        "e9500a31.e6d9b8",
+        "6c399572.83feec"
       ]
     ]
   },
   {
-    "id":"ab4bc48f.87e7b8",
-    "type":"failure",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3101.973320007324,
-    "y":973.438642501831,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "6c399572.83feec",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3069.999725341797,
+    "y": 1009.5155658721924,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "88094f8e.ff73b"
+        "db50f835.531508"
       ]
     ]
   },
   {
-    "id":"f7a12052.b8c45",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3102.973320007324,
-    "y":1039.438642501831,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "e9500a31.e6d9b8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3070.999725341797,
+    "y": 1075.5155658721924,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "419e1dfe.6a10b4"
+        "344af43b.bbfec4"
       ]
     ]
   },
   {
-    "id":"419e1dfe.6a10b4",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
-    "comments":"",
-    "x":3283.973320007324,
-    "y":1037.438642501831,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "344af43b.bbfec4",
+    "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": 3251.999725341797,
+    "y": 1073.5155658721924,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"57e91416.f44a6c",
-    "type":"set",
-    "name":"set evpn_erts",
-    "xml":"<set>\n<parameter name='tmp.dci-connects.evpn_erts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":2852.473320007324,
-    "y":1137.9386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "a47eee0a.4ca01",
+    "type": "set",
+    "name": "set evpn_erts",
+    "xml": "<set>\n<parameter name='tmp.dci-connects.evpn_erts.original' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 2820.499725341797,
+    "y": 1174.0155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"1ae3a00e.04c3e",
-    "type":"execute",
-    "name":"split evpn_erts",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_erts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_erts\"/>\n",
-    "comments":"",
-    "outputs":1,
-    "x":2881.473320007324,
-    "y":1189.9386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "ccdb12e8.f8f76",
+    "type": "execute",
+    "name": "split evpn_erts",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.dci-connects.evpn_erts.original`'/>\n<parameter name=\"regex\" value=',' />\n<parameter name=\"ctx_memory_result_key\" value=\"tmp.dci-connects.evpn_erts\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2849.499725341797,
+    "y": 1226.0155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "cb3d8975.007e48",
-        "1d9688c3.12e9d7"
+        "15b778b0.8c6747",
+        "1bc5be40.aeed72"
       ]
     ]
   },
   {
-    "id":"1d9688c3.12e9d7",
-    "type":"failure",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3098.473320007324,
-    "y":1115.9386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "1bc5be40.aeed72",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3066.499725341797,
+    "y": 1152.0155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "cc51ae28.32b09"
+        "281922c5.76ef56"
       ]
     ]
   },
   {
-    "id":"cb3d8975.007e48",
-    "type":"failure",
-    "name":"failure",
-    "xml":"<outcome value='failure'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":3099.473320007324,
-    "y":1181.9386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "15b778b0.8c6747",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3067.499725341797,
+    "y": 1218.0155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "1eca56d8.ed2679"
+        "1917da37.456156"
       ]
     ]
   },
   {
-    "id":"1eca56d8.ed2679",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
-    "comments":"",
-    "x":3280.473320007324,
-    "y":1179.9386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "1917da37.456156",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
+    "comments": "",
+    "x": 3248.499725341797,
+    "y": 1216.0155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"88094f8e.ff73b",
-    "type":"for",
-    "name":"for each evpn_irts",
-    "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_irts_length`' >\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":3304.4734840393066,
-    "y":972.9386825561523,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "db50f835.531508",
+    "type": "for",
+    "name": "for each evpn_irts",
+    "xml": "<for index='idx' start='0' end='`$tmp.dci-connects.evpn_irts_length`' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3272.4998893737793,
+    "y": 1009.0156059265137,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "434a8acd.8b0244"
+        "de76e6b5.db4778"
       ]
     ]
   },
   {
-    "id":"434a8acd.8b0244",
-    "type":"set",
-    "name":"set evpn_irt",
-    "xml":"<set>\n<parameter name='prop.dci-connects.evpn_irts[$idx]' value='`$tmp.dci-connects.evpn_irts[$idx]`' />\n",
-    "comments":"",
-    "x":3516.473976135254,
-    "y":972.938835144043,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "de76e6b5.db4778",
+    "type": "set",
+    "name": "set evpn_irt",
+    "xml": "<set>\n<parameter name='prop.dci-connects.evpn_irts[$idx]' value='`$tmp.dci-connects.evpn_irts[$idx]`' />\n",
+    "comments": "",
+    "x": 3484.5003814697266,
+    "y": 1009.0157585144043,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"cc51ae28.32b09",
-    "type":"for",
-    "name":"for each evpn_erts",
-    "xml":"<for index='idx' start='0' end='`$tmp.dci-connects.evpn_erts_length`' >\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":3297.973320007324,
-    "y":1111.9386730194092,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "281922c5.76ef56",
+    "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": 3265.999725341797,
+    "y": 1148.0155963897705,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "7209bbf1.1dd274"
+        "2d79e6ba.6ac452"
       ]
     ]
   },
   {
-    "id":"7209bbf1.1dd274",
-    "type":"set",
-    "name":"set evpn_ert",
-    "xml":"<set>\n<parameter name='prop.dci-connects.evpn_erts[$idx]' value='`$tmp.dci-connects.evpn_erts[$idx]`' />\n",
-    "comments":"",
-    "x":3509.9738121032715,
-    "y":1111.9388256072998,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "2d79e6ba.6ac452",
+    "type": "set",
+    "name": "set evpn_ert",
+    "xml": "<set>\n<parameter name='prop.dci-connects.evpn_erts[$idx]' value='`$tmp.dci-connects.evpn_erts[$idx]`' />\n",
+    "comments": "",
+    "x": 3478.000217437744,
+    "y": 1148.0157489776611,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"36bb1ad6.f67656",
-    "type":"block",
-    "name":"block setEvpnIrts",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2609.973320007324,
-    "y":1044.438642501831,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "e5ced29d.00d08",
+    "type": "block",
+    "name": "block setEvpnIrts",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2577.999725341797,
+    "y": 1080.5155658721924,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "71fe8767.b40368",
-        "d661df7a.c1d68"
+        "796a7af8.8352e4",
+        "60fc19ba.39f018"
       ]
     ]
   },
   {
-    "id":"6259b6ca.196658",
-    "type":"block",
-    "name":"block setEvpnErts",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":2603.473213195801,
-    "y":1099.9387302398682,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "199235cd.b410ca",
+    "type": "block",
+    "name": "block setEvpnErts",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2571.4996185302734,
+    "y": 1136.0156536102295,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "57e91416.f44a6c",
-        "1ae3a00e.04c3e"
+        "a47eee0a.4ca01",
+        "ccdb12e8.f8f76"
       ]
     ]
   },
   {
-    "id":"ff8f139d.0f616",
-    "type":"comment",
-    "name":"TODO",
-    "info":"Get information from VFC team about the A&AI location where name to network mapping will be available.",
-    "comments":"",
-    "x":2584.9735717773438,
-    "y":329.43871879577637,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "243e5ea1.666f7a",
+    "type": "comment",
+    "name": "TODO",
+    "info": "Get information from VFC team about the A&AI location where name to network mapping will be available.",
+    "comments": "",
+    "x": 2552.9999771118164,
+    "y": 365.5156421661377,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"6bda705e.915dc",
-    "type":"comment",
-    "name":"TODO",
-    "info":"Store activated network information in A&AI",
-    "comments":"",
-    "x":741.4735641479492,
-    "y":968.938642501831,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
+    "id": "ab97722c.5d4ce",
+    "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": 1383.1666793823242,
+    "y": 1616.3334283828735,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"9e24c01d.9d49c",
-    "type":"comment",
-    "name":"TODO",
-    "info":"Get information from VFC team about teh A&AI location where name to network mapping will be available.",
-    "comments":"",
-    "x":2571.473320007324,
-    "y":922.438642501831,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
+    "id": "9ef95f17.a0015",
+    "type": "switchNode",
+    "name": "switch service-data.networks_length",
+    "xml": "<switch test='`$service-data.networks.network_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1375.1666946411133,
+    "y": 1686.3334347009659,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      [
+        "43323e6.68001c",
+        "e3dee700.85526"
+      ]
     ]
   },
   {
-    "id":"9653dd40.51b31",
-    "type":"execute",
-    "name":"execute generate-overlay-network-id",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.dci.network-id\"/>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1415.1402740478516,
-    "y":1580.2565050125122,
-    "z":"14477aa.fad1e85",
-    "wires":[
-      [
-
+    "id": "43323e6.68001c",
+    "type": "other",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1648.9762649536133,
+    "y": 1655.2858272790909,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      [
+        "b3ef8065.c2b5f"
+      ]
+    ]
+  },
+  {
+    "id": "e3dee700.85526",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1643.8334426879883,
+    "y": 1701.0001217126846,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      [
+        "4d22c774.611da8"
+      ]
+    ]
+  },
+  {
+    "id": "b3ef8065.c2b5f",
+    "type": "set",
+    "name": "set nidx",
+    "xml": "<set>\n<parameter name='nidx' value='0' />\n",
+    "comments": "",
+    "x": 1801.9762649536133,
+    "y": 1654.8572384119034,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
+  },
+  {
+    "id": "4d22c774.611da8",
+    "type": "set",
+    "name": "set nidx",
+    "xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
+    "comments": "",
+    "x": 1803.4048538208008,
+    "y": 1699.8572994470596,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
+  },
+  {
+    "id": "651071ce.194a2",
+    "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": 1347.1666793823242,
+    "y": 1758.3334369659424,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
+  },
+  {
+    "id": "5c1bffb4.63e308",
+    "type": "block",
+    "name": "block : saveNetworkData",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1043.4999313354492,
+    "y": 1597.6666278839111,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      [
+        "ab97722c.5d4ce",
+        "9ef95f17.a0015",
+        "651071ce.194a2",
+        "9eebec9d.2f3c9"
       ]
     ]
   },
   {
-    "id":"6c49ab69.21e594",
-    "type":"switchNode",
-    "name":"switch service-data.networks_length",
-    "xml":"<switch test='`$service-data.networks.network_length`'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1407.1402893066406,
-    "y":1650.2565113306046,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "9eebec9d.2f3c9",
+    "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": 1379.4999313354492,
+    "y": 1828.0000019073486,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
+  },
+  {
+    "id": "9eb66fb5.27033",
+    "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": 1561.833724975586,
+    "y": 1456.6667127609253,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d334df3b.7e75d8",
+    "type": "comment",
+    "name": "TODO",
+    "info": "Currently activate is done without assignment, later divide in two phases.",
+    "comments": "",
+    "x": 1338.4999313354492,
+    "y": 90.66666603088379,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
+  },
+  {
+    "id": "c4b84815.27de5",
+    "type": "block",
+    "name": "block setLocalNetworks",
+    "xml": "<block atomic=\"true\">\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2561,
+    "y": 960,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      [
+        "fd7ef12a.af13a8",
+        "431dac78.a25634"
+      ]
+    ]
+  },
+  {
+    "id": "fd7ef12a.af13a8",
+    "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": 2764,
+    "y": 895,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
+  },
+  {
+    "id": "431dac78.a25634",
+    "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": 2793,
+    "y": 947,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "4d11657.e59ad9c",
-        "ec09cf68.54011"
+        "b26744aa.5ef5f8",
+        "4f0191d.7bcab7"
       ]
     ]
   },
   {
-    "id":"4d11657.e59ad9c",
-    "type":"other",
-    "name":"Null",
-    "xml":"<outcome value=''>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1680.9498596191406,
-    "y":1619.2089039087296,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "b26744aa.5ef5f8",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2990,
+    "y": 882,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "685d7d02.6e8fe4"
+        "7b77b046.9a18c"
       ]
     ]
   },
   {
-    "id":"ec09cf68.54011",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1675.8070373535156,
-    "y":1664.9231983423233,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "4f0191d.7bcab7",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2991,
+    "y": 948,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "305d55a0.4ef32a"
+        "5dbbe62.d3c5198"
       ]
     ]
   },
   {
-    "id":"685d7d02.6e8fe4",
-    "type":"set",
-    "name":"set nidx",
-    "xml":"<set>\n<parameter name='nidx' value='0' />\n",
-    "comments":"",
-    "x":1833.9498596191406,
-    "y":1618.780315041542,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
-    ]
+    "id": "5dbbe62.d3c5198",
+    "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": 3172,
+    "y": 946,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
   },
   {
-    "id":"305d55a0.4ef32a",
-    "type":"set",
-    "name":"set nidx",
-    "xml":"<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
-    "comments":"",
-    "x":1835.3784484863281,
-    "y":1663.7803760766983,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
+    "id": "7b77b046.9a18c",
+    "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": 3192.5001640319824,
+    "y": 881.5000400543213,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      [
+        "481aa367.49438c"
+      ]
     ]
   },
   {
-    "id":"c180ad49.bc28d",
-    "type":"set",
-    "name":"set network in service-data",
-    "xml":"<set>\n<parameter name=\"service-data.networks.network[$nidx].network-id\" value='`$prop.dci.network-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n<parameter name=\"service-data.networks.network_length\" value='`$nidx+1`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n\n\n",
-    "comments":"",
-    "x":1379.1402740478516,
-    "y":1722.256513595581,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
+    "id": "481aa367.49438c",
+    "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=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $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": 3465,
+    "y": 880,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      [
+        "f9f232d0.230d9",
+        "ec03fafa.3b0368",
+        "9c02da41.94b9a"
+      ]
     ]
   },
   {
-    "id":"180ce8e1.cf4c47",
-    "type":"block",
-    "name":"block : saveNetworkData",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":1075.4735260009766,
-    "y":1561.5897045135498,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "f9f232d0.230d9",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3683.7691192626953,
+    "y": 840.6922347545624,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-        "9653dd40.51b31",
-        "6c49ab69.21e594",
-        "c180ad49.bc28d",
-        "2148a80e.029b58"
+        "a65e1ab.dd1dde8"
       ]
     ]
   },
   {
-    "id":"2148a80e.029b58",
-    "type":"set",
-    "name":"set networkId and network-object-path",
-    "xml":"<set>\n<parameter name='networkId' value='`$prop.dci.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.dci.network-id  + '/network-data/'` \" />",
-    "comments":"",
-    "x":1411.4735260009766,
-    "y":1791.9230785369873,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
+    "id": "ec03fafa.3b0368",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3690.7691192626953,
+    "y": 878.6922347545624,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      [
+        "2c2a4f31.2b7338"
+      ]
     ]
   },
   {
-    "id":"282c5c4c.028af4",
-    "type":"record",
-    "name":"record",
-    "xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"dci-network-topology-operation-activate\"/>\n<parameter name=\"field3\" value=\"dci-connects.name\"/>\n<parameter name=\"field4\" value=\"`$prop.dci-connects.name`\" />\n<parameter name=\"field5\" value=\"dci-connects.id\"/>\n<parameter name=\"field6\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
-    "comments":"",
-    "outputs":1,
-    "x":1593.8073196411133,
-    "y":1420.589789390564,
-    "z":"14477aa.fad1e85",
-    "wires":[
+    "id": "9c02da41.94b9a",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3682.7691192626953,
+    "y": 920.6922347545624,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
       [
-
+        "ae479c4c.16ee9"
       ]
     ]
   },
   {
-    "id":"db894db4.d284f",
-    "type":"comment",
-    "name":"TODO",
-    "info":"Currently activate is done without assignment, later divide in two phases.",
-    "comments":"",
-    "x":1370.4735260009766,
-    "y":54.58974266052246,
-    "z":"14477aa.fad1e85",
-    "wires":[
-
+    "id": "2c2a4f31.2b7338",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3847.7691192626953,
+    "y": 882.6922347545624,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
+  },
+  {
+    "id": "ae479c4c.16ee9",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3840.7691192626953,
+    "y": 929.6922347545624,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
+  },
+  {
+    "id": "a65e1ab.dd1dde8",
+    "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": 3858.2690505981445,
+    "y": 837.1922149658203,
+    "z": "cf1e958c.7fbef8",
+    "wires": []
+  },
+  {
+    "id": "56f7544c.7d9984",
+    "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": 794,
+    "y": 1031,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "168e5d62.705303",
+    "type": "save",
+    "name": "save service relationship in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-id' >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"/network/configurations/configuration\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.dci.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"configuration.configuration-type\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"overlay\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 801,
+    "y": 1113,
+    "z": "cf1e958c.7fbef8",
+    "wires": [
+      []
     ]
   }
-]
\ No newline at end of file
+]
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 c6ec5441..2affc9cd 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,661 +1,626 @@
 [
   {
-    "id":"afc28ff2.d8ea9",
-    "type":"dgstart",
-    "name":"DGSTART",
-    "outputs":1,
-    "x":101.93510437011719,
-    "y":56,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "e6595ced.cd07e",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 93,
+    "y": 105,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "a8585fe8.5793e"
+        "6a3b8941.159818"
       ]
     ]
   },
   {
-    "id":"a8585fe8.5793e",
-    "type":"service-logic",
-    "name":"GENERIC-RESOURCE-API ${project.version}",
-    "module":"GENERIC-RESOURCE-API",
-    "version":"${project.version}",
-    "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":362.9351043701172,
-    "y":127,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "6a3b8941.159818",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "outputs": 1,
+    "x": 354,
+    "y": 176,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "94697b2b.bea8e8"
+        "3be859ad.2be5b6"
       ]
     ]
   },
   {
-    "id":"94697b2b.bea8e8",
-    "type":"method",
-    "name":"method dci-connects-network-topology-operation-deactivate",
-    "xml":"<method rpc='dci-connects-network-topology-operation-deactivate' mode='sync'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":252.9351043701172,
-    "y":212,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "3be859ad.2be5b6",
+    "type": "method",
+    "name": "method dci-connects-network-topology-operation-deactivate",
+    "xml": "<method rpc='dci-connects-network-topology-operation-deactivate' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 244,
+    "y": 261,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "24e4978b.40bb18"
+        "33572f89.f401b"
       ]
     ]
   },
   {
-    "id":"24e4978b.40bb18",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "outputs":1,
-    "x":587.9351196289062,
-    "y":212.00000953674316,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "33572f89.f401b",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 579.0000152587891,
+    "y": 261.00000953674316,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "60e59d5a.4ad384",
-        "9bff20c0.b11cf",
-        "35e712db.b43fee",
-        "6edb8096.c4d1e",
-        "a782fd8c.f34ee"
+        "d0a86103.e51848",
+        "74647967.d19da8",
+        "87f2c3a5.8dd168",
+        "d8b9200b.bee808",
+        "827daee9.fd9758",
+        "1f2fa549.76dec3"
       ]
     ]
   },
   {
-    "id":"60e59d5a.4ad384",
-    "type":"call",
-    "name":"call GENERIC-RESOURCE-API:validate-network-input-parameters",
-    "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":922.9351043701172,
-    "y":81,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "d0a86103.e51848",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:validate-network-input-parameters",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 914,
+    "y": 130,
+    "z": "88fdd57.10ebea8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "74647967.d19da8",
+    "type": "returnSuccess",
+    "name": "return success",
+    "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
+    "comments": "",
+    "x": 788,
+    "y": 1023,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "38788fe5.0d87a",
+    "type": "block",
+    "name": "block : sendRequest",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 975.5000305175781,
+    "y": 604.5156650543213,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-
+        "351a36d5.bb2aba",
+        "a84bd383.c98848",
+        "d1ee1ccb.6ac1e"
       ]
     ]
   },
   {
-    "id":"9bff20c0.b11cf",
-    "type":"returnSuccess",
-    "name":"return success",
-    "xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
-    "comments":"",
-    "x":788.9350814819336,
-    "y":859.9999732971191,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"bb4ced0c.de7b8",
-    "type":"block",
-    "name":"block : sendRequest",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":984.4351348876953,
-    "y":555.5156650543213,
-    "z":"7989b353.45560c",
-    "wires":[
-      [
-        "d1e4e88.126bd18",
-        "bfe084a4.ec1ca8",
-        "d78e26a8.5dd648",
-        "1f1b0399.96268c"
-      ]
-    ]
-  },
-  {
-    "id":"24a23dfb.9014c2",
-    "type":"success",
-    "name":"success",
-    "xml":"<outcome value='success'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1516.9350318908691,
-    "y":352.51519107818604,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "fff41978.9f33",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1507.999927520752,
+    "y": 401.51519107818604,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "4f88ee45.9763"
+        "8722da7b.5697a8"
       ]
     ]
   },
   {
-    "id":"e4d7297.507cad8",
-    "type":"not-found",
-    "name":"not-found",
-    "xml":"<outcome value='not-found'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1523.9350318908691,
-    "y":390.51519107818604,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "d6d9b577.1d5bf8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1514.999927520752,
+    "y": 439.51519107818604,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "30ddc43e.1be0dc"
+        "cdd52bd7.c7dbb8"
       ]
     ]
   },
   {
-    "id":"7ed45316.3f63cc",
-    "type":"other",
-    "name":"other",
-    "xml":"<outcome value='Other'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1515.9350318908691,
-    "y":432.51519107818604,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "2bb0e607.cf37aa",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1506.999927520752,
+    "y": 481.51519107818604,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "f80e7609.f66618"
+        "db4903d.eb23f8"
       ]
     ]
   },
   {
-    "id":"4f88ee45.9763",
-    "type":"block",
-    "name":"block : atomic",
-    "xml":"<block atomic=\"true\">\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1681.9350318908691,
-    "y":341.51519107818604,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "cdd52bd7.c7dbb8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 1671.999927520752,
+    "y": 443.51519107818604,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "db4903d.eb23f8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 1664.999927520752,
+    "y": 490.51519107818604,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "351a36d5.bb2aba",
+    "type": "get-resource",
+    "name": "get-resource esr-thirdparty-sdnc",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1284.000015258789,
+    "y": 448.51519799232483,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-
+        "fff41978.9f33",
+        "d6d9b577.1d5bf8",
+        "2bb0e607.cf37aa"
       ]
     ]
   },
   {
-    "id":"30ddc43e.1be0dc",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-    "comments":"",
-    "x":1680.9350318908691,
-    "y":394.51519107818604,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"f80e7609.f66618",
-    "type":"returnFailure",
-    "name":"return failure",
-    "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-    "comments":"",
-    "x":1673.9350318908691,
-    "y":441.51519107818604,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d1e4e88.126bd18",
-    "type":"get-resource",
-    "name":"get-resource esr-thirdparty-sdnc",
-    "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n",
-    "comments":"",
-    "outputs":1,
-    "x":1292.9351196289062,
-    "y":399.51519799232483,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "8722da7b.5697a8",
+    "type": "set",
+    "name": "set controller data",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n",
+    "comments": "",
+    "x": 1687.4998779296875,
+    "y": 394.01513671875,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "ecb96ba3.5758d",
+    "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",
+    "comments": "",
+    "outputs": 1,
+    "x": 1783.5003051757812,
+    "y": 667.5156202316284,
+    "z": "88fdd57.10ebea8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a84bd383.c98848",
+    "type": "switchNode",
+    "name": "switch tunnelType",
+    "xml": "<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1246.4997634887695,
+    "y": 692.0151309967041,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "24a23dfb.9014c2",
-        "e4d7297.507cad8",
-        "7ed45316.3f63cc"
+        "1b404d3f.38e2eb",
+        "dcb57b7d.8ec64"
       ]
     ]
   },
   {
-    "id":"bfe084a4.ec1ca8",
-    "type":"set",
-    "name":"set controller data",
-    "xml":"<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n\n",
-    "comments":"",
-    "x":1264.434970855713,
-    "y":501.01515221595764,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"4fcdf2bb.86953c",
-    "type":"execute",
-    "name":"execute RestApiCallNode De-Activate Vxlan Tunnel",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1792.4354095458984,
-    "y":618.5156202316284,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "1b404d3f.38e2eb",
+    "type": "outcomeTrue",
+    "name": "L3-DCI",
+    "xml": "<outcome value='L3-DCI'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1459.4998931884766,
+    "y": 672.0151309967041,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-
+        "ecb96ba3.5758d"
       ]
     ]
   },
   {
-    "id":"d78e26a8.5dd648",
-    "type":"switchNode",
-    "name":"switch tunnelType",
-    "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1255.4348678588867,
-    "y":643.0151309967041,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "dcb57b7d.8ec64",
+    "type": "outcomeTrue",
+    "name": "L2-DCI",
+    "xml": "<outcome value='L2-DCI'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1457.499713897705,
+    "y": 744.0151309967041,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "ee3b94c4.136978",
-        "935dfafd.d77e18"
+        "62327707.f218a"
       ]
     ]
   },
   {
-    "id":"ee3b94c4.136978",
-    "type":"outcomeTrue",
-    "name":"L3-DCI",
-    "xml":"<outcome value='L3-DCI'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1468.4349975585938,
-    "y":623.0151309967041,
-    "z":"7989b353.45560c",
-    "wires":[
-      [
-        "4fcdf2bb.86953c"
-      ]
+    "id": "62327707.f218a",
+    "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\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1777.500259399414,
+    "y": 744.5155563354492,
+    "z": "88fdd57.10ebea8",
+    "wires": [
+      []
     ]
   },
   {
-    "id":"935dfafd.d77e18",
-    "type":"outcomeTrue",
-    "name":"L2-DCI",
-    "xml":"<outcome value='L2-DCI'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1466.4348182678223,
-    "y":695.0151309967041,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "4860ee5f.f2017",
+    "type": "for",
+    "name": "for each network-input-parameters",
+    "xml": "<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1037.999984741211,
+    "y": 205.51563167572021,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "b315041d.581508"
+        "ba7fcf57.78acb"
       ]
     ]
   },
   {
-    "id":"b315041d.581508",
-    "type":"execute",
-    "name":"execute RestApiCallNode De-Activate Vxlan Tunnel",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
-    "comments":"",
-    "outputs":1,
-    "x":1786.4353637695312,
-    "y":695.5155563354492,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "d1ee1ccb.6ac1e",
+    "type": "record",
+    "name": "record",
+    "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"dci-network-topology-operation-deactivate\"/>\n<parameter name=\"field3\" value=\"dci-connects.id\" />\n<parameter name=\"field4\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field5\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field6\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
+    "comments": "",
+    "outputs": 1,
+    "x": 1220.333366394043,
+    "y": 624,
+    "z": "88fdd57.10ebea8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ba7fcf57.78acb",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1271.3334274291992,
+    "y": 205.00000762939453,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-
+        "121de4fa.dd7713",
+        "e7af85ba.d512e"
       ]
     ]
   },
   {
-    "id":"df0f7d7d.fb7f7",
-    "type":"for",
-    "name":"for each network-input-parameters",
-    "xml":"<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":1046.9350891113281,
-    "y":156.51563167572021,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "121de4fa.dd7713",
+    "type": "switchNode",
+    "name": "switch site1_id",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1477.6666374206543,
+    "y": 174.00000381469727,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "d4d1f0ce.b7e74"
+        "b3100ed.49466f"
       ]
     ]
   },
   {
-    "id":"1f1b0399.96268c",
-    "type":"record",
-    "name":"record",
-    "xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"dci-network-topology-operation-deactivate\"/>\n<parameter name=\"field3\" value=\"dci-connects.id\" />\n<parameter name=\"field4\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field5\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field6\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
-    "comments":"",
-    "outputs":1,
-    "x":1229.2684707641602,
-    "y":575,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "b3100ed.49466f",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1678.666732788086,
+    "y": 173.00000286102295,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-
+        "7769aa51.22fb2c"
       ]
     ]
   },
   {
-    "id":"d4d1f0ce.b7e74",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1280.2685317993164,
-    "y":156.00000762939453,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "7769aa51.22fb2c",
+    "type": "set",
+    "name": "set id",
+    "xml": "<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1852.3330841064453,
+    "y": 172.66654777526855,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "e7af85ba.d512e",
+    "type": "switchNode",
+    "name": "switch tunnelType",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1487.6667175292969,
+    "y": 227.00000977516174,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "36149500.01f18c",
-        "ba269191.56dc8"
+        "98ab781f.4131f8"
       ]
     ]
   },
   {
-    "id":"36149500.01f18c",
-    "type":"switchNode",
-    "name":"switch site1_id",
-    "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1486.6017417907715,
-    "y":125.00000381469727,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "98ab781f.4131f8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1693.6667175292969,
+    "y": 227.00000977516174,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "acfbd7a0.59b5e8"
+        "ffcfe73.d016818"
       ]
     ]
   },
   {
-    "id":"acfbd7a0.59b5e8",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1687.6018371582031,
-    "y":124.00000286102295,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "ffcfe73.d016818",
+    "type": "set",
+    "name": "set tunnelType",
+    "xml": "<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1862.6668167114258,
+    "y": 227.0000250339508,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "87f2c3a5.8dd168",
+    "type": "block",
+    "name": "block : executeSite1",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 767.3333358764648,
+    "y": 206.66666412353516,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "237ecb59.1d0964"
+        "4860ee5f.f2017",
+        "38788fe5.0d87a"
       ]
     ]
   },
   {
-    "id":"237ecb59.1d0964",
-    "type":"set",
-    "name":"set id",
-    "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1861.2681884765625,
-    "y":123.66654777526855,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"ba269191.56dc8",
-    "type":"switchNode",
-    "name":"switch tunnelType",
-    "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1496.601821899414,
-    "y":178.00000977516174,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "2ffdab13.6ed684",
+    "type": "for",
+    "name": "for each network-input-parameters",
+    "xml": "<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1043.0000686645508,
+    "y": 311.66663551330566,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "6d15d351.7a469c"
+        "b45df97f.e41dd"
       ]
     ]
   },
   {
-    "id":"6d15d351.7a469c",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1702.601821899414,
-    "y":178.00000977516174,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "b45df97f.e41dd",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1271.3334350585938,
+    "y": 314.15101146698,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "330168fb.71c318"
+        "4ec4a4e9.835374"
       ]
     ]
   },
   {
-    "id":"330168fb.71c318",
-    "type":"set",
-    "name":"set tunnelType",
-    "xml":"<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1871.601921081543,
-    "y":178.0000250339508,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"35e712db.b43fee",
-    "type":"block",
-    "name":"block : executeSite1",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":776.268440246582,
-    "y":157.66666412353516,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "4ec4a4e9.835374",
+    "type": "switchNode",
+    "name": "switch site2_id",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1472.3333854675293,
+    "y": 314.15099716186523,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "df0f7d7d.fb7f7",
-        "bb4ced0c.de7b8"
+        "583f59bb.0661c"
       ]
     ]
   },
   {
-    "id":"5b0cba4c.81dcb4",
-    "type":"for",
-    "name":"for each network-input-parameters",
-    "xml":"<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n",
-    "comments":"",
-    "outputs":1,
-    "x":1051.935173034668,
-    "y":262.66663551330566,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "583f59bb.0661c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1673.333480834961,
+    "y": 313.1509962081909,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "2694ce03.b776a2"
+        "5598a85d.318a8"
       ]
     ]
   },
   {
-    "id":"2694ce03.b776a2",
-    "type":"block",
-    "name":"block",
-    "xml":"<block>\n",
-    "atomic":"false",
-    "comments":"",
-    "outputs":1,
-    "x":1280.268539428711,
-    "y":265.15101146698,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "5598a85d.318a8",
+    "type": "set",
+    "name": "set id",
+    "xml": "<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1846.9998321533203,
+    "y": 312.8175411224365,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "d8b9200b.bee808",
+    "type": "block",
+    "name": "block : executeSite1",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 767.3333435058594,
+    "y": 315.8176679611206,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "cdac3e08.6cbf5"
+        "2ffdab13.6ed684",
+        "38788fe5.0d87a"
       ]
     ]
   },
   {
-    "id":"cdac3e08.6cbf5",
-    "type":"switchNode",
-    "name":"switch site2_id",
-    "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
-    "comments":"",
-    "outputs":1,
-    "x":1481.2684898376465,
-    "y":265.15099716186523,
-    "z":"7989b353.45560c",
-    "wires":[
+    "id": "c84ccddc.555998",
+    "type": "set",
+    "name": "set object-path",
+    "xml": "<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/network-topology/'` \" />\n \n",
+    "comments": "",
+    "x": 1082.3373260498047,
+    "y": 836.8607425689697,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "ef0a295c.2add48",
+    "type": "set",
+    "name": "set networkId",
+    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
+    "comments": "",
+    "x": 1076.622959136963,
+    "y": 799.7178506851196,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "827daee9.fd9758",
+    "type": "block",
+    "name": "block : saveNetworkData",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 819.3333969116211,
+    "y": 775.6666917800903,
+    "z": "88fdd57.10ebea8",
+    "wires": [
       [
-        "6bd0e46.d18a11c"
+        "ef0a295c.2add48",
+        "c84ccddc.555998",
+        "11e0aee9.730f31",
+        "6f6203a9.3e25c4"
       ]
     ]
   },
   {
-    "id":"6bd0e46.d18a11c",
-    "type":"outcomeTrue",
-    "name":"true",
-    "xml":"<outcome value='true'>\n",
-    "comments":"",
-    "outputs":1,
-    "x":1682.2685852050781,
-    "y":264.1509962081909,
-    "z":"7989b353.45560c",
-    "wires":[
-      [
-        "aa108b27.c2a0e8"
-      ]
-    ]
-  },
-  {
-    "id":"aa108b27.c2a0e8",
-    "type":"set",
-    "name":"set id",
-    "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
-    "comments":"",
-    "x":1855.9349365234375,
-    "y":263.8175411224365,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"6edb8096.c4d1e",
-    "type":"block",
-    "name":"block : executeSite1",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":776.2684478759766,
-    "y":266.8176679611206,
-    "z":"7989b353.45560c",
-    "wires":[
-      [
-        "5b0cba4c.81dcb4",
-        "bb4ced0c.de7b8"
-      ]
-    ]
-  },
-  {
-    "id":"45699908.a75b98",
-    "type":"set",
-    "name":"set object-path",
-    "xml":"<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/network-topology/'` \" />\n \n",
-    "comments":"",
-    "x":1091.2724304199219,
-    "y":787.8607425689697,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"d2e9c512.6abce8",
-    "type":"set",
-    "name":"set networkId",
-    "xml":"<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
-    "comments":"",
-    "x":1085.55806350708,
-    "y":750.7178506851196,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"a782fd8c.f34ee",
-    "type":"block",
-    "name":"block : saveNetworkData",
-    "xml":"<block atomic=\"true\">",
-    "atomic":"true",
-    "comments":"",
-    "outputs":1,
-    "x":828.2685012817383,
-    "y":726.6666917800903,
-    "z":"7989b353.45560c",
-    "wires":[
-      [
-        "d2e9c512.6abce8",
-        "45699908.a75b98",
-        "50cb404a.13f74",
-        "768af1e8.a21de"
-      ]
-    ]
-  },
-  {
-    "id":"d2714bfd.01d828",
-    "type":"comment",
-    "name":"TODO",
-    "info":"Currently deactivate does deletion too, later divide in two phases.",
-    "comments":"",
-    "x":710.268440246582,
-    "y":20,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"50cb404a.13f74",
-    "type":"set",
-    "name":"copy input to service-data",
-    "xml":"<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n",
-    "comments":"",
-    "x":1121.2685089111328,
-    "y":707.0000038146973,
-    "z":"7989b353.45560c",
-    "wires":[
-
-    ]
-  },
-  {
-    "id":"768af1e8.a21de",
-    "type":"set",
-    "name":"set network-level-oper-status",
-    "xml":"<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Deleted' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
-    "comments":"",
-    "x":1135.268440246582,
-    "y":834.9999618530273,
-    "z":"7989b353.45560c",
-    "wires":[
-
+    "id": "e74b5285.3bfcc8",
+    "type": "comment",
+    "name": "TODO",
+    "info": "Currently deactivate does deletion too, later divide in two phases.",
+    "comments": "",
+    "x": 701.3333358764648,
+    "y": 69,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "11e0aee9.730f31",
+    "type": "set",
+    "name": "copy input to service-data",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n",
+    "comments": "",
+    "x": 1112.3334045410156,
+    "y": 756.0000038146973,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "6f6203a9.3e25c4",
+    "type": "set",
+    "name": "set network-level-oper-status",
+    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Deleted' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
+    "comments": "",
+    "x": 1126.3333358764648,
+    "y": 883.9999618530273,
+    "z": "88fdd57.10ebea8",
+    "wires": []
+  },
+  {
+    "id": "1f2fa549.76dec3",
+    "type": "delete",
+    "name": "delete underlay configuration in AAI",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 856,
+    "y": 943,
+    "z": "88fdd57.10ebea8",
+    "wires": [
+      []
     ]
   }
-]
\ No newline at end of file
+]
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 59ffb6f6..55ff8644 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
@@ -1,373 +1,425 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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}">
-    <method rpc="dci-connects-network-topology-operation-activate" mode="sync">
-        <block atomic="true">
-            <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
-            <block atomic="true">
-                <block atomic="true">
-                    <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
-                        <block>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
-                                <outcome value="true">
-                                    <set>
-                                        <parameter name="prop.dci-connects.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                    </set>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">
-                                <outcome value="true">
-                                    <set>
-                                        <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                    </set>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_description'`">
-                                <outcome value="true">
-                                    <set>
-                                        <parameter name="prop.dci-connects.description" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                    </set>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`">
-                                <outcome value="true" />
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`">
-                                <outcome value="true">
-                                    <set>
-                                        <parameter name="prop.dci-connects.router_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                    </set>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`">
-                                <outcome value="true">
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name="tmp.dci-connects.evpn_irts.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                        </set>
-                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
-                                            <parameter name="original_string" value="`$tmp.dci-connects.evpn_irts.original`" />
-                                            <parameter name="regex" value="," />
-                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.evpn_irts" />
-                                            <outcome value="success">
-                                                <for index="idx" start="0" end="`$tmp.dci-connects.evpn_irts_length`">
-                                                    <set>
-                                                        <parameter name="prop.dci-connects.evpn_irts[$idx]" value="`$tmp.dci-connects.evpn_irts[$idx]`" />
-                                                    </set>
-                                                </for>
-                                            </outcome>
-                                            <outcome value="failure">
-                                                <return status="failure">
-                                                    <parameter name="error-code" value="" />
-                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />
-                                                </return>
-                                            </outcome>
-                                        </execute>
-                                    </block>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`">
-                                <outcome value="true">
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name="tmp.dci-connects.evpn_erts.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                        </set>
-                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
-                                            <parameter name="original_string" value="`$tmp.dci-connects.evpn_erts.original`" />
-                                            <parameter name="regex" value="," />
-                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.evpn_erts" />
-                                            <outcome value="success">
-                                                <for index="idx" start="0" end="`$tmp.dci-connects.evpn_erts_length`">
-                                                    <set>
-                                                        <parameter name="prop.dci-connects.evpn_erts[$idx]" value="`$tmp.dci-connects.evpn_erts[$idx]`" />
-                                                    </set>
-                                                </for>
-                                            </outcome>
-                                            <outcome value="failure">
-                                                <return status="failure">
-                                                    <parameter name="error-code" value="" />
-                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />
-                                                </return>
-                                            </outcome>
-                                        </execute>
-                                    </block>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`">
-                                <outcome value="true">
-                                    <set>
-                                        <parameter name="prop.dci-connects.vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                    </set>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`">
-                                <outcome value="true">
-                                    <set>
-                                        <parameter name="prop.dci-connects.tunnelType" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </block>
-                    </for>
-                    <block atomic="true">
-                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
-                            <outcome value="success">
-                                <block atomic="true" />
-                            </outcome>
-                            <outcome value="not-found">
-                                <return status="failure">
-                                    <parameter name="error-code" value="" />
-                                    <parameter name="error-message" value="" />
-                                </return>
-                            </outcome>
-                            <outcome value="Other">
-                                <return status="failure">
-                                    <parameter name="error-code" value="" />
-                                    <parameter name="error-message" value="" />
-                                </return>
-                            </outcome>
-                        </get-resource>
-                        <set>
-                            <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
-                            <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
-                            <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
-                            <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
-                        </set>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log" />
-                            <parameter name="field1" value="__TIMESTAMP__" />
-                            <parameter name="field2" value="dci-network-topology-operation-activate" />
-                            <parameter name="field3" value="dci-connects.name" />
-                            <parameter name="field4" value="`$prop.dci-connects.name`" />
-                            <parameter name="field5" value="dci-connects.id" />
-                            <parameter name="field6" value="`$prop.dci-connects.id`" />
-                            <parameter name="field7" value="dci-connects.tunnelType" />
-                            <parameter name="field8" value="`$prop.dci-connects.tunnelType`" />
-                            <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
-                            <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
-                        </record>
-                        <switch test="`$prop.dci-connects.tunnelType`">
-                            <outcome value="L3-DCI">
-                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
-                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                    <parameter name="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.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
-                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                    <parameter name="format" value="json" />
-                                    <parameter name="httpMethod" value="post" />
-                                    <parameter name="responsePrefix" value="restapi-result" />
-                                </execute>
-                            </outcome>
-                        </switch>
-                    </block>
-                </block>
-                <block atomic="true">
-                    <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
-                        <block>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`">
-                                <outcome value="true">
-                                    <set>
-                                        <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                    </set>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_description'`">
-                                <outcome value="true">
-                                    <set>
-                                        <parameter name="prop.dci-connects.description" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                    </set>
-                                </outcome>
-                                <outcome value="false">
-                                    <set>
-                                        <parameter name="prop.dci-connects.description" value="" />
-                                    </set>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`">
-                                <outcome value="true" />
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`">
-                                <outcome value="true">
-                                    <set>
-                                        <parameter name="prop.dci-connects.router_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                    </set>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`">
-                                <outcome value="true">
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name="tmp.dci-connects.evpn_irts.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                        </set>
-                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
-                                            <parameter name="original_string" value="`$tmp.dci-connects.evpn_irts.original`" />
-                                            <parameter name="regex" value="," />
-                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.evpn_irts" />
-                                            <outcome value="success">
-                                                <for index="idx" start="0" end="`$tmp.dci-connects.evpn_irts_length`">
-                                                    <set>
-                                                        <parameter name="prop.dci-connects.evpn_irts[$idx]" value="`$tmp.dci-connects.evpn_irts[$idx]`" />
-                                                    </set>
-                                                </for>
-                                            </outcome>
-                                            <outcome value="failure">
-                                                <return status="failure">
-                                                    <parameter name="error-code" value="" />
-                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />
-                                                </return>
-                                            </outcome>
-                                        </execute>
-                                    </block>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_exportRT1'`">
-                                <outcome value="true">
-                                    <block atomic="true">
-                                        <set>
-                                            <parameter name="tmp.dci-connects.evpn_erts.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                        </set>
-                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
-                                            <parameter name="original_string" value="`$tmp.dci-connects.evpn_erts.original`" />
-                                            <parameter name="regex" value="," />
-                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.evpn_erts" />
-                                            <outcome value="success">
-                                                <for index="idx" start="0" end="`$tmp.dci-connects.evpn_erts_length`">
-                                                    <set>
-                                                        <parameter name="prop.dci-connects.evpn_erts[$idx]" value="`$tmp.dci-connects.evpn_erts[$idx]`" />
-                                                    </set>
-                                                </for>
-                                            </outcome>
-                                            <outcome value="failure">
-                                                <return status="failure">
-                                                    <parameter name="error-code" value="" />
-                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />
-                                                </return>
-                                            </outcome>
-                                        </execute>
-                                    </block>
-                                </outcome>
-                            </switch>
-                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`">
-                                <outcome value="true">
-                                    <set>
-                                        <parameter name="prop.dci-connects.vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                                    </set>
-                                </outcome>
-                            </switch>
-                        </block>
-                    </for>
-                    <block atomic="true">
-                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
-                            <outcome value="success">
-                                <block atomic="true" />
-                            </outcome>
-                            <outcome value="not-found">
-                                <return status="failure">
-                                    <parameter name="error-code" value="" />
-                                    <parameter name="error-message" value="" />
-                                </return>
-                            </outcome>
-                            <outcome value="Other">
-                                <return status="failure">
-                                    <parameter name="error-code" value="" />
-                                    <parameter name="error-message" value="" />
-                                </return>
-                            </outcome>
-                        </get-resource>
-                        <set>
-                            <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
-                            <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
-                            <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
-                            <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
-                        </set>
-                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                            <parameter name="logger" value="message-log" />
-                            <parameter name="field1" value="__TIMESTAMP__" />
-                            <parameter name="field2" value="dci-network-topology-operation-activate" />
-                            <parameter name="field3" value="dci-connects.name" />
-                            <parameter name="field4" value="`$prop.dci-connects.name`" />
-                            <parameter name="field5" value="dci-connects.id" />
-                            <parameter name="field6" value="`$prop.dci-connects.id`" />
-                            <parameter name="field7" value="dci-connects.tunnelType" />
-                            <parameter name="field8" value="`$prop.dci-connects.tunnelType`" />
-                            <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
-                            <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
-                        </record>
-                        <switch test="`$prop.dci-connects.tunnelType`">
-                            <outcome value="L3-DCI">
-                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
-                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                    <parameter name="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.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
-                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
-                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
-                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
-                                    <parameter name="format" value="json" />
-                                    <parameter name="httpMethod" value="post" />
-                                    <parameter name="responsePrefix" value="restapi-result" />
-                                </execute>
-                            </outcome>
-                        </switch>
-                    </block>
-                </block>
-                <block atomic="true">
-                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">
-                        <parameter name="ctx-destination" value="prop.dci.network-id" />
-                    </execute>
-                    <switch test="`$service-data.networks.network_length`">
-                        <outcome value="">
-                            <set>
-                                <parameter name="nidx" value="0" />
-                            </set>
-                        </outcome>
-                        <outcome value="Other">
-                            <set>
-                                <parameter name="nidx" value="`$service-data.networks.network_length`" />
-                            </set>
-                        </outcome>
-                    </switch>
-                    <set>
-                        <parameter name="service-data.networks.network[$nidx].network-id" value="`$prop.dci.network-id`" />
-                        <parameter name="service-data.networks.network[$nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />
-                        <parameter name="service-data.networks.network[$nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />
-                        <parameter name="service-data.networks.network[$nidx].network-data.service-information." value="`$network-topology-operation-input.service-information.`" />
-                        <parameter name="service-data.networks.network[$nidx].network-data.network-information." value="`$network-topology-operation-input.network-information.`" />
-                        <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`" />
-                        <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status" value="Created" />
-                        <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`" />
-                        <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action" value="`$network-topology-operation-input.request-information.request-action`" />
-                    </set>
-                    <set>
-                        <parameter name="networkId" value="`$prop.dci.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.dci.network-id  + '/network-data/'` " />
-                    </set>
-                </block>
-            </block>
-            <return status="success">
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
-</service-logic>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<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}">
+    <method rpc="dci-connects-network-topology-operation-activate" mode="sync">
+        <block atomic="true">
+            <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
+            <block atomic="true">
+                <block atomic="true">
+                    <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+                        <block>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.name" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_description'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.description" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_networkName'`">
+                                <outcome value="true" />
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_routerId'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.router_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_importRT1'`">
+                                <outcome value="true">
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name="tmp.dci-connects.evpn_irts.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                        </set>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
+                                            <parameter name="original_string" value="`$tmp.dci-connects.evpn_irts.original`" />
+                                            <parameter name="regex" value="," />
+                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.evpn_irts" />
+                                            <outcome value="success">
+                                                <for index="idx" start="0" end="`$tmp.dci-connects.evpn_irts_length`">
+                                                    <set>
+                                                        <parameter name="prop.dci-connects.evpn_irts[$idx]" value="`$tmp.dci-connects.evpn_irts[$idx]`" />
+                                                    </set>
+                                                </for>
+                                            </outcome>
+                                            <outcome value="failure">
+                                                <return status="failure">
+                                                    <parameter name="error-code" value="" />
+                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />
+                                                </return>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_exportRT1'`">
+                                <outcome value="true">
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name="tmp.dci-connects.evpn_erts.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                        </set>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
+                                            <parameter name="original_string" value="`$tmp.dci-connects.evpn_erts.original`" />
+                                            <parameter name="regex" value="," />
+                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.evpn_erts" />
+                                            <outcome value="success">
+                                                <for index="idx" start="0" end="`$tmp.dci-connects.evpn_erts_length`">
+                                                    <set>
+                                                        <parameter name="prop.dci-connects.evpn_erts[$idx]" value="`$tmp.dci-connects.evpn_erts[$idx]`" />
+                                                    </set>
+                                                </for>
+                                            </outcome>
+                                            <outcome value="failure">
+                                                <return status="failure">
+                                                    <parameter name="error-code" value="" />
+                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />
+                                                </return>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_vni'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.tunnelType" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </for>
+                    <block atomic="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+                            <outcome value="success">
+                                <set>
+                                    <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                    <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
+                                    <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                    <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                </set>
+                            </outcome>
+                            <outcome value="not-found">
+                                <return status="failure">
+                                    <parameter name="error-code" value="" />
+                                    <parameter name="error-message" value="" />
+                                </return>
+                            </outcome>
+                            <outcome value="Other">
+                                <return status="failure">
+                                    <parameter name="error-code" value="" />
+                                    <parameter name="error-message" value="" />
+                                </return>
+                            </outcome>
+                        </get-resource>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                            <parameter name="logger" value="message-log" />
+                            <parameter name="field1" value="__TIMESTAMP__" />
+                            <parameter name="field2" value="dci-network-topology-operation-activate" />
+                            <parameter name="field3" value="dci-connects.name" />
+                            <parameter name="field4" value="`$prop.dci-connects.name`" />
+                            <parameter name="field5" value="dci-connects.id" />
+                            <parameter name="field6" value="`$prop.dci-connects.id`" />
+                            <parameter name="field7" value="dci-connects.tunnelType" />
+                            <parameter name="field8" value="`$prop.dci-connects.tunnelType`" />
+                            <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
+                            <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
+                        </record>
+                        <switch test="`$prop.dci-connects.tunnelType`">
+                            <outcome value="L3-DCI">
+                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                    <parameter name="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.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                    <parameter name="format" value="json" />
+                                    <parameter name="httpMethod" value="post" />
+                                    <parameter name="responsePrefix" value="restapi-result" />
+                                </execute>
+                            </outcome>
+                        </switch>
+                    </block>
+                </block>
+                <block atomic="true">
+                    <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+                        <block>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_description'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.description" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                                <outcome value="false">
+                                    <set>
+                                        <parameter name="prop.dci-connects.description" value="" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_networkName'`">
+                                <outcome value="true">
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name="tmp.dci-connects.local_networks.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                        </set>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
+                                            <parameter name="original_string" value="`$tmp.dci-connects.local_networks.original`" />
+                                            <parameter name="regex" value="," />
+                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.local_networks" />
+                                            <outcome value="success">
+                                                <for index="idx" start="0" end="`$tmp.dci-connects.local_networks_length`">
+                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="l3-network" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.dci-connects.local_networks[$idx] AND         depth = '0'" pfx="tmp.aai.l3-network" local-only="false">
+                                                        <outcome value="success">
+                                                            <set>
+                                                                <parameter name="prop.dci-connects.local_networks[$idx]" value="`$tmp.aai.l3-network.network-id`" />
+                                                            </set>
+                                                        </outcome>
+                                                        <outcome value="not-found">
+                                                            <return status="failure">
+                                                                <parameter name="error-code" value="" />
+                                                                <parameter name="error-message" value="" />
+                                                            </return>
+                                                        </outcome>
+                                                        <outcome value="Other">
+                                                            <return status="failure">
+                                                                <parameter name="error-code" value="" />
+                                                                <parameter name="error-message" value="" />
+                                                            </return>
+                                                        </outcome>
+                                                    </get-resource>
+                                                </for>
+                                            </outcome>
+                                            <outcome value="failure">
+                                                <return status="failure">
+                                                    <parameter name="error-code" value="" />
+                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />
+                                                </return>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_routerId'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.router_id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_importRT1'`">
+                                <outcome value="true">
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name="tmp.dci-connects.evpn_irts.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                        </set>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
+                                            <parameter name="original_string" value="`$tmp.dci-connects.evpn_irts.original`" />
+                                            <parameter name="regex" value="," />
+                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.evpn_irts" />
+                                            <outcome value="success">
+                                                <for index="idx" start="0" end="`$tmp.dci-connects.evpn_irts_length`">
+                                                    <set>
+                                                        <parameter name="prop.dci-connects.evpn_irts[$idx]" value="`$tmp.dci-connects.evpn_irts[$idx]`" />
+                                                    </set>
+                                                </for>
+                                            </outcome>
+                                            <outcome value="failure">
+                                                <return status="failure">
+                                                    <parameter name="error-code" value="" />
+                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />
+                                                </return>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_exportRT1'`">
+                                <outcome value="true">
+                                    <block atomic="true">
+                                        <set>
+                                            <parameter name="tmp.dci-connects.evpn_erts.original" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                        </set>
+                                        <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="split">
+                                            <parameter name="original_string" value="`$tmp.dci-connects.evpn_erts.original`" />
+                                            <parameter name="regex" value="," />
+                                            <parameter name="ctx_memory_result_key" value="tmp.dci-connects.evpn_erts" />
+                                            <outcome value="success">
+                                                <for index="idx" start="0" end="`$tmp.dci-connects.evpn_erts_length`">
+                                                    <set>
+                                                        <parameter name="prop.dci-connects.evpn_erts[$idx]" value="`$tmp.dci-connects.evpn_erts[$idx]`" />
+                                                    </set>
+                                                </for>
+                                            </outcome>
+                                            <outcome value="failure">
+                                                <return status="failure">
+                                                    <parameter name="error-code" value="" />
+                                                    <parameter name="error-message" value="An error occured while splitting sna1_route" />
+                                                </return>
+                                            </outcome>
+                                        </execute>
+                                    </block>
+                                </outcome>
+                            </switch>
+                            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_vni'`">
+                                <outcome value="true">
+                                    <set>
+                                        <parameter name="prop.dci-connects.vni" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                                    </set>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </for>
+                    <block atomic="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+                            <outcome value="success">
+                                <set>
+                                    <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                    <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
+                                    <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                    <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                </set>
+                            </outcome>
+                            <outcome value="not-found">
+                                <return status="failure">
+                                    <parameter name="error-code" value="" />
+                                    <parameter name="error-message" value="" />
+                                </return>
+                            </outcome>
+                            <outcome value="Other">
+                                <return status="failure">
+                                    <parameter name="error-code" value="" />
+                                    <parameter name="error-message" value="" />
+                                </return>
+                            </outcome>
+                        </get-resource>
+                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                            <parameter name="logger" value="message-log" />
+                            <parameter name="field1" value="__TIMESTAMP__" />
+                            <parameter name="field2" value="dci-network-topology-operation-activate" />
+                            <parameter name="field3" value="dci-connects.name" />
+                            <parameter name="field4" value="`$prop.dci-connects.name`" />
+                            <parameter name="field5" value="dci-connects.id" />
+                            <parameter name="field6" value="`$prop.dci-connects.id`" />
+                            <parameter name="field7" value="dci-connects.tunnelType" />
+                            <parameter name="field8" value="`$prop.dci-connects.tunnelType`" />
+                            <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
+                            <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
+                        </record>
+                        <switch test="`$prop.dci-connects.tunnelType`">
+                            <outcome value="L3-DCI">
+                                <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                                    <parameter name="templateFileName" value="`$prop.sdncRestApi.tempDir +'/l3-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l3-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                    <parameter name="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.sdncRestApi.tempDir +'/l2-dci-connects-template.json'`" />
+                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url +'/v2.0/l2-dci-connects'`" />
+                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />
+                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />
+                                    <parameter name="format" value="json" />
+                                    <parameter name="httpMethod" value="post" />
+                                    <parameter name="responsePrefix" value="restapi-result" />
+                                </execute>
+                            </outcome>
+                        </switch>
+                    </block>
+                </block>
+                <block atomic="true">
+                    <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="generateUUID">
+                        <parameter name="ctx-destination" value="prop.dci.network-id" />
+                    </execute>
+                    <switch test="`$service-data.networks.network_length`">
+                        <outcome value="">
+                            <set>
+                                <parameter name="nidx" value="0" />
+                            </set>
+                        </outcome>
+                        <outcome value="Other">
+                            <set>
+                                <parameter name="nidx" value="`$service-data.networks.network_length`" />
+                            </set>
+                        </outcome>
+                    </switch>
+                    <set>
+                        <parameter name="service-data.networks.network[$nidx].network-id" value="`$prop.dci.network-id`" />
+                        <parameter name="service-data.networks.network[$nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />
+                        <parameter name="service-data.networks.network[$nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />
+                        <parameter name="service-data.networks.network[$nidx].network-data.service-information." value="`$network-topology-operation-input.service-information.`" />
+                        <parameter name="service-data.networks.network[$nidx].network-data.network-information." value="`$network-topology-operation-input.network-information.`" />
+                        <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`" />
+                        <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status" value="Created" />
+                        <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`" />
+                        <parameter name="service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action" value="`$network-topology-operation-input.request-information.request-action`" />
+                    </set>
+                    <set>
+                        <parameter name="networkId" value="`$prop.dci.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.dci.network-id  + '/network-data/'` " />
+                    </set>
+                </block>
+            </block>
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $prop.dci.network-id">
+                <parameter name="configuration-id" value="`$prop.dci.network-id`" />
+                <parameter name="configuration-type" value="overlay" />
+                <parameter name="orchestration-status" value="Created" />
+                <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/'` " />
+            </save>
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" key="service-instance.service-instance-id = $service-data.service-information.service-id">
+                <parameter name="relationship-list.relationship[0].related-to" value="configuration" />
+                <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" />
+                <parameter name="error-code" value="200" />
+                <parameter name="error-message" value="`$error-message`" />
+            </return>
+        </block>
+    </method>
+</service-logic>
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 23f67272..251f1b40 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
@@ -1,183 +1,182 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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}">
-   <method rpc="dci-connects-network-topology-operation-deactivate" mode="sync">
-      <block atomic="true">
-         <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
-         <block atomic="true">
-            <for index="idx" start="0" end="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`">
-               <block>
-                  <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">
-                     <outcome value="true">
-                        <set>
-                           <parameter name="prop.dci-connects.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 == 'tunnelType'`">
-                     <outcome value="true">
-                        <set>
-                           <parameter name="prop.dci-connects.tunnelType" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
-                        </set>
-                     </outcome>
-                  </switch>
-               </block>
-            </for>
-            <block atomic="true">
-               <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
-                  <outcome value="success">
-                     <block atomic="true" />
-                  </outcome>
-                  <outcome value="not-found">
-                     <return status="failure">
-                        <parameter name="error-code" value="" />
-                        <parameter name="error-message" value="" />
-                     </return>
-                  </outcome>
-                  <outcome value="Other">
-                     <return status="failure">
-                        <parameter name="error-code" value="" />
-                        <parameter name="error-message" value="" />
-                     </return>
-                  </outcome>
-               </get-resource>
-               <set>
-                  <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
-                  <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
-                  <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
-                  <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
-               </set>
-               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                  <parameter name="logger" value="message-log" />
-                  <parameter name="field1" value="__TIMESTAMP__" />
-                  <parameter name="field2" value="dci-network-topology-operation-deactivate" />
-                  <parameter name="field3" value="dci-connects.id" />
-                  <parameter name="field4" value="`$prop.dci-connects.id`" />
-                  <parameter name="field5" value="dci-connects.tunnelType" />
-                  <parameter name="field6" value="`$prop.dci-connects.tunnelType`" />
-                  <parameter name="field7" value="dci-connects.tunnelType" />
-                  <parameter name="field8" value="`$prop.dci-connects.tunnelType`" />
-                  <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
-                  <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
-               </record>
-               <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" />
-                     </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" />
-                     </execute>
-                  </outcome>
-               </switch>
-            </block>
-         </block>
-         <block atomic="true">
-            <for index="idx" start="0" end="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`">
-               <block>
-                  <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`">
-                     <outcome value="true">
-                        <set>
-                           <parameter name="prop.dci-connects.id" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
-                        </set>
-                     </outcome>
-                  </switch>
-               </block>
-            </for>
-            <block atomic="true">
-               <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
-                  <outcome value="success">
-                     <block atomic="true" />
-                  </outcome>
-                  <outcome value="not-found">
-                     <return status="failure">
-                        <parameter name="error-code" value="" />
-                        <parameter name="error-message" value="" />
-                     </return>
-                  </outcome>
-                  <outcome value="Other">
-                     <return status="failure">
-                        <parameter name="error-code" value="" />
-                        <parameter name="error-message" value="" />
-                     </return>
-                  </outcome>
-               </get-resource>
-               <set>
-                  <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
-                  <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
-                  <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`" />
-                  <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
-               </set>
-               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
-                  <parameter name="logger" value="message-log" />
-                  <parameter name="field1" value="__TIMESTAMP__" />
-                  <parameter name="field2" value="dci-network-topology-operation-deactivate" />
-                  <parameter name="field3" value="dci-connects.id" />
-                  <parameter name="field4" value="`$prop.dci-connects.id`" />
-                  <parameter name="field5" value="dci-connects.tunnelType" />
-                  <parameter name="field6" value="`$prop.dci-connects.tunnelType`" />
-                  <parameter name="field7" value="dci-connects.tunnelType" />
-                  <parameter name="field8" value="`$prop.dci-connects.tunnelType`" />
-                  <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
-                  <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
-               </record>
-               <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" />
-                     </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" />
-                     </execute>
-                  </outcome>
-               </switch>
-            </block>
-         </block>
-         <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/network-topology/'` " />
-            </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>
-         <return status="success">
-            <parameter name="ack-final-indicator" value="Y" />
-            <parameter name="error-code" value="200" />
-            <parameter name="error-message" value="`$error-message`" />
-         </return>
-      </block>
-   </method>
-</service-logic>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<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}">
+   <method rpc="dci-connects-network-topology-operation-deactivate" mode="sync">
+      <block atomic="true">
+         <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
+         <block atomic="true">
+            <for index="idx" start="0" end="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`">
+               <block>
+                  <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">
+                     <outcome value="true">
+                        <set>
+                           <parameter name="prop.dci-connects.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 == 'tunnelType'`">
+                     <outcome value="true">
+                        <set>
+                           <parameter name="prop.dci-connects.tunnelType" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
+                        </set>
+                     </outcome>
+                  </switch>
+               </block>
+            </for>
+            <block atomic="true">
+               <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+                  <outcome value="success">
+                     <set>
+                        <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
+                        <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                        <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                     </set>
+                  </outcome>
+                  <outcome value="not-found">
+                     <return status="failure">
+                        <parameter name="error-code" value="" />
+                        <parameter name="error-message" value="" />
+                     </return>
+                  </outcome>
+                  <outcome value="Other">
+                     <return status="failure">
+                        <parameter name="error-code" value="" />
+                        <parameter name="error-message" value="" />
+                     </return>
+                  </outcome>
+               </get-resource>
+               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                  <parameter name="logger" value="message-log" />
+                  <parameter name="field1" value="__TIMESTAMP__" />
+                  <parameter name="field2" value="dci-network-topology-operation-deactivate" />
+                  <parameter name="field3" value="dci-connects.id" />
+                  <parameter name="field4" value="`$prop.dci-connects.id`" />
+                  <parameter name="field5" value="dci-connects.tunnelType" />
+                  <parameter name="field6" value="`$prop.dci-connects.tunnelType`" />
+                  <parameter name="field7" value="dci-connects.tunnelType" />
+                  <parameter name="field8" value="`$prop.dci-connects.tunnelType`" />
+                  <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
+                  <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
+               </record>
+               <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" />
+                     </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" />
+                     </execute>
+                  </outcome>
+               </switch>
+            </block>
+         </block>
+         <block atomic="true">
+            <for index="idx" start="0" end="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`">
+               <block>
+                  <switch test="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`">
+                     <outcome value="true">
+                        <set>
+                           <parameter name="prop.dci-connects.id" value="`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`" />
+                        </set>
+                     </outcome>
+                  </switch>
+               </block>
+            </for>
+            <block atomic="true">
+               <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+                  <outcome value="success">
+                     <set>
+                        <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
+                        <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                        <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                     </set>
+                  </outcome>
+                  <outcome value="not-found">
+                     <return status="failure">
+                        <parameter name="error-code" value="" />
+                        <parameter name="error-message" value="" />
+                     </return>
+                  </outcome>
+                  <outcome value="Other">
+                     <return status="failure">
+                        <parameter name="error-code" value="" />
+                        <parameter name="error-message" value="" />
+                     </return>
+                  </outcome>
+               </get-resource>
+               <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                  <parameter name="logger" value="message-log" />
+                  <parameter name="field1" value="__TIMESTAMP__" />
+                  <parameter name="field2" value="dci-network-topology-operation-deactivate" />
+                  <parameter name="field3" value="dci-connects.id" />
+                  <parameter name="field4" value="`$prop.dci-connects.id`" />
+                  <parameter name="field5" value="dci-connects.tunnelType" />
+                  <parameter name="field6" value="`$prop.dci-connects.tunnelType`" />
+                  <parameter name="field7" value="dci-connects.tunnelType" />
+                  <parameter name="field8" value="`$prop.dci-connects.tunnelType`" />
+                  <parameter name="field9" value="sdncRestApi.thirdpartySdnc.url" />
+                  <parameter name="field10" value="`$prop.sdncRestApi.thirdpartySdnc.url`" />
+               </record>
+               <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" />
+                     </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" />
+                     </execute>
+                  </outcome>
+               </switch>
+            </block>
+         </block>
+         <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/network-topology/'` " />
+            </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" />
+         <return status="success">
+            <parameter name="ack-final-indicator" value="Y" />
+            <parameter name="error-code" value="200" />
+            <parameter name="error-message" value="`$error-message`" />
+         </return>
+      </block>
+   </method>
+</service-logic>
-- 
cgit 1.2.3-korg