From c14f920415db0de169e0826e0d746cf80757b1f4 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 2 Mar 2022 16:32:14 -0500
Subject: [PATCH] Sending "subscribe" command to a restconf server to receive
 event notifications. Implementing a callback DG to be called by CCSDK upon
 receiving event notifications. Also calling VES to send bandwidth
 information.

Issue-ID: SDNC-1669
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I058c405a14d78e264761367dd4b46d6e9a600182

Former-commit-id: 13b89ec32d7d0074117b3f136800bc93f67bf0f8
---
 .../properties/generic-resource-api-dg.properties  |    4 +
 ...ogy-operation-cll-F1-Activate-w-Protection.json | 2643 ++++-----
 ...cll-vnf-topology-operation-cll-F1-Activate.json | 2639 ++++-----
 ...logy-operation-cll-callbackdg-notification.json |  190 +
 ...-API_cll-vnf-topology-operation-cll-delete.json | 6026 ++++++++++----------
 .../src/main/resources/graph.versions              |    1 +
 ...logy-operation-cll-F1-Activate-w-Protection.xml |   58 +
 ..._cll-vnf-topology-operation-cll-F1-Activate.xml |   98 +-
 ...ology-operation-cll-callbackdg-notification.xml |   62 +
 ...E-API_cll-vnf-topology-operation-cll-delete.xml |   43 +-
 .../src/main/json/cll-call-ves.json                |   34 +
 .../src/main/json/cll-create-pm-data.json          |   17 +
 .../src/main/json/cll-ethernet-service-loop.json   |    3 +-
 .../src/main/json/cll-subscribe-notification.json  |    1 +
 .../src/main/json/cll-terminate-notification.json  |    1 +
 15 files changed, 6230 insertions(+), 5590 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
 create mode 100644 platform-logic/restapi-templates/src/main/json/cll-call-ves.json
 create mode 100644 platform-logic/restapi-templates/src/main/json/cll-create-pm-data.json
 create mode 100644 platform-logic/restapi-templates/src/main/json/cll-subscribe-notification.json
 create mode 100644 platform-logic/restapi-templates/src/main/json/cll-terminate-notification.json

diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index 74c515ff..10b6d670 100644
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -49,6 +49,10 @@ restapi.cll-ethernet-service-loop-protection.templatefile=cll-ethernet-service-l
 restapi.cll-otn-src-domain-creation.templatefile=cll-otn-tunnel-src-domain.json
 restapi.cll-otn-dst-domain-creation.templatefile=cll-otn-tunnel-dst-domain.json
 restapi.cll-otn-domainG-creation.templatefile=cll-otn-tunnel-domainG.json
+restapi.cll-subscribe-notification.templatefile=cll-subscribe-notification.json
+restapi.cll-terminate-notification.templatefile=cll-terminate-notification.json
+restapi.cll-create-pm-data.templatefile=cll-create-pm-data.json
+restapi.cll-call-ves.templatefile=cll-call-ves.json
 restapi.naming.gen-name.templatefile=naming-ms-post-gen-name.json
 restapi.ss.pnf.templatefile=self-serve-pnf-assignments.json
 restapi.ss.vnf.templatefile=self-serve-vnf-assignments.json
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
index 2fdcec43..42f3ac63 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
@@ -1,199 +1,199 @@
 [
   {
-    "id": "61751fea.5e29c",
+    "id": "2c2eaaa6.595c6e",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 309,
-    "y": 328,
-    "z": "b60623c5.e2d9e8",
+    "x": 533.3333129882812,
+    "y": 388.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "9390d80.e27dda8",
-        "a2edd3b5.431178",
-        "d95bcddf.5304c8"
+        "b93bc255.06d818",
+        "e7d58f90.50f7a",
+        "d44dcc0c.074358"
       ]
     ]
   },
   {
-    "id": "9390d80.e27dda8",
+    "id": "b93bc255.06d818",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 497,
-    "y": 341,
-    "z": "b60623c5.e2d9e8",
+    "x": 721.3333129882812,
+    "y": 401.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "122deece.249539"
+        "351735cd.d4c382"
       ]
     ]
   },
   {
-    "id": "a2edd3b5.431178",
+    "id": "e7d58f90.50f7a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 504.4909362792969,
-    "y": 383.57403564453125,
-    "z": "b60623c5.e2d9e8",
+    "x": 728.8242492675781,
+    "y": 443.5740432739258,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "d95bcddf.5304c8",
+    "id": "d44dcc0c.074358",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 495,
-    "y": 430,
-    "z": "b60623c5.e2d9e8",
+    "x": 719.3333129882812,
+    "y": 490.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c3fd03f5.ced1a"
+        "9f7438aa.cfa3f8"
       ]
     ]
   },
   {
-    "id": "122deece.249539",
+    "id": "351735cd.d4c382",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 670,
-    "y": 339,
-    "z": "b60623c5.e2d9e8",
+    "x": 894.3333129882812,
+    "y": 399.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "26858e32.576aa2"
+        "6797a33f.6e9ecc"
       ]
     ]
   },
   {
-    "id": "26858e32.576aa2",
+    "id": "6797a33f.6e9ecc",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 899,
-    "y": 340,
-    "z": "b60623c5.e2d9e8",
+    "x": 1123.3333129882812,
+    "y": 400.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "b9b3eee1.451228"
+        "181a770b.23d341"
       ]
     ]
   },
   {
-    "id": "b9b3eee1.451228",
+    "id": "181a770b.23d341",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1114,
-    "y": 341,
-    "z": "b60623c5.e2d9e8",
+    "x": 1338.3333129882812,
+    "y": 401.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1ab82d5c.a19413"
+        "96414042.e1f2c8"
       ]
     ]
   },
   {
-    "id": "7e7f1310.5e5bcc",
+    "id": "e5c5abf.467ec58",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1368,
-    "y": 263,
-    "z": "b60623c5.e2d9e8",
+    "x": 1592.3333129882812,
+    "y": 323.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "55ca13fd.72ee7c",
-        "6e8bc799.ce2fa8"
+        "71905208.3f5ca4",
+        "3be6bf3.b82124"
       ]
     ]
   },
   {
-    "id": "55ca13fd.72ee7c",
+    "id": "71905208.3f5ca4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1585,
-    "y": 242,
-    "z": "b60623c5.e2d9e8",
+    "x": 1809.3333129882812,
+    "y": 302.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1ab82d5c.a19413"
+        "96414042.e1f2c8"
       ]
     ]
   },
   {
-    "id": "6e8bc799.ce2fa8",
+    "id": "3be6bf3.b82124",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1585,
-    "y": 291,
-    "z": "b60623c5.e2d9e8",
+    "x": 1809.3333129882812,
+    "y": 351.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ab82d5c.a19413",
+    "id": "96414042.e1f2c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1769,
-    "y": 328,
-    "z": "b60623c5.e2d9e8",
+    "x": 1993.3333129882812,
+    "y": 388.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "554ac9a2.79f95",
-        "2ade390a.34dac6",
-        "c0e6872b.6bc578"
+        "95dd5e61.027198",
+        "877d8b16.d3994",
+        "b3333886.2341"
       ]
     ]
   },
   {
-    "id": "c3307b8c.0344e",
+    "id": "884050d1.040518",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 128,
-    "y": 69,
-    "z": "b60623c5.e2d9e8",
+    "x": 352.33331298828125,
+    "y": 129.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7e5b3842.1b2ff"
+        "d4acd14e.d29f88"
       ]
     ]
   },
   {
-    "id": "7e5b3842.1b2ff",
+    "id": "d4acd14e.d29f88",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -201,3650 +201,3695 @@
     "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": 412.2856903076172,
-    "y": 130.23810863494873,
-    "z": "b60623c5.e2d9e8",
+    "x": 636.6190032958984,
+    "y": 190.23811626434326,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "ff8ac0a6.a31ac8"
+        "659111a0.43dcc"
       ]
     ]
   },
   {
-    "id": "ff8ac0a6.a31ac8",
+    "id": "659111a0.43dcc",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-F1-Activate-w-Protection",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate-w-Protection' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 418.42860412597656,
-    "y": 215.00003051757812,
-    "z": "b60623c5.e2d9e8",
+    "x": 642.7619171142578,
+    "y": 275.00003814697266,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "610b4dde.c4293c"
+        "27f31a3d.0f29d6"
       ]
     ]
   },
   {
-    "id": "610b4dde.c4293c",
+    "id": "27f31a3d.0f29d6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 728.238037109375,
-    "y": 206.66668701171875,
-    "z": "b60623c5.e2d9e8",
+    "x": 952.5713500976562,
+    "y": 266.6666946411133,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "61751fea.5e29c",
-        "fda13949.60eb78",
-        "47d2cfff.4a0e4",
-        "8845442c.1d5de8",
-        "72564454.b964f4"
+        "2c2eaaa6.595c6e",
+        "cef7b9ce.1b3ba8",
+        "306cc859.5059d",
+        "5f84eccb.714dcc",
+        "3014f91f.87a3fe"
       ]
     ]
   },
   {
-    "id": "554ac9a2.79f95",
+    "id": "95dd5e61.027198",
     "type": "set",
     "name": "set tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 1986,
-    "y": 266,
-    "z": "b60623c5.e2d9e8",
+    "x": 2210.3333129882812,
+    "y": 326.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "e1c41eb3.6dc5b8",
+    "id": "e5ef1dc.853e7e",
     "type": "set",
     "name": "set attachment_param for OTN A",
     "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
     "comments": "",
-    "x": 4155,
-    "y": 152,
-    "z": "b60623c5.e2d9e8",
+    "x": 4379.333312988281,
+    "y": 212.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "7981558d.d1f29c",
+    "id": "28eb1f3b.b8157",
     "type": "execute",
     "name": "execute RestApiCallNode Create OTN tunnel with token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4236,
-    "y": 467,
-    "z": "b60623c5.e2d9e8",
+    "x": 4460.333312988281,
+    "y": 527.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "4cd7b5eb.5f75fc",
-        "8c7597f3.3a32c"
+        "1f9f84d9.8d553b",
+        "99de3b6c.89af8"
       ]
     ]
   },
   {
-    "id": "4cd7b5eb.5f75fc",
+    "id": "1f9f84d9.8d553b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4545.5,
-    "y": 436,
-    "z": "b60623c5.e2d9e8",
+    "x": 4769.833312988281,
+    "y": 496.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6a15735b.8f38bc"
+        "d7492135.ad5fc8"
       ]
     ]
   },
   {
-    "id": "8c7597f3.3a32c",
+    "id": "99de3b6c.89af8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4550.5,
-    "y": 501,
-    "z": "b60623c5.e2d9e8",
+    "x": 4774.833312988281,
+    "y": 561.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "531c74ae.aa6424"
+        "76880ad0.6601a4"
       ]
     ]
   },
   {
-    "id": "6a15735b.8f38bc",
+    "id": "d7492135.ad5fc8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
     "comments": "",
-    "x": 4721.5,
-    "y": 436,
-    "z": "b60623c5.e2d9e8",
+    "x": 4945.833312988281,
+    "y": 496.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "531c74ae.aa6424",
+    "id": "76880ad0.6601a4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4717,
-    "y": 501,
-    "z": "b60623c5.e2d9e8",
+    "x": 4941.333312988281,
+    "y": 561.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "43cf60a0.0fca68",
+    "id": "faa33d4e.9e9608",
     "type": "set",
     "name": "set sotn_value",
     "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
     "comments": "",
-    "x": 4100.5,
-    "y": 721,
-    "z": "b60623c5.e2d9e8",
+    "x": 4324.833312988281,
+    "y": 781.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1699b103.56f9ff",
+    "id": "2bce125e.cf653e",
     "type": "execute",
     "name": "execute RestApiCallNode Create ethernet Service without token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4254.5,
-    "y": 769,
-    "z": "b60623c5.e2d9e8",
+    "x": 4478.833312988281,
+    "y": 829.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "430829b5.022a48",
-        "ab60153e.89b358"
+        "ca07acfa.a5fa68",
+        "90e419cc.31d64"
       ]
     ]
   },
   {
-    "id": "430829b5.022a48",
+    "id": "ca07acfa.a5fa68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4600,
-    "y": 750,
-    "z": "b60623c5.e2d9e8",
+    "x": 4824.333312988281,
+    "y": 810.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "af17e669.a567c"
+        "4bb3503a.663a88"
       ]
     ]
   },
   {
-    "id": "ab60153e.89b358",
+    "id": "90e419cc.31d64",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4604,
-    "y": 790,
-    "z": "b60623c5.e2d9e8",
+    "x": 4828.333312988281,
+    "y": 850.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "879a181e.1e28f"
+        "d3e50925.f867c"
       ]
     ]
   },
   {
-    "id": "af17e669.a567c",
+    "id": "4bb3503a.663a88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
     "comments": "",
-    "x": 4758,
-    "y": 750,
-    "z": "b60623c5.e2d9e8",
+    "x": 4982.333312988281,
+    "y": 810.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "879a181e.1e28f",
+    "id": "d3e50925.f867c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4761.5,
-    "y": 790,
-    "z": "b60623c5.e2d9e8",
+    "x": 4985.833312988281,
+    "y": 850.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c2dfb11c.b0c48",
-        "18154ac9.e63ffd"
+        "a6019d0e.791c3",
+        "1200fd09.b183c3"
       ]
     ]
   },
   {
-    "id": "c2dfb11c.b0c48",
+    "id": "a6019d0e.791c3",
     "type": "save",
     "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5092,
-    "y": 755,
-    "z": "b60623c5.e2d9e8",
+    "x": 5316.333312988281,
+    "y": 815.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "4bfe8ff3.b5155",
+    "id": "409f8a00.232b48",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
     "comments": "",
-    "x": 4956,
-    "y": 714,
-    "z": "b60623c5.e2d9e8",
+    "x": 5180.333312988281,
+    "y": 774.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "18154ac9.e63ffd",
+    "id": "1200fd09.b183c3",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5019,
-    "y": 801,
-    "z": "b60623c5.e2d9e8",
+    "x": 5243.333312988281,
+    "y": 861.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "be8a4aef.c70ad",
+    "id": "d18efeb6.7196c8",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
     "comments": "",
-    "x": 4093,
-    "y": 200,
-    "z": "b60623c5.e2d9e8",
+    "x": 4317.333312988281,
+    "y": 260.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "c13323e9.9191e8",
+    "id": "3a9d4ff0.831a9",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 4119,
-    "y": 317,
-    "z": "b60623c5.e2d9e8",
+    "x": 4343.333312988281,
+    "y": 377.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fa844cfe.7b9158",
-        "40f7f2e0.45e324",
-        "9ec0d41c.764348"
+        "9519eb20.e7bb98",
+        "5232e91a.5e69a",
+        "d4898e73.a749e8"
       ]
     ]
   },
   {
-    "id": "fa844cfe.7b9158",
+    "id": "9519eb20.e7bb98",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4314.5001220703125,
-    "y": 269,
-    "z": "b60623c5.e2d9e8",
+    "x": 4538.833435058594,
+    "y": 329.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c5cba661.1feb9"
+        "4b08f17b.aadf2"
       ]
     ]
   },
   {
-    "id": "40f7f2e0.45e324",
+    "id": "5232e91a.5e69a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4306.5001220703125,
-    "y": 324,
-    "z": "b60623c5.e2d9e8",
+    "x": 4530.833435058594,
+    "y": 384.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fa86521c.e230b8"
+        "b87b6903.ae28e"
       ]
     ]
   },
   {
-    "id": "c5cba661.1feb9",
+    "id": "4b08f17b.aadf2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4458.8824462890625,
-    "y": 268.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 4683.215759277344,
+    "y": 328.65567779541016,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fff76825.ceb828"
+        "797a34c3.7e821c"
       ]
     ]
   },
   {
-    "id": "12d83cc7.207cc3",
+    "id": "85c5906d.e6a79",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5041,
-    "y": 271,
-    "z": "b60623c5.e2d9e8",
+    "x": 5265.333312988281,
+    "y": 331.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f3a906e6.516618"
+        "937745a8.a82728"
       ]
     ]
   },
   {
-    "id": "fff76825.ceb828",
+    "id": "797a34c3.7e821c",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4643,
-    "y": 267,
-    "z": "b60623c5.e2d9e8",
+    "x": 4867.333312988281,
+    "y": 327.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "8f09ed7e.8205c8"
+        "bb125276.4bcb68"
       ]
     ]
   },
   {
-    "id": "8f09ed7e.8205c8",
+    "id": "bb125276.4bcb68",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4838,
-    "y": 267,
-    "z": "b60623c5.e2d9e8",
+    "x": 5062.333312988281,
+    "y": 327.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "12d83cc7.207cc3"
+        "85c5906d.e6a79"
       ]
     ]
   },
   {
-    "id": "9ec0d41c.764348",
+    "id": "d4898e73.a749e8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4311.5001220703125,
-    "y": 381,
-    "z": "b60623c5.e2d9e8",
+    "x": 4535.833435058594,
+    "y": 441.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "4cb38d5a.2cd9fc"
+        "54ed711f.a7d8c8"
       ]
     ]
   },
   {
-    "id": "4cb38d5a.2cd9fc",
+    "id": "54ed711f.a7d8c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4463.5001220703125,
-    "y": 382,
-    "z": "b60623c5.e2d9e8",
+    "x": 4687.833435058594,
+    "y": 442.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "fa86521c.e230b8",
+    "id": "b87b6903.ae28e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4474.5001220703125,
-    "y": 325,
-    "z": "b60623c5.e2d9e8",
+    "x": 4698.833435058594,
+    "y": 385.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "fd5c650b.7ed3f8",
+    "id": "d6320d33.cae9b",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5426,
-    "y": 284,
-    "z": "b60623c5.e2d9e8",
+    "x": 5650.333312988281,
+    "y": 344.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "11189fd0.36c55",
-        "2f53389c.6ed7",
-        "160dc233.835476"
+        "bdc01a41.5b11d",
+        "19bd6ca2.3b24bb",
+        "3d79a005.c3b89"
       ]
     ]
   },
   {
-    "id": "f3a906e6.516618",
+    "id": "937745a8.a82728",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5220,
-    "y": 271,
-    "z": "b60623c5.e2d9e8",
+    "x": 5444.333312988281,
+    "y": 331.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "8e3bb227.50f04",
-        "fd5c650b.7ed3f8"
+        "624c597d.18779",
+        "d6320d33.cae9b"
       ]
     ]
   },
   {
-    "id": "8e3bb227.50f04",
+    "id": "624c597d.18779",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainA id",
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5456,
-    "y": 232,
-    "z": "b60623c5.e2d9e8",
+    "x": 5680.333312988281,
+    "y": 292.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "11189fd0.36c55",
+    "id": "bdc01a41.5b11d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5636,
-    "y": 275,
-    "z": "b60623c5.e2d9e8",
+    "x": 5860.333312988281,
+    "y": 335.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "aadf27e6.e781b8"
+        "c6702adf.a8a4e8"
       ]
     ]
   },
   {
-    "id": "2f53389c.6ed7",
+    "id": "19bd6ca2.3b24bb",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5628,
-    "y": 330,
-    "z": "b60623c5.e2d9e8",
+    "x": 5852.333312988281,
+    "y": 390.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fd2ad840.4523f"
+        "14b63752.13b4e1"
       ]
     ]
   },
   {
-    "id": "160dc233.835476",
+    "id": "3d79a005.c3b89",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5633,
-    "y": 387,
-    "z": "b60623c5.e2d9e8",
+    "x": 5857.333312988281,
+    "y": 447.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2a94704d.0d4"
+        "52bfc859.8923c8"
       ]
     ]
   },
   {
-    "id": "2a94704d.0d4",
+    "id": "52bfc859.8923c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5785,
-    "y": 388,
-    "z": "b60623c5.e2d9e8",
+    "x": 6009.333312988281,
+    "y": 448.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "fd2ad840.4523f",
+    "id": "14b63752.13b4e1",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5796,
-    "y": 333,
-    "z": "b60623c5.e2d9e8",
+    "x": 6020.333312988281,
+    "y": 393.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "aadf27e6.e781b8",
+    "id": "c6702adf.a8a4e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5780.38232421875,
-    "y": 272.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 6004.715637207031,
+    "y": 332.65567779541016,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "cdb54fc1.4aeb5"
+        "d92f12f8.15c348"
       ]
     ]
   },
   {
-    "id": "cdb54fc1.4aeb5",
+    "id": "d92f12f8.15c348",
     "type": "set",
     "name": "set controller domainA data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5995,
-    "y": 269,
-    "z": "b60623c5.e2d9e8",
+    "x": 6219.333312988281,
+    "y": 329.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "33053457.2cf334",
+    "id": "60926b96.be818c",
     "type": "set",
     "name": "set attachment_param for OTN B",
     "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
     "comments": "",
-    "x": 3562,
-    "y": 1609,
-    "z": "b60623c5.e2d9e8",
+    "x": 3786.3333129882812,
+    "y": 1669.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "4445f35f.408fdc",
+    "id": "c947459e.872f3",
     "type": "execute",
     "name": "execute RestApiCallNode Create OTN tunnel with token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3625,
-    "y": 1938,
-    "z": "b60623c5.e2d9e8",
+    "x": 3849.3333129882812,
+    "y": 1998.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "862258db.691038",
-        "af408a0a.92301"
+        "a1124e38.08b2b8",
+        "626f4392.b77cf4"
       ]
     ]
   },
   {
-    "id": "862258db.691038",
+    "id": "a1124e38.08b2b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3920.5,
-    "y": 1905,
-    "z": "b60623c5.e2d9e8",
+    "x": 4144.833312988281,
+    "y": 1965.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "95d8110a.825b98"
+        "9662ab69.840d68"
       ]
     ]
   },
   {
-    "id": "af408a0a.92301",
+    "id": "626f4392.b77cf4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3925.5,
-    "y": 1970,
-    "z": "b60623c5.e2d9e8",
+    "x": 4149.833312988281,
+    "y": 2030.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "ef7aa326.5032b8"
+        "dc33d36b.4bb068"
       ]
     ]
   },
   {
-    "id": "95d8110a.825b98",
+    "id": "9662ab69.840d68",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
     "comments": "",
-    "x": 4088.5,
-    "y": 1905,
-    "z": "b60623c5.e2d9e8",
+    "x": 4312.833312988281,
+    "y": 1965.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ef7aa326.5032b8",
+    "id": "dc33d36b.4bb068",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4099,
-    "y": 1970,
-    "z": "b60623c5.e2d9e8",
+    "x": 4323.333312988281,
+    "y": 2030.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "f246db35.fbb0b8",
+    "id": "785f8bef.d4b92c",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
     "comments": "",
-    "x": 3501,
-    "y": 1666,
-    "z": "b60623c5.e2d9e8",
+    "x": 3725.3333129882812,
+    "y": 1726.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2f733fde.bfa8d8",
+    "id": "d7561682.896a3",
     "type": "get-resource",
     "name": "get-resource dst pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3521,
-    "y": 1763,
-    "z": "b60623c5.e2d9e8",
+    "x": 3745.3333129882812,
+    "y": 1823.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d82ed114.d26fe",
-        "9b6a74e2.82fcf",
-        "105e680c.d4fe88"
+        "585f4a29.5a089c",
+        "beb39570.8572c",
+        "251a4de6.33c8aa"
       ]
     ]
   },
   {
-    "id": "d82ed114.d26fe",
+    "id": "585f4a29.5a089c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3723.5001220703125,
-    "y": 1716,
-    "z": "b60623c5.e2d9e8",
+    "x": 3947.8334350585938,
+    "y": 1776.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "3d1669ca.d8e9be"
+        "52dfa280.06ea3c"
       ]
     ]
   },
   {
-    "id": "9b6a74e2.82fcf",
+    "id": "beb39570.8572c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3715.5001220703125,
-    "y": 1771,
-    "z": "b60623c5.e2d9e8",
+    "x": 3939.8334350585938,
+    "y": 1831.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "28df2cef.da0a5c"
+        "d9bfad39.7bd668"
       ]
     ]
   },
   {
-    "id": "3d1669ca.d8e9be",
+    "id": "52dfa280.06ea3c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3867.8824462890625,
-    "y": 1713.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 4092.2157592773438,
+    "y": 1773.6556777954102,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "b0c477a0.14b6b8"
+        "3ad5a325.5b1584"
       ]
     ]
   },
   {
-    "id": "b0c477a0.14b6b8",
+    "id": "3ad5a325.5b1584",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4052,
-    "y": 1728,
-    "z": "b60623c5.e2d9e8",
+    "x": 4276.333312988281,
+    "y": 1788.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "e68df009.7524f"
+        "66e3a12c.e2e618"
       ]
     ]
   },
   {
-    "id": "105e680c.d4fe88",
+    "id": "251a4de6.33c8aa",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3720.5001220703125,
-    "y": 1828,
-    "z": "b60623c5.e2d9e8",
+    "x": 3944.8334350585938,
+    "y": 1888.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "3376d063.6334f8"
+        "56e3abe.0b3e154"
       ]
     ]
   },
   {
-    "id": "3376d063.6334f8",
+    "id": "56e3abe.0b3e154",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 3872.5001220703125,
-    "y": 1829,
-    "z": "b60623c5.e2d9e8",
+    "x": 4096.833435058594,
+    "y": 1889.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "28df2cef.da0a5c",
+    "id": "d9bfad39.7bd668",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 3883.5001220703125,
-    "y": 1774,
-    "z": "b60623c5.e2d9e8",
+    "x": 4107.833435058594,
+    "y": 1834.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "86c78b55.020ad8",
+    "id": "b422b9dc.94e76",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4450,
-    "y": 1732,
-    "z": "b60623c5.e2d9e8",
+    "x": 4674.333312988281,
+    "y": 1792.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "de4526ed.169098"
+        "79873b94.5791e4"
       ]
     ]
   },
   {
-    "id": "e68df009.7524f",
+    "id": "66e3a12c.e2e618",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4247,
-    "y": 1728,
-    "z": "b60623c5.e2d9e8",
+    "x": 4471.333312988281,
+    "y": 1788.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "86c78b55.020ad8"
+        "b422b9dc.94e76"
       ]
     ]
   },
   {
-    "id": "bd56a946.09bfc8",
+    "id": "8c738542.45973",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 4835,
-    "y": 1731,
-    "z": "b60623c5.e2d9e8",
+    "x": 5059.333312988281,
+    "y": 1791.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "e62cd9e9.79901",
-        "3835956c.352dfa",
-        "ef4cce16.af464"
+        "bed842bc.70d158",
+        "9fccfde7.5bd058",
+        "42496faf.cc3318"
       ]
     ]
   },
   {
-    "id": "de4526ed.169098",
+    "id": "79873b94.5791e4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4627,
-    "y": 1724,
-    "z": "b60623c5.e2d9e8",
+    "x": 4851.333312988281,
+    "y": 1784.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "84662003.28e938",
-        "bd56a946.09bfc8"
+        "4d8f65c6.26fcac",
+        "8c738542.45973"
       ]
     ]
   },
   {
-    "id": "84662003.28e938",
+    "id": "4d8f65c6.26fcac",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainB id",
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4865,
-    "y": 1679,
-    "z": "b60623c5.e2d9e8",
+    "x": 5089.333312988281,
+    "y": 1739.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2e3a7484.41bcbc",
+    "id": "8a854ad6.1d148",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5194,
-    "y": 1835,
-    "z": "b60623c5.e2d9e8",
+    "x": 5418.333312988281,
+    "y": 1895.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "acb63215.67cbc8",
+    "id": "9b1912ba.26a3f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5205,
-    "y": 1780,
-    "z": "b60623c5.e2d9e8",
+    "x": 5429.333312988281,
+    "y": 1840.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "bb7e5ab5.c4089",
+    "id": "e79aefeb.ae2d8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5189.38232421875,
-    "y": 1719.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 5413.715637207031,
+    "y": 1779.6556777954102,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7c187be.7c53484"
+        "9fa1b8fd.2344f"
       ]
     ]
   },
   {
-    "id": "7c187be.7c53484",
+    "id": "9fa1b8fd.2344f",
     "type": "set",
     "name": "set controller domainB data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5404,
-    "y": 1716,
-    "z": "b60623c5.e2d9e8",
+    "x": 5628.333312988281,
+    "y": 1776.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "e62cd9e9.79901",
+    "id": "bed842bc.70d158",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5045,
-    "y": 1722,
-    "z": "b60623c5.e2d9e8",
+    "x": 5269.333312988281,
+    "y": 1782.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "bb7e5ab5.c4089"
+        "e79aefeb.ae2d8"
       ]
     ]
   },
   {
-    "id": "3835956c.352dfa",
+    "id": "9fccfde7.5bd058",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5037,
-    "y": 1777,
-    "z": "b60623c5.e2d9e8",
+    "x": 5261.333312988281,
+    "y": 1837.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "acb63215.67cbc8"
+        "9b1912ba.26a3f8"
       ]
     ]
   },
   {
-    "id": "ef4cce16.af464",
+    "id": "42496faf.cc3318",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5042,
-    "y": 1834,
-    "z": "b60623c5.e2d9e8",
+    "x": 5266.333312988281,
+    "y": 1894.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2e3a7484.41bcbc"
+        "8a854ad6.1d148"
       ]
     ]
   },
   {
-    "id": "1dc25027.0c33f8",
+    "id": "afc78578.3291",
     "type": "switchNode",
     "name": "switch vpn-binding has dst-access-ltp",
     "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3076,
-    "y": 680,
-    "z": "b60623c5.e2d9e8",
+    "x": 3300.3333129882812,
+    "y": 740.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "22e86b98.d5cd94",
-        "18519633.e9ee92"
+        "44cf1bd6.cdf99c",
+        "619a5ca0.cdbc04"
       ]
     ]
   },
   {
-    "id": "22e86b98.d5cd94",
+    "id": "44cf1bd6.cdf99c",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3290,
-    "y": 717,
-    "z": "b60623c5.e2d9e8",
+    "x": 3514.3333129882812,
+    "y": 777.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d8801466.520d4"
+        "357cc1f0.bc9fae"
       ]
     ]
   },
   {
-    "id": "18519633.e9ee92",
+    "id": "619a5ca0.cdbc04",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3292,
-    "y": 655,
-    "z": "b60623c5.e2d9e8",
+    "x": 3516.3333129882812,
+    "y": 715.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6bc727fb.e5e2c8"
+        "582aaedf.79cf78"
       ]
     ]
   },
   {
-    "id": "d8801466.520d4",
+    "id": "357cc1f0.bc9fae",
     "type": "switchNode",
     "name": "switch vpn-binding has src-access-ltp",
     "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2870,
-    "y": 1960,
-    "z": "b60623c5.e2d9e8",
+    "x": 3094.3333129882812,
+    "y": 2020.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "57adf29e.03275c",
-        "3c463d1c.a1e9ca"
+        "234b26f6.c2476a",
+        "5654d12.c509b3"
       ]
     ]
   },
   {
-    "id": "57adf29e.03275c",
+    "id": "234b26f6.c2476a",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3123,
-    "y": 1994,
-    "z": "b60623c5.e2d9e8",
+    "x": 3347.3333129882812,
+    "y": 2054.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "163451dc.e800ce"
+        "77779b01.5bda2c"
       ]
     ]
   },
   {
-    "id": "3c463d1c.a1e9ca",
+    "id": "5654d12.c509b3",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3123,
-    "y": 1938,
-    "z": "b60623c5.e2d9e8",
+    "x": 3347.3333129882812,
+    "y": 1998.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "72b99bc1.9d63c4"
+        "49e07205.df1904"
       ]
     ]
   },
   {
-    "id": "163451dc.e800ce",
+    "id": "77779b01.5bda2c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3274,
-    "y": 1994,
-    "z": "b60623c5.e2d9e8",
+    "x": 3498.3333129882812,
+    "y": 2054.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2a6d840b.d2c9ec",
+    "id": "fc88d512.b039f8",
     "type": "set",
     "name": "set vpn-bindingA and connectivityA",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
     "comments": "",
-    "x": 4150,
-    "y": 92,
-    "z": "b60623c5.e2d9e8",
+    "x": 4374.333312988281,
+    "y": 152.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "24792ed6.12e172",
+    "id": "6082a62.95d37d8",
     "type": "set",
     "name": "set vpn-bindingB and connectivityB",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
     "comments": "",
-    "x": 3558,
-    "y": 1551,
-    "z": "b60623c5.e2d9e8",
+    "x": 3782.3333129882812,
+    "y": 1611.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "fe0662dd.a80948",
+    "id": "7f468ae0.55d61c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3841,
-    "y": 349,
-    "z": "b60623c5.e2d9e8",
+    "x": 4065.3333129882812,
+    "y": 409.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2a6d840b.d2c9ec",
-        "e1c41eb3.6dc5b8",
-        "be8a4aef.c70ad",
-        "c13323e9.9191e8",
-        "7981558d.d1f29c",
-        "1721d523.151643",
-        "9094f518.043e98",
-        "f54721e.ec69de"
+        "fc88d512.b039f8",
+        "e5ef1dc.853e7e",
+        "d18efeb6.7196c8",
+        "3a9d4ff0.831a9",
+        "28eb1f3b.b8157",
+        "20794036.3e0d98",
+        "5a5b3fd3.939fa",
+        "eb39e6d9.695df8"
       ]
     ]
   },
   {
-    "id": "72b99bc1.9d63c4",
+    "id": "49e07205.df1904",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3274,
-    "y": 1937,
-    "z": "b60623c5.e2d9e8",
+    "x": 3498.3333129882812,
+    "y": 1997.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "24792ed6.12e172",
-        "33053457.2cf334",
-        "f246db35.fbb0b8",
-        "2f733fde.bfa8d8",
-        "4445f35f.408fdc",
-        "7c2a5c1b.45951c",
-        "db1559a9.21dcb8",
-        "64935ddb.b635b4"
+        "6082a62.95d37d8",
+        "60926b96.be818c",
+        "785f8bef.d4b92c",
+        "d7561682.896a3",
+        "c947459e.872f3",
+        "33be6bd8.7ec864",
+        "7832f278.b4880c",
+        "cc8c0809.c4ad6"
       ]
     ]
   },
   {
-    "id": "1ddc6cc6.41baa3",
+    "id": "3bec7c9e.0c31a4",
     "type": "set",
     "name": "set sotn_value",
     "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
     "comments": "",
-    "x": 3512,
-    "y": 2236,
-    "z": "b60623c5.e2d9e8",
+    "x": 3736.3333129882812,
+    "y": 2296.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "88e2026c.753db8",
+    "id": "66e73857.3d0e78",
     "type": "execute",
     "name": "execute RestApiCallNode Create ethernet Service without token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3666,
-    "y": 2284,
-    "z": "b60623c5.e2d9e8",
+    "x": 3890.3333129882812,
+    "y": 2344.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "e41adb3.0072828",
-        "6a4db145.9abb38"
+        "9ba2be1f.f4daf",
+        "1b19ccdb.027f4b"
       ]
     ]
   },
   {
-    "id": "e41adb3.0072828",
+    "id": "9ba2be1f.f4daf",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4011.5,
-    "y": 2265,
-    "z": "b60623c5.e2d9e8",
+    "x": 4235.833312988281,
+    "y": 2325.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "b46428d7.0cf41"
+        "9032db4e.fba99"
       ]
     ]
   },
   {
-    "id": "6a4db145.9abb38",
+    "id": "1b19ccdb.027f4b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4015.5,
-    "y": 2305,
-    "z": "b60623c5.e2d9e8",
+    "x": 4239.833312988281,
+    "y": 2365.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1616e093.24d98f"
+        "2bcc0072.d2bc6"
       ]
     ]
   },
   {
-    "id": "b46428d7.0cf41",
+    "id": "9032db4e.fba99",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
     "comments": "",
-    "x": 4169.5,
-    "y": 2265,
-    "z": "b60623c5.e2d9e8",
+    "x": 4393.833312988281,
+    "y": 2325.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1616e093.24d98f",
+    "id": "2bcc0072.d2bc6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4173,
-    "y": 2305,
-    "z": "b60623c5.e2d9e8",
+    "x": 4397.333312988281,
+    "y": 2365.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f5ad5aa7.4c2ca",
-        "f30a934b.4a146"
+        "45d30eee.bf1db8",
+        "a53e3184.87caf8"
       ]
     ]
   },
   {
-    "id": "f5ad5aa7.4c2ca",
+    "id": "45d30eee.bf1db8",
     "type": "save",
     "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4513,
-    "y": 2304,
-    "z": "b60623c5.e2d9e8",
+    "x": 4737.333312988281,
+    "y": 2364.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "14882444.425ec4",
+    "id": "63d5aebc.7e418",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
     "comments": "",
-    "x": 4371,
-    "y": 2262,
-    "z": "b60623c5.e2d9e8",
+    "x": 4595.333312988281,
+    "y": 2322.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "f30a934b.4a146",
+    "id": "a53e3184.87caf8",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4442,
-    "y": 2353,
-    "z": "b60623c5.e2d9e8",
+    "x": 4666.333312988281,
+    "y": 2413.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "35b5f42.3d7048c",
+    "id": "27db8b21.23f75c",
     "type": "set",
     "name": "set attachment_param (gfp-n) for OTN",
     "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
     "comments": "",
-    "x": 3067,
-    "y": 620,
-    "z": "b60623c5.e2d9e8",
+    "x": 3291.3333129882812,
+    "y": 680.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "672937f1.5c86c",
+    "id": "c22368e1.6b1058",
     "type": "comment",
     "name": "only dst ttp exists. No src",
     "info": "",
     "comments": "",
-    "x": 3662,
-    "y": 306,
-    "z": "b60623c5.e2d9e8",
+    "x": 3886.3333129882812,
+    "y": 366.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "cf6d8000.914ec",
+    "id": "87e2c89e.c92dc",
     "type": "comment",
     "name": "only src ttp exists. No dst",
     "info": "",
     "comments": "",
-    "x": 3219,
-    "y": 1884,
-    "z": "b60623c5.e2d9e8",
+    "x": 3443.3333129882812,
+    "y": 1944.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "6bc727fb.e5e2c8",
+    "id": "582aaedf.79cf78",
     "type": "switchNode",
     "name": "switch vpn-binding has src-access-ltp",
     "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3398,
-    "y": 468,
-    "z": "b60623c5.e2d9e8",
+    "x": 3622.3333129882812,
+    "y": 528.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "16d04d16.35cc13",
-        "81d801a9.0be79"
+        "16dc47d9.553a58",
+        "e13eb694.152348"
       ]
     ]
   },
   {
-    "id": "81d801a9.0be79",
+    "id": "e13eb694.152348",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3640,
-    "y": 1057,
-    "z": "b60623c5.e2d9e8",
+    "x": 3864.3333129882812,
+    "y": 1117.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "87bd1b21.78447"
+        "7db46487.9eca7c"
       ]
     ]
   },
   {
-    "id": "16d04d16.35cc13",
+    "id": "16dc47d9.553a58",
     "type": "outcome",
     "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3634,
-    "y": 348,
-    "z": "b60623c5.e2d9e8",
+    "x": 3858.3333129882812,
+    "y": 408.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fe0662dd.a80948"
+        "7f468ae0.55d61c"
       ]
     ]
   },
   {
-    "id": "87bd1b21.78447",
+    "id": "7db46487.9eca7c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3798,
-    "y": 1056,
-    "z": "b60623c5.e2d9e8",
+    "x": 4022.3333129882812,
+    "y": 1116.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6a4fd43b.29d0a4",
-        "bb732000.b077a",
-        "14bb373f.07c761",
-        "ee3130b2.515378",
-        "25e58429.ad4ee4",
-        "13fd978.b0ce7e9"
+        "27bc6cfd.f882bc",
+        "798042fa.f28ecc",
+        "44029581.1e0294",
+        "2e2e336b.2a2684",
+        "c0302985.1bc5d8",
+        "3bfb4fd1.bca51"
       ]
     ]
   },
   {
-    "id": "bb732000.b077a",
+    "id": "798042fa.f28ecc",
     "type": "set",
     "name": "set attachment_param for OTN G",
     "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
     "comments": "",
-    "x": 4062,
-    "y": 939,
-    "z": "b60623c5.e2d9e8",
+    "x": 4286.333312988281,
+    "y": 999.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "25e58429.ad4ee4",
+    "id": "c0302985.1bc5d8",
     "type": "execute",
     "name": "execute RestApiCallNode Create OTN tunnel with token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4143,
-    "y": 1254,
-    "z": "b60623c5.e2d9e8",
+    "x": 4367.333312988281,
+    "y": 1314.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "69f73464.0e3e8c",
-        "5f37ff67.4bb2f"
+        "cb1eb04b.0a8a5",
+        "c9a4895f.79f59"
       ]
     ]
   },
   {
-    "id": "69f73464.0e3e8c",
+    "id": "cb1eb04b.0a8a5",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4452.5,
-    "y": 1223,
-    "z": "b60623c5.e2d9e8",
+    "x": 4676.833312988281,
+    "y": 1283.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "43cec921.9d623"
+        "5c0ad877.d4666"
       ]
     ]
   },
   {
-    "id": "5f37ff67.4bb2f",
+    "id": "c9a4895f.79f59",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4457.5,
-    "y": 1288,
-    "z": "b60623c5.e2d9e8",
+    "x": 4681.833312988281,
+    "y": 1348.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "a900d0fc.b4f8e"
+        "647a8c60.745274"
       ]
     ]
   },
   {
-    "id": "43cec921.9d623",
+    "id": "5c0ad877.d4666",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
     "comments": "",
-    "x": 4628.5,
-    "y": 1223,
-    "z": "b60623c5.e2d9e8",
+    "x": 4852.833312988281,
+    "y": 1283.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "a900d0fc.b4f8e",
+    "id": "647a8c60.745274",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4624,
-    "y": 1288,
-    "z": "b60623c5.e2d9e8",
+    "x": 4848.333312988281,
+    "y": 1348.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "14bb373f.07c761",
+    "id": "44029581.1e0294",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
     "comments": "",
-    "x": 4000,
-    "y": 987,
-    "z": "b60623c5.e2d9e8",
+    "x": 4224.333312988281,
+    "y": 1047.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ee3130b2.515378",
+    "id": "2e2e336b.2a2684",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 4026,
-    "y": 1104,
-    "z": "b60623c5.e2d9e8",
+    "x": 4250.333312988281,
+    "y": 1164.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7994d48a.ca38a4",
-        "46376621.e31dd8",
-        "662f2070.bc1d4"
+        "aa3dc68a.e420e",
+        "2fd5a39c.e4d124",
+        "be0fb969.9df28"
       ]
     ]
   },
   {
-    "id": "7994d48a.ca38a4",
+    "id": "aa3dc68a.e420e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4221.5001220703125,
-    "y": 1056,
-    "z": "b60623c5.e2d9e8",
+    "x": 4445.833435058594,
+    "y": 1116.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "28f98c5.d17c774"
+        "bee191ec.52168"
       ]
     ]
   },
   {
-    "id": "46376621.e31dd8",
+    "id": "2fd5a39c.e4d124",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4213.5001220703125,
-    "y": 1111,
-    "z": "b60623c5.e2d9e8",
+    "x": 4437.833435058594,
+    "y": 1171.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "b6666e55.258c4"
+        "53b0c593.b44354"
       ]
     ]
   },
   {
-    "id": "28f98c5.d17c774",
+    "id": "bee191ec.52168",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4365.8824462890625,
-    "y": 1055.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 4590.215759277344,
+    "y": 1115.6556777954102,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "abee57b5.2a2df"
+        "41b89aec.8f3b84"
       ]
     ]
   },
   {
-    "id": "abee57b5.2a2df",
+    "id": "41b89aec.8f3b84",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4550,
-    "y": 1054,
-    "z": "b60623c5.e2d9e8",
+    "x": 4774.333312988281,
+    "y": 1114.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "4e7ce11e.d4486"
+        "860e8326.494828"
       ]
     ]
   },
   {
-    "id": "4e7ce11e.d4486",
+    "id": "860e8326.494828",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4745,
-    "y": 1054,
-    "z": "b60623c5.e2d9e8",
+    "x": 4969.333312988281,
+    "y": 1114.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "cd73aa8e.57927"
+        "95d294a2.519858"
       ]
     ]
   },
   {
-    "id": "662f2070.bc1d4",
+    "id": "be0fb969.9df28",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4218.5001220703125,
-    "y": 1168,
-    "z": "b60623c5.e2d9e8",
+    "x": 4442.833435058594,
+    "y": 1228.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "65647ec7.0c6e5"
+        "a6d3daf4.4de778"
       ]
     ]
   },
   {
-    "id": "65647ec7.0c6e5",
+    "id": "a6d3daf4.4de778",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4370.5001220703125,
-    "y": 1169,
-    "z": "b60623c5.e2d9e8",
+    "x": 4594.833435058594,
+    "y": 1229.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "b6666e55.258c4",
+    "id": "53b0c593.b44354",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4381.5001220703125,
-    "y": 1112,
-    "z": "b60623c5.e2d9e8",
+    "x": 4605.833435058594,
+    "y": 1172.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "6a4fd43b.29d0a4",
+    "id": "27bc6cfd.f882bc",
     "type": "set",
     "name": "set vpn-bindingG and connectivityG",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
     "comments": "",
-    "x": 4057,
-    "y": 879,
-    "z": "b60623c5.e2d9e8",
+    "x": 4281.333312988281,
+    "y": 939.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "cd73aa8e.57927",
+    "id": "95d294a2.519858",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4948,
-    "y": 1058,
-    "z": "b60623c5.e2d9e8",
+    "x": 5172.333312988281,
+    "y": 1118.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d2b1d416.053a58"
+        "280af449.de2e3c"
       ]
     ]
   },
   {
-    "id": "66918eb9.ab92e8",
+    "id": "ef3f04cf.8bb518",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5333,
-    "y": 1071,
-    "z": "b60623c5.e2d9e8",
+    "x": 5557.333312988281,
+    "y": 1131.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f8b9a196.010a1",
-        "fd17d420.f985",
-        "40d42743.f42fd8"
+        "31456949.0bd6c6",
+        "ae6ce682.b30c68",
+        "e0e5a782.5ecb88"
       ]
     ]
   },
   {
-    "id": "d2b1d416.053a58",
+    "id": "280af449.de2e3c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5127,
-    "y": 1058,
-    "z": "b60623c5.e2d9e8",
+    "x": 5351.333312988281,
+    "y": 1118.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c71b3067.5066e8",
-        "66918eb9.ab92e8"
+        "7f6c4201.ca3284",
+        "ef3f04cf.8bb518"
       ]
     ]
   },
   {
-    "id": "c71b3067.5066e8",
+    "id": "7f6c4201.ca3284",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainG id",
     "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5363,
-    "y": 1019,
-    "z": "b60623c5.e2d9e8",
+    "x": 5587.333312988281,
+    "y": 1079.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "f8b9a196.010a1",
+    "id": "31456949.0bd6c6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5543,
-    "y": 1062,
-    "z": "b60623c5.e2d9e8",
+    "x": 5767.333312988281,
+    "y": 1122.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "27038b3e.3bcfc4"
+        "37e04a2.a327336"
       ]
     ]
   },
   {
-    "id": "fd17d420.f985",
+    "id": "ae6ce682.b30c68",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5535,
-    "y": 1117,
-    "z": "b60623c5.e2d9e8",
+    "x": 5759.333312988281,
+    "y": 1177.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "967c6c86.0bbb78"
+        "536ede72.dab3b"
       ]
     ]
   },
   {
-    "id": "40d42743.f42fd8",
+    "id": "e0e5a782.5ecb88",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5540,
-    "y": 1174,
-    "z": "b60623c5.e2d9e8",
+    "x": 5764.333312988281,
+    "y": 1234.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "35455e8c.6afe9a"
+        "f46537ce.c9aaa8"
       ]
     ]
   },
   {
-    "id": "35455e8c.6afe9a",
+    "id": "f46537ce.c9aaa8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5692,
-    "y": 1175,
-    "z": "b60623c5.e2d9e8",
+    "x": 5916.333312988281,
+    "y": 1235.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "967c6c86.0bbb78",
+    "id": "536ede72.dab3b",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5703,
-    "y": 1120,
-    "z": "b60623c5.e2d9e8",
+    "x": 5927.333312988281,
+    "y": 1180.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "27038b3e.3bcfc4",
+    "id": "37e04a2.a327336",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5687.38232421875,
-    "y": 1059.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 5911.715637207031,
+    "y": 1119.6556777954102,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "501ec52c.0a5be4"
+        "77189bba.da3f4c"
       ]
     ]
   },
   {
-    "id": "501ec52c.0a5be4",
+    "id": "77189bba.da3f4c",
     "type": "set",
     "name": "set controller domainG data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5902,
-    "y": 1056,
-    "z": "b60623c5.e2d9e8",
+    "x": 6126.333312988281,
+    "y": 1116.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ce5771d5.1db118",
+    "id": "217a8eaf.b5afda",
     "type": "comment",
     "name": "both src and dst exist",
     "info": "",
     "comments": "",
-    "x": 3676,
-    "y": 997,
-    "z": "b60623c5.e2d9e8",
+    "x": 3900.3333129882812,
+    "y": 1057.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2ade390a.34dac6",
+    "id": "877d8b16.d3994",
     "type": "switchNode",
     "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
     "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 2238,
-    "y": 724,
-    "z": "b60623c5.e2d9e8",
+    "x": 2462.3333129882812,
+    "y": 784.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "faa20144.28683",
-        "a3241eaf.e05748"
+        "df6e125e.14274",
+        "fd236e9d.746de"
       ]
     ]
   },
   {
-    "id": "a3241eaf.e05748",
+    "id": "fd236e9d.746de",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2645,
-    "y": 742,
-    "z": "b60623c5.e2d9e8",
+    "x": 2869.3333129882812,
+    "y": 802.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "73c18a9e.ba438c"
+        "a1b579c2.6ca69"
       ]
     ]
   },
   {
-    "id": "faa20144.28683",
+    "id": "df6e125e.14274",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2645,
-    "y": 687,
-    "z": "b60623c5.e2d9e8",
+    "x": 2869.3333129882812,
+    "y": 747.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d5f3133.6f4a0f"
+        "51a6a8ff.40f098"
       ]
     ]
   },
   {
-    "id": "d5f3133.6f4a0f",
+    "id": "51a6a8ff.40f098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2801,
-    "y": 685,
-    "z": "b60623c5.e2d9e8",
+    "x": 3025.3333129882812,
+    "y": 745.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "35b5f42.3d7048c",
-        "1dc25027.0c33f8"
+        "27db8b21.23f75c",
+        "afc78578.3291"
       ]
     ]
   },
   {
-    "id": "73c18a9e.ba438c",
+    "id": "a1b579c2.6ca69",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2778,
-    "y": 743,
-    "z": "b60623c5.e2d9e8",
+    "x": 3002.3333129882812,
+    "y": 803.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "fda13949.60eb78",
+    "id": "cef7b9ce.1b3ba8",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
     "comments": "",
-    "x": 955,
-    "y": 159,
-    "z": "b60623c5.e2d9e8",
+    "x": 1179.3333129882812,
+    "y": 219.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "38085312.8a965c",
+    "id": "bdafe4d.0bce798",
     "type": "comment",
     "name": "CLL new",
     "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
     "comments": "",
-    "x": 4072,
-    "y": 577,
-    "z": "b60623c5.e2d9e8",
+    "x": 4296.333312988281,
+    "y": 637.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1721d523.151643",
+    "id": "20794036.3e0d98",
     "type": "set",
     "name": "set leaf-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",
     "comments": "",
-    "x": 4132,
-    "y": 616,
-    "z": "b60623c5.e2d9e8",
+    "x": 4356.333312988281,
+    "y": 676.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "47d2cfff.4a0e4",
+    "id": "306cc859.5059d",
     "type": "set",
     "name": "unset leaf-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",
     "comments": "",
-    "x": 948,
-    "y": 67,
-    "z": "b60623c5.e2d9e8",
+    "x": 1172.3333129882812,
+    "y": 127.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "be7a05aa.4b83b",
+    "id": "3258d8ff.e890f",
     "type": "comment",
     "name": "CLL new",
     "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
     "comments": "",
-    "x": 3484,
-    "y": 2093,
-    "z": "b60623c5.e2d9e8",
+    "x": 3708.3333129882812,
+    "y": 2153.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "7c2a5c1b.45951c",
+    "id": "33be6bd8.7ec864",
     "type": "set",
     "name": "set root-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",
     "comments": "",
-    "x": 3540,
-    "y": 2142,
-    "z": "b60623c5.e2d9e8",
+    "x": 3764.3333129882812,
+    "y": 2202.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "f179b432.4e819",
+    "id": "7f9af85d.c9b1a",
     "type": "set",
     "name": "unset root-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",
     "comments": "",
-    "x": 948,
-    "y": 106,
-    "z": "b60623c5.e2d9e8",
+    "x": 1172.3333129882812,
+    "y": 166.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "8845442c.1d5de8",
+    "id": "5f84eccb.714dcc",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 979,
-    "y": 207,
-    "z": "b60623c5.e2d9e8",
+    "x": 1203.3333129882812,
+    "y": 267.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "72564454.b964f4",
+    "id": "3014f91f.87a3fe",
     "type": "save",
     "name": "get service-instance from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
     "comments": "",
     "outputs": 1,
-    "x": 189,
-    "y": 682,
-    "z": "b60623c5.e2d9e8",
+    "x": 413.33331298828125,
+    "y": 742.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "130c8849.c68768",
-        "9607da93.a7cfb8",
-        "675a11bf.37e84"
+        "ad3a20d5.f6589",
+        "e51813a.1cc197",
+        "ca637d1.24786"
       ]
     ]
   },
   {
-    "id": "130c8849.c68768",
+    "id": "ad3a20d5.f6589",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 408,
-    "y": 620,
-    "z": "b60623c5.e2d9e8",
+    "x": 632.3333129882812,
+    "y": 680.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "19b84d16.53d643"
+        "5ade52fc.bbf09c"
       ]
     ]
   },
   {
-    "id": "9607da93.a7cfb8",
+    "id": "e51813a.1cc197",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 417.490966796875,
-    "y": 662.5740356445312,
-    "z": "b60623c5.e2d9e8",
+    "x": 641.8242797851562,
+    "y": 722.5740432739258,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "675a11bf.37e84",
+    "id": "ca637d1.24786",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 406,
-    "y": 709,
-    "z": "b60623c5.e2d9e8",
+    "x": 630.3333129882812,
+    "y": 769.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "13e02ffd.705ef8"
+        "67b4863e.f31f1"
       ]
     ]
   },
   {
-    "id": "19b84d16.53d643",
+    "id": "5ade52fc.bbf09c",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 605,
-    "y": 616,
-    "z": "b60623c5.e2d9e8",
+    "x": 829.3333129882812,
+    "y": 676.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "95aa58da.ce0078"
+        "805608ab.1113d"
       ]
     ]
   },
   {
-    "id": "13e02ffd.705ef8",
+    "id": "67b4863e.f31f1",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 575,
-    "y": 710,
-    "z": "b60623c5.e2d9e8",
+    "x": 799.3333129882812,
+    "y": 770.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "95aa58da.ce0078",
+    "id": "805608ab.1113d",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 828.33349609375,
-    "y": 615.9999389648438,
-    "z": "b60623c5.e2d9e8",
+    "x": 1052.6668090820312,
+    "y": 675.9999465942383,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "82937c17.5a3278"
+        "fce88b79.ad9ea"
       ]
     ]
   },
   {
-    "id": "82937c17.5a3278",
+    "id": "fce88b79.ad9ea",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1029.0001335144043,
-    "y": 617.000020980835,
-    "z": "b60623c5.e2d9e8",
+    "x": 1253.3334465026855,
+    "y": 677.0000286102295,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7d4de732.7e236"
+        "324a4f4a.beb9"
       ]
     ]
   },
   {
-    "id": "7d4de732.7e236",
+    "id": "324a4f4a.beb9",
     "type": "save",
     "name": "get connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 159,
-    "y": 879,
-    "z": "b60623c5.e2d9e8",
+    "x": 383.33331298828125,
+    "y": 939.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f6447d51.51534",
-        "d2723085.ef21f",
-        "14bf719a.197f76"
+        "5a7cd799.dd504",
+        "c46ba437.0993",
+        "3526445b.eeea9c"
       ]
     ]
   },
   {
-    "id": "f6447d51.51534",
+    "id": "5a7cd799.dd504",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 367,
-    "y": 843,
-    "z": "b60623c5.e2d9e8",
+    "x": 591.3333129882812,
+    "y": 903.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "93da3cfa.70c248"
+        "63b8bbd2.15c994"
       ]
     ]
   },
   {
-    "id": "d2723085.ef21f",
+    "id": "c46ba437.0993",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 367.490966796875,
-    "y": 888.5740356445312,
-    "z": "b60623c5.e2d9e8",
+    "x": 591.8242797851562,
+    "y": 948.5740432739258,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "14bf719a.197f76",
+    "id": "3526445b.eeea9c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 365,
-    "y": 932,
-    "z": "b60623c5.e2d9e8",
+    "x": 589.3333129882812,
+    "y": 992.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "836041f9.6829f8"
+        "c4b232cc.80b998"
       ]
     ]
   },
   {
-    "id": "836041f9.6829f8",
+    "id": "c4b232cc.80b998",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 534,
-    "y": 933,
-    "z": "b60623c5.e2d9e8",
+    "x": 758.3333129882812,
+    "y": 993.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "a94aa53a.b107d8",
+    "id": "bd0ad7c2.1f4f3",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 506,
-    "y": 1427,
-    "z": "b60623c5.e2d9e8",
+    "x": 730.3333129882812,
+    "y": 1487.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "21c47827.df1568"
+        "fb10f5a.4414808"
       ]
     ]
   },
   {
-    "id": "21c47827.df1568",
+    "id": "fb10f5a.4414808",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 709,
-    "y": 1439,
-    "z": "b60623c5.e2d9e8",
+    "x": 933.3333129882812,
+    "y": 1499.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "18be783b.f07278"
+        "31b4d2c5.66c72e"
       ]
     ]
   },
   {
-    "id": "18be783b.f07278",
+    "id": "31b4d2c5.66c72e",
     "type": "outcome",
     "name": "UNI",
     "xml": "<outcome value='uni'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 875,
-    "y": 1436,
-    "z": "b60623c5.e2d9e8",
+    "x": 1099.3333129882812,
+    "y": 1496.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "11fb7f76.b02469"
+        "d62a4bb8.975ae8"
       ]
     ]
   },
   {
-    "id": "11fb7f76.b02469",
+    "id": "d62a4bb8.975ae8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1036,
-    "y": 1433,
-    "z": "b60623c5.e2d9e8",
+    "x": 1260.3333129882812,
+    "y": 1493.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "47d6d37a.9fb43c",
-        "1c027792.461348",
-        "ea05bf35.5069",
-        "9d31ed5b.d2c91",
-        "23eb7cf4.f6cfdc",
-        "99b18acf.7ec528"
+        "46f537c9.1c8be8",
+        "f8fe77e2.d43ff8",
+        "6a183fad.35ec3",
+        "f7155528.92cd7",
+        "65c7779e.8d1a88",
+        "cccd2695.c600b"
       ]
     ]
   },
   {
-    "id": "1c027792.461348",
+    "id": "f8fe77e2.d43ff8",
     "type": "set",
     "name": "unset tmp.aai.uni",
     "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
     "comments": "",
-    "x": 1242,
-    "y": 1032.9999389648438,
-    "z": "b60623c5.e2d9e8",
+    "x": 1466.3333129882812,
+    "y": 1092.9999465942383,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "47d6d37a.9fb43c",
+    "id": "46f537c9.1c8be8",
     "type": "save",
     "name": "get uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1239,
-    "y": 1077.9999389648438,
-    "z": "b60623c5.e2d9e8",
+    "x": 1463.3333129882812,
+    "y": 1137.9999465942383,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2a120b9c.2b340c",
-        "41aafa7d.002584",
-        "b80f04fd.7f4018"
+        "4e769c0f.1938ec",
+        "3dc6fc35.d186bc",
+        "90b11589.d4f84"
       ]
     ]
   },
   {
-    "id": "41aafa7d.002584",
+    "id": "3dc6fc35.d186bc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1434.490966796875,
-    "y": 1051.5739135742188,
-    "z": "b60623c5.e2d9e8",
+    "x": 1658.8242797851562,
+    "y": 1111.5739212036133,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "b752ad58.1bdf1"
+        "6d117931.940098"
       ]
     ]
   },
   {
-    "id": "b80f04fd.7f4018",
+    "id": "90b11589.d4f84",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1430,
-    "y": 1095.9998779296875,
-    "z": "b60623c5.e2d9e8",
+    "x": 1654.3333129882812,
+    "y": 1155.999885559082,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "81604b65.13211"
+        "f48b55b8.ea1ca8"
       ]
     ]
   },
   {
-    "id": "b752ad58.1bdf1",
+    "id": "6d117931.940098",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1597.0625,
-    "y": 1050.859619140625,
-    "z": "b60623c5.e2d9e8",
+    "x": 1821.3958129882812,
+    "y": 1110.8596267700195,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "81604b65.13211",
+    "id": "f48b55b8.ea1ca8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1598,
-    "y": 1095.9998779296875,
-    "z": "b60623c5.e2d9e8",
+    "x": 1822.3333129882812,
+    "y": 1155.999885559082,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1b5d0889.20238f",
+    "id": "e35ee523.d065b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1600,
-    "y": 1142.9998779296875,
-    "z": "b60623c5.e2d9e8",
+    "x": 1824.3333129882812,
+    "y": 1202.999885559082,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "2a120b9c.2b340c",
+    "id": "4e769c0f.1938ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1431,
-    "y": 1142.9998779296875,
-    "z": "b60623c5.e2d9e8",
+    "x": 1655.3333129882812,
+    "y": 1202.999885559082,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1b5d0889.20238f"
+        "e35ee523.d065b8"
       ]
     ]
   },
   {
-    "id": "450a13df.b4e0a4",
+    "id": "bf815f65.ee4c28",
     "type": "comment",
     "name": "CLL new",
     "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
     "comments": "",
-    "x": 1213,
-    "y": 1664,
-    "z": "b60623c5.e2d9e8",
+    "x": 1437.3333129882812,
+    "y": 1724.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ea05bf35.5069",
+    "id": "6a183fad.35ec3",
     "type": "set",
     "name": "set ethernet-srv-end-points-list array",
     "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
     "comments": "",
-    "x": 1304,
-    "y": 1718,
-    "z": "b60623c5.e2d9e8",
+    "x": 1528.3333129882812,
+    "y": 1778.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "93a880c5.cd0b3",
+    "id": "1ef1fe95.45b2b9",
     "type": "set",
     "name": "unset ethernet-srv-end-points-list",
     "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
     "comments": "",
-    "x": 1980.5,
-    "y": 1131,
-    "z": "b60623c5.e2d9e8",
+    "x": 2204.8333129882812,
+    "y": 1191.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "481f95ef.87ef1c",
+    "id": "dbeb188c.810cc",
     "type": "set",
     "name": "unset ethernet-srv-end-points-list",
     "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
     "comments": "",
-    "x": 1985.5,
-    "y": 1233,
-    "z": "b60623c5.e2d9e8",
+    "x": 2209.8333129882812,
+    "y": 1293.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "c1ad05eb.c84b48",
+    "id": "f8c77435.00d858",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 469,
-    "y": 1683,
-    "z": "b60623c5.e2d9e8",
+    "x": 693.3333129882812,
+    "y": 1743.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7f234491.70b134"
+        "e5d4675a.166ce"
       ]
     ]
   },
   {
-    "id": "7f234491.70b134",
+    "id": "e5d4675a.166ce",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 701,
-    "y": 1682,
-    "z": "b60623c5.e2d9e8",
+    "x": 925.3333129882812,
+    "y": 1742.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c6ba5a66.793238"
+        "a4b4e62.0b9bb18"
       ]
     ]
   },
   {
-    "id": "c6ba5a66.793238",
+    "id": "a4b4e62.0b9bb18",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 913,
-    "y": 1683,
-    "z": "b60623c5.e2d9e8",
+    "x": 1137.3333129882812,
+    "y": 1743.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6ed8d899.fdc1a"
+        "79b56211.8303fc"
       ]
     ]
   },
   {
-    "id": "6ed8d899.fdc1a",
+    "id": "79b56211.8303fc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 169,
-    "y": 1839,
-    "z": "b60623c5.e2d9e8",
+    "x": 393.33331298828125,
+    "y": 1899.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d9421c0f.7a0898",
-        "953702c4.2d79b"
+        "5e413ae2.fc139c",
+        "a0eb6cf6.129b98"
       ]
     ]
   },
   {
-    "id": "953702c4.2d79b",
+    "id": "a0eb6cf6.129b98",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 404,
-    "y": 1826,
-    "z": "b60623c5.e2d9e8",
+    "x": 628.3333129882812,
+    "y": 1886.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "d9421c0f.7a0898",
+    "id": "5e413ae2.fc139c",
     "type": "save",
     "name": "get vpn-binding from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 394,
-    "y": 1887,
-    "z": "b60623c5.e2d9e8",
+    "x": 618.3333129882812,
+    "y": 1947.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "329ab1cc.22fb9e",
-        "864547d3.a6077",
-        "b2aa6219.f09508"
+        "5d519b04.edc364",
+        "44e78fc4.a8de9",
+        "77b9ca42.e1131c"
       ]
     ]
   },
   {
-    "id": "864547d3.a6077",
+    "id": "44e78fc4.a8de9",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 607.490966796875,
-    "y": 1871.5740356445312,
-    "z": "b60623c5.e2d9e8",
+    "x": 831.8242797851562,
+    "y": 1931.5740432739258,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6b83b223.ee9d94"
+        "93fe98b.5489068"
       ]
     ]
   },
   {
-    "id": "b2aa6219.f09508",
+    "id": "77b9ca42.e1131c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 603,
-    "y": 1916,
-    "z": "b60623c5.e2d9e8",
+    "x": 827.3333129882812,
+    "y": 1976.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "4ac70bf0.89675c"
+        "376a9d2f.bd1f52"
       ]
     ]
   },
   {
-    "id": "329ab1cc.22fb9e",
+    "id": "5d519b04.edc364",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 605,
-    "y": 1976,
-    "z": "b60623c5.e2d9e8",
+    "x": 829.3333129882812,
+    "y": 2036.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f02a177d.26c7"
+        "fa4146f3.54f198"
       ]
     ]
   },
   {
-    "id": "6b83b223.ee9d94",
+    "id": "93fe98b.5489068",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 770.0625,
-    "y": 1870.8597412109375,
-    "z": "b60623c5.e2d9e8",
+    "x": 994.3958129882812,
+    "y": 1930.859748840332,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "4ac70bf0.89675c",
+    "id": "376a9d2f.bd1f52",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 771,
-    "y": 1916,
-    "z": "b60623c5.e2d9e8",
+    "x": 995.3333129882812,
+    "y": 1976.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "f02a177d.26c7",
+    "id": "fa4146f3.54f198",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 774,
-    "y": 1975,
-    "z": "b60623c5.e2d9e8",
+    "x": 998.3333129882812,
+    "y": 2035.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fc6eb753.cc314",
-        "6f8a0144.f9e8e8"
+        "ef75e4e3.1f8138",
+        "e2966b29.fc5b38"
       ]
     ]
   },
   {
-    "id": "ace8d395.16f8f8",
+    "id": "572a8f36.0443a",
     "type": "set",
     "name": "set sotn_value",
     "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
     "comments": "",
-    "x": 173,
-    "y": 2474,
-    "z": "b60623c5.e2d9e8",
+    "x": 397.33331298828125,
+    "y": 2534.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "fa159141.96876",
+    "id": "944da194.59bcd",
     "type": "execute",
     "name": "execute RestApiCallNode Create ethernet Service without token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop-protection.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 316,
-    "y": 2534,
-    "z": "b60623c5.e2d9e8",
+    "x": 540.3333129882812,
+    "y": 2594.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "192fb1d6.9d578e",
-        "7d0ee5a8.eae4dc"
+        "d840ad4b.1282a",
+        "89a7b87.1e553c8"
       ]
     ]
   },
   {
-    "id": "192fb1d6.9d578e",
+    "id": "d840ad4b.1282a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 628.5,
-    "y": 2511,
-    "z": "b60623c5.e2d9e8",
+    "x": 852.8333129882812,
+    "y": 2571.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "7d0ee5a8.eae4dc",
+    "id": "89a7b87.1e553c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 632.5,
-    "y": 2551,
-    "z": "b60623c5.e2d9e8",
+    "x": 856.8333129882812,
+    "y": 2611.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "31d10b34.3ac65c"
+        "5d5378bf.137d"
       ]
     ]
   },
   {
-    "id": "7a578c61.6716c4",
+    "id": "9a01795a.7ab4e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
     "comments": "",
-    "x": 808.5,
-    "y": 2515,
-    "z": "b60623c5.e2d9e8",
+    "x": 1032.8333129882812,
+    "y": 2575.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "31d10b34.3ac65c",
+    "id": "5d5378bf.137d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 824,
-    "y": 2569,
-    "z": "b60623c5.e2d9e8",
+    "x": 1048.3333129882812,
+    "y": 2629.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "34d0fee.5345782"
+        "6dbe844a.8a9554",
+        "63370d02.a0670c",
+        "1ca90fe2.261db8",
+        "2ecfa879.64974"
       ]
     ]
   },
   {
-    "id": "e5aa9a1b.90043",
+    "id": "ef77bece.8a7928",
     "type": "save",
     "name": "update vpn-binding resource (aka. OTN ) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1119.5,
-    "y": 2538,
-    "z": "b60623c5.e2d9e8",
+    "x": 1343.8333129882812,
+    "y": 2598.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "dceb8020.64dda",
+    "id": "33e96132.6ee886",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
     "comments": "",
-    "x": 2586.5,
-    "y": 1889,
-    "z": "b60623c5.e2d9e8",
+    "x": 2810.8333129882812,
+    "y": 1949.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "34d0fee.5345782",
+    "id": "6dbe844a.8a9554",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1081.5,
-    "y": 2580,
-    "z": "b60623c5.e2d9e8",
+    "x": 1305.8333129882812,
+    "y": 2640.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "1840e683.b61c39",
+    "id": "c08ad06c.488d4",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
     "comments": "",
-    "x": 1946.5,
-    "y": 1169,
-    "z": "b60623c5.e2d9e8",
+    "x": 2170.8333129882812,
+    "y": 1229.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ebd04ab8.6f009",
+    "id": "2ee2b867.995c6",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
     "comments": "",
-    "x": 1947.5,
-    "y": 1273,
-    "z": "b60623c5.e2d9e8",
+    "x": 2171.8333129882812,
+    "y": 1333.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "9094f518.043e98",
+    "id": "5a5b3fd3.939fa",
     "type": "save",
     "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4241,
-    "y": 530,
-    "z": "b60623c5.e2d9e8",
+    "x": 4465.333312988281,
+    "y": 590.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "13fd978.b0ce7e9",
+    "id": "3bfb4fd1.bca51",
     "type": "save",
     "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4144,
-    "y": 1349,
-    "z": "b60623c5.e2d9e8",
+    "x": 4368.333312988281,
+    "y": 1409.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "db1559a9.21dcb8",
+    "id": "7832f278.b4880c",
     "type": "save",
     "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3638,
-    "y": 2021,
-    "z": "b60623c5.e2d9e8",
+    "x": 3862.3333129882812,
+    "y": 2081.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "93da3cfa.70c248",
+    "id": "63b8bbd2.15c994",
     "type": "switchNode",
     "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",
     "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 739,
-    "y": 829,
-    "z": "b60623c5.e2d9e8",
+    "x": 963.3333129882812,
+    "y": 889.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2c44355c.6d9982",
-        "16b41754.18b639"
+        "a66053fc.e972e8",
+        "286bc10d.0b75fe"
       ]
     ]
   },
   {
-    "id": "2c44355c.6d9982",
+    "id": "a66053fc.e972e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1102,
-    "y": 852,
-    "z": "b60623c5.e2d9e8",
+    "x": 1326.3333129882812,
+    "y": 912.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "58ecddbb.063a6c"
+        "6f304f3b.74dcb"
       ]
     ]
   },
   {
-    "id": "16b41754.18b639",
+    "id": "286bc10d.0b75fe",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1102,
-    "y": 801,
-    "z": "b60623c5.e2d9e8",
+    "x": 1326.3333129882812,
+    "y": 861.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "255e639c.d2ebb4"
+        "bf68aa32.2da6d"
       ]
     ]
   },
   {
-    "id": "58ecddbb.063a6c",
+    "id": "6f304f3b.74dcb",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1258,
-    "y": 850,
-    "z": "b60623c5.e2d9e8",
+    "x": 1482.3333129882812,
+    "y": 910.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "9a61b358.c738d8"
+        "9b8bc380.4fea78"
       ]
     ]
   },
   {
-    "id": "255e639c.d2ebb4",
+    "id": "bf68aa32.2da6d",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1235,
-    "y": 802,
-    "z": "b60623c5.e2d9e8",
+    "x": 1459.3333129882812,
+    "y": 862.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "c0e6872b.6bc578",
+    "id": "b3333886.2341",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 1995,
-    "y": 200,
-    "z": "b60623c5.e2d9e8",
+    "x": 2219.3333129882812,
+    "y": 260.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "64935ddb.b635b4",
+    "id": "cc8c0809.c4ad6",
     "type": "set",
     "name": "set root-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
     "comments": "",
-    "x": 3537,
-    "y": 2181,
-    "z": "b60623c5.e2d9e8",
+    "x": 3761.3333129882812,
+    "y": 2241.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "f54721e.ec69de",
+    "id": "eb39e6d9.695df8",
     "type": "set",
     "name": "set leaf-otn-tunnels-list array",
     "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
     "comments": "",
-    "x": 4127,
-    "y": 654,
-    "z": "b60623c5.e2d9e8",
+    "x": 4351.333312988281,
+    "y": 714.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "9d31ed5b.d2c91",
+    "id": "f7155528.92cd7",
     "type": "set",
     "name": "set ethernet-srv-end-points-list array",
     "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
     "comments": "",
-    "x": 1301,
-    "y": 1760,
-    "z": "b60623c5.e2d9e8",
+    "x": 1525.3333129882812,
+    "y": 1820.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "7af36070.5c1af",
+    "id": "7ad9431e.95fd94",
     "type": "set",
     "name": "set filename",
     "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
     "comments": "",
-    "x": 480,
-    "y": 1494,
-    "z": "b60623c5.e2d9e8",
+    "x": 704.3333129882812,
+    "y": 1554.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2d8e3cc1.bb010c",
+    "id": "da906021.6570a8",
     "type": "execute",
     "name": "execute printContext",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 511,
-    "y": 1534,
-    "z": "b60623c5.e2d9e8",
+    "x": 735.3333129882812,
+    "y": 1594.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "fc6eb753.cc314",
+    "id": "ef75e4e3.1f8138",
     "type": "set",
     "name": "set otn-tunnels-name-list array",
     "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",
     "comments": "",
-    "x": 1059,
-    "y": 1942,
-    "z": "b60623c5.e2d9e8",
+    "x": 1283.3333129882812,
+    "y": 2002.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "6f8a0144.f9e8e8",
+    "id": "e2966b29.fc5b38",
     "type": "set",
     "name": "set otn-tunnels-name-list array",
     "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
     "comments": "",
-    "x": 1062,
-    "y": 1984,
-    "z": "b60623c5.e2d9e8",
+    "x": 1286.3333129882812,
+    "y": 2044.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1e5bd700.d21b81",
+    "id": "64010c53.9fe67c",
     "type": "set",
     "name": "unset otn-tunnels-name-list array",
     "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",
     "comments": "",
-    "x": 505,
-    "y": 1624,
-    "z": "b60623c5.e2d9e8",
+    "x": 729.3333129882812,
+    "y": 1684.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "144b407f.200e78",
+    "id": "d5a25879.5481b8",
     "type": "set",
     "name": "set filename",
     "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
     "comments": "",
-    "x": 260,
-    "y": 2003,
-    "z": "b60623c5.e2d9e8",
+    "x": 484.33331298828125,
+    "y": 2063.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "76785af4.e022ac",
+    "id": "7aac81ec.ba7cc8",
     "type": "execute",
     "name": "execute printContext",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 268,
-    "y": 2060,
-    "z": "b60623c5.e2d9e8",
+    "x": 492.33331298828125,
+    "y": 2120.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "23eb7cf4.f6cfdc",
+    "id": "65c7779e.8d1a88",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1279,
-    "y": 1609,
-    "z": "b60623c5.e2d9e8",
+    "x": 1503.3333129882812,
+    "y": 1669.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "779a259e.64832c",
-        "277a0a61.75069e"
+        "2c5e4010.43e508",
+        "e3644437.55d698"
       ]
     ]
   },
   {
-    "id": "277a0a61.75069e",
+    "id": "e3644437.55d698",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1502,
-    "y": 1564,
-    "z": "b60623c5.e2d9e8",
+    "x": 1726.3333129882812,
+    "y": 1624.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "21f0cc68.0dd77c"
+        "63f336a7.fff6b"
       ]
     ]
   },
   {
-    "id": "779a259e.64832c",
+    "id": "2c5e4010.43e508",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1504,
-    "y": 1628,
-    "z": "b60623c5.e2d9e8",
+    "x": 1728.3333129882812,
+    "y": 1688.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "db13af98.99768"
+        "2fd3ce09.17bf12"
       ]
     ]
   },
   {
-    "id": "21f0cc68.0dd77c",
+    "id": "63f336a7.fff6b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1667,
-    "y": 1561,
-    "z": "b60623c5.e2d9e8",
+    "x": 1891.3333129882812,
+    "y": 1621.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "ec997076.0ceb28"
+        "185277bc.64228"
       ]
     ]
   },
   {
-    "id": "db13af98.99768",
+    "id": "2fd3ce09.17bf12",
     "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": 1666,
-    "y": 1624,
-    "z": "b60623c5.e2d9e8",
+    "x": 1890.3333129882812,
+    "y": 1684.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "ec997076.0ceb28",
+    "id": "185277bc.64228",
     "type": "set",
     "name": "set tmp.uni-node-id-short",
     "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",
     "comments": "",
-    "x": 1887,
-    "y": 1575,
-    "z": "b60623c5.e2d9e8",
+    "x": 2111.3333129882812,
+    "y": 1635.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2341ba90.ed99d6",
+    "id": "f4fd995d.61939",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1432,
-    "y": 2300,
-    "z": "b60623c5.e2d9e8",
+    "x": 1656.3333129882812,
+    "y": 2360.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "35e4a68.098365a"
+        "3bd70d03.1cae1a"
       ]
     ]
   },
   {
-    "id": "701770f6.4dd0f8",
+    "id": "fea4d7d8.17bf48",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 1817,
-    "y": 2313,
-    "z": "b60623c5.e2d9e8",
+    "x": 2041.3333129882812,
+    "y": 2373.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "d75e7467.a58a4",
-        "74ab773b.95bd78",
-        "df0b8ca4.cd7bb8"
+        "753e6379.2f2664",
+        "3a690bb3.5501f4",
+        "105362f3.9957cd"
       ]
     ]
   },
   {
-    "id": "35e4a68.098365a",
+    "id": "3bd70d03.1cae1a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1611,
-    "y": 2300,
-    "z": "b60623c5.e2d9e8",
+    "x": 1835.3333129882812,
+    "y": 2360.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "fa1aec8.0f5319",
-        "701770f6.4dd0f8"
+        "3086e43a.76dc2c",
+        "fea4d7d8.17bf48"
       ]
     ]
   },
   {
-    "id": "fa1aec8.0f5319",
+    "id": "3086e43a.76dc2c",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainConn id",
     "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 1847,
-    "y": 2261,
-    "z": "b60623c5.e2d9e8",
+    "x": 2071.3333129882812,
+    "y": 2321.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "d75e7467.a58a4",
+    "id": "753e6379.2f2664",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2027,
-    "y": 2304,
-    "z": "b60623c5.e2d9e8",
+    "x": 2251.3333129882812,
+    "y": 2364.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1ccfad18.1b3fa3"
+        "57e3082b.ec85c"
       ]
     ]
   },
   {
-    "id": "74ab773b.95bd78",
+    "id": "3a690bb3.5501f4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2019,
-    "y": 2359,
-    "z": "b60623c5.e2d9e8",
+    "x": 2243.3333129882812,
+    "y": 2419.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2692af0.8253f52"
+        "e1967348.adb6a"
       ]
     ]
   },
   {
-    "id": "df0b8ca4.cd7bb8",
+    "id": "105362f3.9957cd",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2024,
-    "y": 2416,
-    "z": "b60623c5.e2d9e8",
+    "x": 2248.3333129882812,
+    "y": 2476.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f048da7.b1469a8"
+        "9b464363.d7abc"
       ]
     ]
   },
   {
-    "id": "f048da7.b1469a8",
+    "id": "9b464363.d7abc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 2176,
-    "y": 2417,
-    "z": "b60623c5.e2d9e8",
+    "x": 2400.3333129882812,
+    "y": 2477.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "2692af0.8253f52",
+    "id": "e1967348.adb6a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 2187,
-    "y": 2362,
-    "z": "b60623c5.e2d9e8",
+    "x": 2411.3333129882812,
+    "y": 2422.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "1ccfad18.1b3fa3",
+    "id": "57e3082b.ec85c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 2171.38232421875,
-    "y": 2301.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 2395.7156372070312,
+    "y": 2361.65567779541,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "64610343.e61854"
+        "a2d4cc4c.5835f"
       ]
     ]
   },
   {
-    "id": "64610343.e61854",
+    "id": "a2d4cc4c.5835f",
     "type": "set",
     "name": "set controller domainConn data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 2386,
-    "y": 2298,
-    "z": "b60623c5.e2d9e8",
+    "x": 2610.3333129882812,
+    "y": 2358.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "d3c52589.f54e9",
+    "id": "77651854.67a228",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 510,
-    "y": 2346,
-    "z": "b60623c5.e2d9e8",
+    "x": 734.3333129882812,
+    "y": 2406.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "f189c3f1.d69a28",
-        "4452e7a9.eaf9c8",
-        "77af657c.107d34"
+        "8b371429.94e21",
+        "ddb97aef.ff9618",
+        "6bdf8533.ac0744"
       ]
     ]
   },
   {
-    "id": "f189c3f1.d69a28",
+    "id": "8b371429.94e21",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 705.5001220703125,
-    "y": 2298,
-    "z": "b60623c5.e2d9e8",
+    "x": 929.8334350585938,
+    "y": 2358.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "47b3661c.a1e7d8"
+        "86408567.50b5f8"
       ]
     ]
   },
   {
-    "id": "4452e7a9.eaf9c8",
+    "id": "ddb97aef.ff9618",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 697.5001220703125,
-    "y": 2353,
-    "z": "b60623c5.e2d9e8",
+    "x": 921.8334350585938,
+    "y": 2413.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "34198ba3.49ea3c"
+        "83d0fe92.92a8c"
       ]
     ]
   },
   {
-    "id": "47b3661c.a1e7d8",
+    "id": "86408567.50b5f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 849.8824462890625,
-    "y": 2297.6556701660156,
-    "z": "b60623c5.e2d9e8",
+    "x": 1074.2157592773438,
+    "y": 2357.65567779541,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "cd5c4879.eeeaf"
+        "206c1f26.03baa8"
       ]
     ]
   },
   {
-    "id": "cd5c4879.eeeaf",
+    "id": "206c1f26.03baa8",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1034,
-    "y": 2296,
-    "z": "b60623c5.e2d9e8",
+    "x": 1258.3333129882812,
+    "y": 2356.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7bf74b1f.d5837c"
+        "604358eb.cf3bc"
       ]
     ]
   },
   {
-    "id": "7bf74b1f.d5837c",
+    "id": "604358eb.cf3bc",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1229,
-    "y": 2296,
-    "z": "b60623c5.e2d9e8",
+    "x": 1453.3333129882812,
+    "y": 2356.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "2341ba90.ed99d6"
+        "f4fd995d.61939"
       ]
     ]
   },
   {
-    "id": "77af657c.107d34",
+    "id": "6bdf8533.ac0744",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 702.5001220703125,
-    "y": 2410,
-    "z": "b60623c5.e2d9e8",
+    "x": 926.8334350585938,
+    "y": 2470.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "6c7ae4ee.17c334"
+        "843f6d1c.7ee9c"
       ]
     ]
   },
   {
-    "id": "6c7ae4ee.17c334",
+    "id": "843f6d1c.7ee9c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 854.5001220703125,
-    "y": 2411,
-    "z": "b60623c5.e2d9e8",
+    "x": 1078.8334350585938,
+    "y": 2471.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "34198ba3.49ea3c",
+    "id": "83d0fe92.92a8c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 865.5001220703125,
-    "y": 2354,
-    "z": "b60623c5.e2d9e8",
+    "x": 1089.8334350585938,
+    "y": 2414.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "303a4e11.243e7a",
+    "id": "7e37f686.4b31c8",
     "type": "set",
     "name": "set tmp.pnf-name-forUrl",
     "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
     "comments": "",
-    "x": 500,
-    "y": 2258,
-    "z": "b60623c5.e2d9e8",
+    "x": 724.3333129882812,
+    "y": 2318.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "c718737.8cca71",
+    "id": "c0f06a3d.8ad7f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 245,
-    "y": 2389,
-    "z": "b60623c5.e2d9e8",
+    "x": 469.33331298828125,
+    "y": 2449.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "303a4e11.243e7a",
-        "d3c52589.f54e9"
+        "7e37f686.4b31c8",
+        "77651854.67a228"
       ]
     ]
   },
   {
-    "id": "72622933.417d18",
+    "id": "7e8f5942.82fe9",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 1459.9666748046875,
-    "y": 206.88333129882812,
-    "z": "b60623c5.e2d9e8",
+    "x": 1684.2999877929688,
+    "y": 266.88333892822266,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "c3fd03f5.ced1a",
+    "id": "9f7438aa.cfa3f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 662,
-    "y": 429,
-    "z": "b60623c5.e2d9e8",
+    "x": 886.3333129882812,
+    "y": 489.00000762939453,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "c72dabdd.dd1b58",
+    "id": "4162fe05.2b911",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 221.5,
-    "y": 1398,
-    "z": "b60623c5.e2d9e8",
+    "x": 445.83331298828125,
+    "y": 1458.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "a94aa53a.b107d8",
-        "c1ad05eb.c84b48",
-        "7af36070.5c1af",
-        "2d8e3cc1.bb010c",
-        "ace8d395.16f8f8",
-        "fa159141.96876",
-        "1e5bd700.d21b81",
-        "144b407f.200e78",
-        "76785af4.e022ac",
-        "c718737.8cca71",
-        "eca312ef.b3f488"
+        "bd0ad7c2.1f4f3",
+        "f8c77435.00d858",
+        "7ad9431e.95fd94",
+        "da906021.6570a8",
+        "572a8f36.0443a",
+        "944da194.59bcd",
+        "64010c53.9fe67c",
+        "d5a25879.5481b8",
+        "7aac81ec.ba7cc8",
+        "c0f06a3d.8ad7f8",
+        "ad8e54c3.d3fe18"
       ]
     ]
   },
   {
-    "id": "99b18acf.7ec528",
+    "id": "cccd2695.c600b",
     "type": "switchNode",
     "name": "switch uni type",
     "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1252,
-    "y": 1236,
-    "z": "b60623c5.e2d9e8",
+    "x": 1476.3333129882812,
+    "y": 1296.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "bfa56f6a.14e168",
-        "3c1ef869.c0abd8",
-        "3b2dd259.d313d6",
-        "42d627cc.4d9d98"
+        "8f7bce65.961b18",
+        "17cc18e5.7d037f",
+        "302ecb9b.5a47dc",
+        "c6b9b74d.1c7d78"
       ]
     ]
   },
   {
-    "id": "bfa56f6a.14e168",
+    "id": "8f7bce65.961b18",
     "type": "outcome",
     "name": "leaf",
     "xml": "<outcome value='leaf'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1417,
-    "y": 1218,
-    "z": "b60623c5.e2d9e8",
+    "x": 1641.3333129882812,
+    "y": 1278.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "327e25a1.149b82"
+        "3943aa6e.c88a36"
       ]
     ]
   },
   {
-    "id": "3c1ef869.c0abd8",
+    "id": "17cc18e5.7d037f",
     "type": "outcome",
     "name": "root",
     "xml": "<outcome value='root'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1420,
-    "y": 1257,
-    "z": "b60623c5.e2d9e8",
+    "x": 1644.3333129882812,
+    "y": 1317.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "bb94632d.8744e"
+        "47637f28.c69c6"
       ]
     ]
   },
   {
-    "id": "42d627cc.4d9d98",
+    "id": "c6b9b74d.1c7d78",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1414,
-    "y": 1335,
-    "z": "b60623c5.e2d9e8",
+    "x": 1638.3333129882812,
+    "y": 1395.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "aa99ff1e.001ee"
+        "656a466a.445c98"
       ]
     ]
   },
   {
-    "id": "3b2dd259.d313d6",
+    "id": "302ecb9b.5a47dc",
     "type": "outcome",
     "name": "secondary-root",
     "xml": "<outcome value='secondary-root'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1437,
-    "y": 1298,
-    "z": "b60623c5.e2d9e8",
+    "x": 1661.3333129882812,
+    "y": 1358.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "3c1ff952.ce0566"
+        "6a61eaa3.28143c"
       ]
     ]
   },
   {
-    "id": "8b34828e.2e2fe8",
+    "id": "a2fb1650.227e28",
     "type": "set",
     "name": "unset ethernet-srv-end-points-list",
     "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
     "comments": "",
-    "x": 1983,
-    "y": 1331,
-    "z": "b60623c5.e2d9e8",
+    "x": 2207.3333129882812,
+    "y": 1391.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "7c827d8b.b5207c",
+    "id": "e35c4fb2.169e68",
     "type": "set",
     "name": "set leafOrRootAccess",
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-backup' />\n",
     "comments": "",
-    "x": 1945,
-    "y": 1371,
-    "z": "b60623c5.e2d9e8",
+    "x": 2169.3333129882812,
+    "y": 1431.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": []
   },
   {
-    "id": "aa99ff1e.001ee",
+    "id": "656a466a.445c98",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1582,
-    "y": 1335,
-    "z": "b60623c5.e2d9e8",
+    "x": 1806.3333129882812,
+    "y": 1395.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       []
     ]
   },
   {
-    "id": "327e25a1.149b82",
+    "id": "3943aa6e.c88a36",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1578,
-    "y": 1214,
-    "z": "b60623c5.e2d9e8",
+    "x": 1802.3333129882812,
+    "y": 1274.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "1840e683.b61c39"
+        "c08ad06c.488d4"
       ]
     ]
   },
   {
-    "id": "bb94632d.8744e",
+    "id": "47637f28.c69c6",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1585,
-    "y": 1259,
-    "z": "b60623c5.e2d9e8",
+    "x": 1809.3333129882812,
+    "y": 1319.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "ebd04ab8.6f009"
+        "2ee2b867.995c6"
       ]
     ]
   },
   {
-    "id": "3c1ff952.ce0566",
+    "id": "6a61eaa3.28143c",
     "type": "block",
     "name": "block",
     "xml": "<block>",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1584,
-    "y": 1299,
-    "z": "b60623c5.e2d9e8",
+    "x": 1808.3333129882812,
+    "y": 1359.0000076293945,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "7c827d8b.b5207c"
+        "e35c4fb2.169e68"
       ]
     ]
   },
   {
-    "id": "9a61b358.c738d8",
+    "id": "9b8bc380.4fea78",
     "type": "switchNode",
     "name": "switch conn type != mdsc",
     "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type != 'mdsc' `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 218.56666564941406,
-    "y": 1158.933349609375,
-    "z": "b60623c5.e2d9e8",
+    "x": 442.8999786376953,
+    "y": 1218.9333572387695,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "4c9cf74b.527528"
+        "77dc380.c063d48"
       ]
     ]
   },
   {
-    "id": "4c9cf74b.527528",
+    "id": "77dc380.c063d48",
     "type": "outcome",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 400.566650390625,
-    "y": 1159.933349609375,
-    "z": "b60623c5.e2d9e8",
+    "x": 624.8999633789062,
+    "y": 1219.9333572387695,
+    "z": "88b99be5.091bf8",
     "wires": [
       [
-        "c72dabdd.dd1b58"
+        "4162fe05.2b911"
       ]
     ]
   },
   {
-    "id": "eca312ef.b3f488",
+    "id": "ad8e54c3.d3fe18",
     "type": "set",
     "name": "unset ethernet-srv-end-points-list",
     "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
     "comments": "",
-    "x": 536.566650390625,
-    "y": 1336.9666748046875,
-    "z": "b60623c5.e2d9e8",
+    "x": 760.8999633789062,
+    "y": 1396.966682434082,
+    "z": "88b99be5.091bf8",
     "wires": []
+  },
+  {
+    "id": "63370d02.a0670c",
+    "type": "execute",
+    "name": "execute RestApiCallNode Create Performance Monitoring Data",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1386.3333740234375,
+    "y": 2738.33349609375,
+    "z": "88b99be5.091bf8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1ca90fe2.261db8",
+    "type": "execute",
+    "name": "execute RestconfDiscoveryNode establishSubscription",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1354.3333740234375,
+    "y": 2810.3333740234375,
+    "z": "88b99be5.091bf8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2ecfa879.64974",
+    "type": "execute",
+    "name": "execute RestconfDiscoveryNode establishPersistentConnection",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1384.3333740234375,
+    "y": 2872.3333740234375,
+    "z": "88b99be5.091bf8",
+    "wires": [
+      []
+    ]
   }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
index d58ad7bf..035df45f 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,199 +1,199 @@
 [
     {
-        "id": "d35e2da9.70a7e",
+        "id": "b052f7e.a3d5288",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 372,
-        "y": 306,
-        "z": "5a4cb919.dfff38",
+        "x": 356.75,
+        "y": 462,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "88d19ab1.10b18",
-                "8fd12759.af6e18",
-                "50405d21.7eae84"
+                "e207ef26.f8a29",
+                "15b30bbc.e66fc4",
+                "c73b1c6f.dfba4"
             ]
         ]
     },
     {
-        "id": "88d19ab1.10b18",
+        "id": "e207ef26.f8a29",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 560,
-        "y": 319,
-        "z": "5a4cb919.dfff38",
+        "x": 544.75,
+        "y": 475,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d472199a.beff9"
+                "53374de6.fbbc9c"
             ]
         ]
     },
     {
-        "id": "8fd12759.af6e18",
+        "id": "15b30bbc.e66fc4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 567.4909362792969,
-        "y": 361.57403564453125,
-        "z": "5a4cb919.dfff38",
+        "x": 552.2409362792969,
+        "y": 517.5740356445312,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "50405d21.7eae84",
+        "id": "c73b1c6f.dfba4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 558,
-        "y": 408,
-        "z": "5a4cb919.dfff38",
+        "x": 542.75,
+        "y": 564,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "6b1a691d.f6617"
+                "1d9a3789.c423c"
             ]
         ]
     },
     {
-        "id": "d472199a.beff9",
+        "id": "53374de6.fbbc9c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 733,
-        "y": 317,
-        "z": "5a4cb919.dfff38",
+        "x": 717.75,
+        "y": 473,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "f306805a.38d6f8"
+                "74134804.4c5ab"
             ]
         ]
     },
     {
-        "id": "f306805a.38d6f8",
+        "id": "74134804.4c5ab",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 962,
-        "y": 318,
-        "z": "5a4cb919.dfff38",
+        "x": 946.75,
+        "y": 474,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "4a920666.d84d68"
+                "88398d04.70bb08"
             ]
         ]
     },
     {
-        "id": "4a920666.d84d68",
+        "id": "88398d04.70bb08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1177,
-        "y": 319,
-        "z": "5a4cb919.dfff38",
+        "x": 1161.75,
+        "y": 475,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fc848cba.fc33d8"
+                "60755719.5aec98"
             ]
         ]
     },
     {
-        "id": "841ae1dd.49d178",
+        "id": "23c1dec0.4bd442",
         "type": "switchNode",
         "name": "switch vpnuuid is for this slice",
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1431,
-        "y": 241,
-        "z": "5a4cb919.dfff38",
+        "x": 1415.75,
+        "y": 397,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "98ef6cc.4725e9",
-                "ab42fe03.c49e3"
+                "14654146.223b47",
+                "d151f4bf.d5f298"
             ]
         ]
     },
     {
-        "id": "98ef6cc.4725e9",
+        "id": "14654146.223b47",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648,
-        "y": 220,
-        "z": "5a4cb919.dfff38",
+        "x": 1632.75,
+        "y": 376,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fc848cba.fc33d8"
+                "60755719.5aec98"
             ]
         ]
     },
     {
-        "id": "ab42fe03.c49e3",
+        "id": "d151f4bf.d5f298",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648,
-        "y": 269,
-        "z": "5a4cb919.dfff38",
+        "x": 1632.75,
+        "y": 425,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc848cba.fc33d8",
+        "id": "60755719.5aec98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1832,
-        "y": 306,
-        "z": "5a4cb919.dfff38",
+        "x": 1816.75,
+        "y": 462,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "53692e4a.48cde",
-                "957d0d12.f7d338",
-                "1f9b767f.d670b2"
+                "e58078ca.32c2b8",
+                "db55a5db.cc9e2",
+                "d1721022.90ae5"
             ]
         ]
     },
     {
-        "id": "524dbe59.8ef8f",
+        "id": "ebc2ede2.3e82f8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 191,
-        "y": 47,
-        "z": "5a4cb919.dfff38",
+        "x": 175.75,
+        "y": 203,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "320667fa.12a2c"
+                "19d2750a.7ada53"
             ]
         ]
     },
     {
-        "id": "320667fa.12a2c",
+        "id": "19d2750a.7ada53",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3556 +201,3649 @@
         "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": 475.2856903076172,
-        "y": 108.23810863494873,
-        "z": "5a4cb919.dfff38",
+        "x": 460.0356903076172,
+        "y": 264.23810863494873,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "aa006c98.f12b58"
+                "32b35910.0922e6"
             ]
         ]
     },
     {
-        "id": "aa006c98.f12b58",
+        "id": "32b35910.0922e6",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-F1-Activate",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 481.42860412597656,
-        "y": 193.00003051757812,
-        "z": "5a4cb919.dfff38",
+        "x": 466.17860412597656,
+        "y": 349.0000305175781,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "72fe4a66.39584c"
+                "9f4c6f10.a708b"
             ]
         ]
     },
     {
-        "id": "72fe4a66.39584c",
+        "id": "9f4c6f10.a708b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 791.238037109375,
-        "y": 184.66668701171875,
-        "z": "5a4cb919.dfff38",
+        "x": 775.988037109375,
+        "y": 340.66668701171875,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d35e2da9.70a7e",
-                "cce8745e.b515b8",
-                "706cb78c.da92b",
-                "88772a4.9b58658",
-                "4ace150.4554dec"
+                "b052f7e.a3d5288",
+                "14b40144.c74357",
+                "8371652a.c1422",
+                "ab74b4be.cbc48",
+                "77984a30.f32474"
             ]
         ]
     },
     {
-        "id": "53692e4a.48cde",
+        "id": "e58078ca.32c2b8",
         "type": "set",
         "name": "set tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
         "comments": "",
-        "x": 2049,
-        "y": 244,
-        "z": "5a4cb919.dfff38",
+        "x": 2033.75,
+        "y": 400,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "123fcc82.b79ae3",
+        "id": "bd448e7d.80d888",
         "type": "set",
         "name": "set attachment_param for OTN A",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
         "comments": "",
-        "x": 4218,
-        "y": 130,
-        "z": "5a4cb919.dfff38",
+        "x": 4202.75,
+        "y": 286,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "e308a3a2.af826",
+        "id": "13f5ead.1dca895",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4299,
-        "y": 445,
-        "z": "5a4cb919.dfff38",
+        "x": 4283.75,
+        "y": 601,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fedd6b9.d7f3318",
-                "39581c20.edb614"
+                "322b352.ceea84a",
+                "b686bcae.ff7c7"
             ]
         ]
     },
     {
-        "id": "fedd6b9.d7f3318",
+        "id": "322b352.ceea84a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4608.5,
-        "y": 414,
-        "z": "5a4cb919.dfff38",
+        "x": 4593.25,
+        "y": 570,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "c49081cf.377c78"
+                "1e1970be.0764a7"
             ]
         ]
     },
     {
-        "id": "39581c20.edb614",
+        "id": "b686bcae.ff7c7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4613.5,
-        "y": 479,
-        "z": "5a4cb919.dfff38",
+        "x": 4598.25,
+        "y": 635,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9c0572a4.3a997"
+                "bd24692b.5a8508"
             ]
         ]
     },
     {
-        "id": "c49081cf.377c78",
+        "id": "1e1970be.0764a7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4784.5,
-        "y": 414,
-        "z": "5a4cb919.dfff38",
+        "x": 4769.25,
+        "y": 570,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "9c0572a4.3a997",
+        "id": "bd24692b.5a8508",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4780,
-        "y": 479,
-        "z": "5a4cb919.dfff38",
+        "x": 4764.75,
+        "y": 635,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "2d297001.689a7",
+        "id": "bdfec131.c9a298",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
         "comments": "",
-        "x": 4163.5,
-        "y": 699,
-        "z": "5a4cb919.dfff38",
+        "x": 4148.25,
+        "y": 855,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "54d9bbcc.0d0bac",
+        "id": "68cdfef7.64c51",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4317.5,
-        "y": 747,
-        "z": "5a4cb919.dfff38",
+        "x": 4302.25,
+        "y": 903,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "2ade786d.c09b28",
-                "f17ad5b3.0ef818"
+                "534fa647.cdf3",
+                "626cbb12.a73134"
             ]
         ]
     },
     {
-        "id": "2ade786d.c09b28",
+        "id": "534fa647.cdf3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4663,
-        "y": 728,
-        "z": "5a4cb919.dfff38",
+        "x": 4647.75,
+        "y": 884,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "72718fb4.e15e78"
+                "2db65967.f1a87e"
             ]
         ]
     },
     {
-        "id": "f17ad5b3.0ef818",
+        "id": "626cbb12.a73134",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4667,
-        "y": 768,
-        "z": "5a4cb919.dfff38",
+        "x": 4651.75,
+        "y": 924,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "98b1fdb0.a42648"
+                "54fc5ed8.18991"
             ]
         ]
     },
     {
-        "id": "72718fb4.e15e78",
+        "id": "2db65967.f1a87e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4821,
-        "y": 728,
-        "z": "5a4cb919.dfff38",
+        "x": 4805.75,
+        "y": 884,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "98b1fdb0.a42648",
+        "id": "54fc5ed8.18991",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4824.5,
-        "y": 768,
-        "z": "5a4cb919.dfff38",
+        "x": 4809.25,
+        "y": 924,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fe12ce9.6a53ab",
-                "4eba4c2.fda54b4"
+                "5bbebd3d.56e454",
+                "7821e9b0.59a868"
             ]
         ]
     },
     {
-        "id": "fe12ce9.6a53ab",
+        "id": "5bbebd3d.56e454",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5155,
-        "y": 733,
-        "z": "5a4cb919.dfff38",
+        "x": 5139.75,
+        "y": 889,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "9e233ee4.5c90e",
+        "id": "72ed7974.8997",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 5019,
-        "y": 692,
-        "z": "5a4cb919.dfff38",
+        "x": 5003.75,
+        "y": 848,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "4eba4c2.fda54b4",
+        "id": "7821e9b0.59a868",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5082,
-        "y": 779,
-        "z": "5a4cb919.dfff38",
+        "x": 5066.75,
+        "y": 935,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "fbd17573.b91cd8",
+        "id": "47a40348.350864",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4156,
-        "y": 178,
-        "z": "5a4cb919.dfff38",
+        "x": 4140.75,
+        "y": 334,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "985dbb20.1c3b78",
+        "id": "e86c4698.44de68",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4182,
-        "y": 295,
-        "z": "5a4cb919.dfff38",
+        "x": 4166.75,
+        "y": 451,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "544c4f89.eba52",
-                "eb873b5e.d10b8",
-                "d8377d86.76164"
+                "3bef2a94.7a3c56",
+                "8e5e548f.b7d088",
+                "9e92c765.4c36e"
             ]
         ]
     },
     {
-        "id": "544c4f89.eba52",
+        "id": "3bef2a94.7a3c56",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4377.5001220703125,
-        "y": 247,
-        "z": "5a4cb919.dfff38",
+        "x": 4362.2501220703125,
+        "y": 403,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cd232c91.ed7d5"
+                "8ae11b21.8072d"
             ]
         ]
     },
     {
-        "id": "eb873b5e.d10b8",
+        "id": "8e5e548f.b7d088",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4369.5001220703125,
-        "y": 302,
-        "z": "5a4cb919.dfff38",
+        "x": 4354.2501220703125,
+        "y": 458,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "7e7e18a4.ea2a98"
+                "85930301.e40178"
             ]
         ]
     },
     {
-        "id": "cd232c91.ed7d5",
+        "id": "8ae11b21.8072d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4521.8824462890625,
-        "y": 246.65567016601562,
-        "z": "5a4cb919.dfff38",
+        "x": 4506.6324462890625,
+        "y": 402.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d5d46c3b.524dc8"
+                "2b001bb5.f3beac"
             ]
         ]
     },
     {
-        "id": "4c85ec99.26bac4",
+        "id": "44cbb5eb.fe11fc",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5104,
-        "y": 249,
-        "z": "5a4cb919.dfff38",
+        "x": 5088.75,
+        "y": 405,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "490c8cc0.c71134"
+                "8828c3a6.4773b"
             ]
         ]
     },
     {
-        "id": "d5d46c3b.524dc8",
+        "id": "2b001bb5.f3beac",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4706,
-        "y": 245,
-        "z": "5a4cb919.dfff38",
+        "x": 4690.75,
+        "y": 401,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cc43f2ea.19847"
+                "e234651a.d8201"
             ]
         ]
     },
     {
-        "id": "cc43f2ea.19847",
+        "id": "e234651a.d8201",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4901,
-        "y": 245,
-        "z": "5a4cb919.dfff38",
+        "x": 4885.75,
+        "y": 401,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "4c85ec99.26bac4"
+                "44cbb5eb.fe11fc"
             ]
         ]
     },
     {
-        "id": "d8377d86.76164",
+        "id": "9e92c765.4c36e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4374.5001220703125,
-        "y": 359,
-        "z": "5a4cb919.dfff38",
+        "x": 4359.2501220703125,
+        "y": 515,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9cf617d3.aee3a8"
+                "2e1c6b8c.8fd4dc"
             ]
         ]
     },
     {
-        "id": "9cf617d3.aee3a8",
+        "id": "2e1c6b8c.8fd4dc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4526.5001220703125,
-        "y": 360,
-        "z": "5a4cb919.dfff38",
+        "x": 4511.2501220703125,
+        "y": 516,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "7e7e18a4.ea2a98",
+        "id": "85930301.e40178",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4537.5001220703125,
-        "y": 303,
-        "z": "5a4cb919.dfff38",
+        "x": 4522.2501220703125,
+        "y": 459,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "f42e9c90.ae58f",
+        "id": "90e4153e.8023d8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5489,
-        "y": 262,
-        "z": "5a4cb919.dfff38",
+        "x": 5473.75,
+        "y": 418,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "f404a9ca.fbce2",
-                "3fd1ebaf.c62a54",
-                "66a3972e.71bfa8"
+                "bac51d99.85cdd8",
+                "432bf875.253be8",
+                "32be30ae.8624b"
             ]
         ]
     },
     {
-        "id": "490c8cc0.c71134",
+        "id": "8828c3a6.4773b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5283,
-        "y": 249,
-        "z": "5a4cb919.dfff38",
+        "x": 5267.75,
+        "y": 405,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9ce5b4b0.4bb188",
-                "f42e9c90.ae58f"
+                "580b4f3c.2239f",
+                "90e4153e.8023d8"
             ]
         ]
     },
     {
-        "id": "9ce5b4b0.4bb188",
+        "id": "580b4f3c.2239f",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5519,
-        "y": 210,
-        "z": "5a4cb919.dfff38",
+        "x": 5503.75,
+        "y": 366,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "f404a9ca.fbce2",
+        "id": "bac51d99.85cdd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5699,
-        "y": 253,
-        "z": "5a4cb919.dfff38",
+        "x": 5683.75,
+        "y": 409,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "3597c274.50637e"
+                "7a8928ea.c03e88"
             ]
         ]
     },
     {
-        "id": "3fd1ebaf.c62a54",
+        "id": "432bf875.253be8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5691,
-        "y": 308,
-        "z": "5a4cb919.dfff38",
+        "x": 5675.75,
+        "y": 464,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ff90e84e.43d4b8"
+                "609d607b.1ff68"
             ]
         ]
     },
     {
-        "id": "66a3972e.71bfa8",
+        "id": "32be30ae.8624b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5696,
-        "y": 365,
-        "z": "5a4cb919.dfff38",
+        "x": 5680.75,
+        "y": 521,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ff823793.36814"
+                "e7f093f9.7ecc4"
             ]
         ]
     },
     {
-        "id": "ff823793.36814",
+        "id": "e7f093f9.7ecc4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5848,
-        "y": 366,
-        "z": "5a4cb919.dfff38",
+        "x": 5832.75,
+        "y": 522,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "ff90e84e.43d4b8",
+        "id": "609d607b.1ff68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5859,
-        "y": 311,
-        "z": "5a4cb919.dfff38",
+        "x": 5843.75,
+        "y": 467,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "3597c274.50637e",
+        "id": "7a8928ea.c03e88",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5843.38232421875,
-        "y": 250.65567016601562,
-        "z": "5a4cb919.dfff38",
+        "x": 5828.13232421875,
+        "y": 406.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d39e28b5.1aec5"
+                "d93996e8.177a9"
             ]
         ]
     },
     {
-        "id": "d39e28b5.1aec5",
+        "id": "d93996e8.177a9",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 6058,
-        "y": 247,
-        "z": "5a4cb919.dfff38",
+        "x": 6042.75,
+        "y": 403,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "139f2f1e.8fa159",
+        "id": "a51ca3ec.fcbd9",
         "type": "set",
         "name": "set attachment_param for OTN B",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
-        "x": 3625,
-        "y": 1587,
-        "z": "5a4cb919.dfff38",
+        "x": 3609.75,
+        "y": 1743,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "18d2c2bc.05fd85",
+        "id": "75a3839f.237ba4",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3688,
-        "y": 1916,
-        "z": "5a4cb919.dfff38",
+        "x": 3672.75,
+        "y": 2072,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "8895fa29.bf8e3",
-                "23c7c635.fd4722"
+                "dce36923.840728",
+                "157f1852.8f7de8"
             ]
         ]
     },
     {
-        "id": "8895fa29.bf8e3",
+        "id": "dce36923.840728",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3983.5,
-        "y": 1883,
-        "z": "5a4cb919.dfff38",
+        "x": 3968.25,
+        "y": 2039,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "500b5538.e88684"
+                "c9eb5c3d.58ade8"
             ]
         ]
     },
     {
-        "id": "23c7c635.fd4722",
+        "id": "157f1852.8f7de8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3988.5,
-        "y": 1948,
-        "z": "5a4cb919.dfff38",
+        "x": 3973.25,
+        "y": 2104,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "909dfd67.2300d8"
+                "ee455d7a.4369c"
             ]
         ]
     },
     {
-        "id": "500b5538.e88684",
+        "id": "c9eb5c3d.58ade8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4151.5,
-        "y": 1883,
-        "z": "5a4cb919.dfff38",
+        "x": 4136.25,
+        "y": 2039,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "909dfd67.2300d8",
+        "id": "ee455d7a.4369c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4162,
-        "y": 1948,
-        "z": "5a4cb919.dfff38",
+        "x": 4146.75,
+        "y": 2104,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "a49aeabe.b5ff8",
+        "id": "93204f2.1b4a73",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
         "comments": "",
-        "x": 3564,
-        "y": 1644,
-        "z": "5a4cb919.dfff38",
+        "x": 3548.75,
+        "y": 1800,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "642d00da.b53c68",
+        "id": "4ba3f303.c0a41c",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3584,
-        "y": 1741,
-        "z": "5a4cb919.dfff38",
+        "x": 3568.75,
+        "y": 1897,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "1e5d6803.78b7d8",
-                "84307ec5.09a8d",
-                "b468d4fc.bc9c8"
+                "cb100a9c.e2d048",
+                "ffd6b507.6159d",
+                "7158557b.4eb374"
             ]
         ]
     },
     {
-        "id": "1e5d6803.78b7d8",
+        "id": "cb100a9c.e2d048",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3786.5001220703125,
-        "y": 1694,
-        "z": "5a4cb919.dfff38",
+        "x": 3771.2501220703125,
+        "y": 1850,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "683b34d0.c1df64"
+                "e6720bf0.83c908"
             ]
         ]
     },
     {
-        "id": "84307ec5.09a8d",
+        "id": "ffd6b507.6159d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3778.5001220703125,
-        "y": 1749,
-        "z": "5a4cb919.dfff38",
+        "x": 3763.2501220703125,
+        "y": 1905,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "72cad52e.cb1d74"
+                "80e1f285.9bd438"
             ]
         ]
     },
     {
-        "id": "683b34d0.c1df64",
+        "id": "e6720bf0.83c908",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3930.8824462890625,
-        "y": 1691.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 3915.6324462890625,
+        "y": 1847.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "8511cae6.cbf588"
+                "62828788.5424"
             ]
         ]
     },
     {
-        "id": "8511cae6.cbf588",
+        "id": "62828788.5424",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4115,
-        "y": 1706,
-        "z": "5a4cb919.dfff38",
+        "x": 4099.75,
+        "y": 1862,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "82496ff9.234ee"
+                "151698eb.d8b1bf"
             ]
         ]
     },
     {
-        "id": "b468d4fc.bc9c8",
+        "id": "7158557b.4eb374",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3783.5001220703125,
-        "y": 1806,
-        "z": "5a4cb919.dfff38",
+        "x": 3768.2501220703125,
+        "y": 1962,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "a6137ce1.b3b5c"
+                "4f499dcc.5ccf54"
             ]
         ]
     },
     {
-        "id": "a6137ce1.b3b5c",
+        "id": "4f499dcc.5ccf54",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3935.5001220703125,
-        "y": 1807,
-        "z": "5a4cb919.dfff38",
+        "x": 3920.2501220703125,
+        "y": 1963,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "72cad52e.cb1d74",
+        "id": "80e1f285.9bd438",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3946.5001220703125,
-        "y": 1752,
-        "z": "5a4cb919.dfff38",
+        "x": 3931.2501220703125,
+        "y": 1908,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "7b4a137a.364fcc",
+        "id": "48500cb6.0a5974",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4513,
-        "y": 1710,
-        "z": "5a4cb919.dfff38",
+        "x": 4497.75,
+        "y": 1866,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "37fe69a9.07064e"
+                "9253635.59581a"
             ]
         ]
     },
     {
-        "id": "82496ff9.234ee",
+        "id": "151698eb.d8b1bf",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4310,
-        "y": 1706,
-        "z": "5a4cb919.dfff38",
+        "x": 4294.75,
+        "y": 1862,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "7b4a137a.364fcc"
+                "48500cb6.0a5974"
             ]
         ]
     },
     {
-        "id": "4bdd9e57.a5e13",
+        "id": "a71424bd.8e0678",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4898,
-        "y": 1709,
-        "z": "5a4cb919.dfff38",
+        "x": 4882.75,
+        "y": 1865,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "8afff046.26af98",
-                "5118b1e.53f805",
-                "5a800db8.063d6c"
+                "a7626fee.35776",
+                "f55d0ed2.02e038",
+                "47407f5a.98f7f8"
             ]
         ]
     },
     {
-        "id": "37fe69a9.07064e",
+        "id": "9253635.59581a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4690,
-        "y": 1702,
-        "z": "5a4cb919.dfff38",
+        "x": 4674.75,
+        "y": 1858,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d299743b.8f6b68",
-                "4bdd9e57.a5e13"
+                "3d578b8.a79bc74",
+                "a71424bd.8e0678"
             ]
         ]
     },
     {
-        "id": "d299743b.8f6b68",
+        "id": "3d578b8.a79bc74",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4928,
-        "y": 1657,
-        "z": "5a4cb919.dfff38",
+        "x": 4912.75,
+        "y": 1813,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "2523ddf0.8e1c8a",
+        "id": "d6ea76ec.6a17f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5257,
-        "y": 1813,
-        "z": "5a4cb919.dfff38",
+        "x": 5241.75,
+        "y": 1969,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "6f850c0f.e212ac",
+        "id": "2c34e3d1.56f314",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5268,
-        "y": 1758,
-        "z": "5a4cb919.dfff38",
+        "x": 5252.75,
+        "y": 1914,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "546ca846.269108",
+        "id": "fae51f86.36cbd8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5252.38232421875,
-        "y": 1697.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 5237.13232421875,
+        "y": 1853.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fac7ab27.77dda8"
+                "e7fe4b79.28daf8"
             ]
         ]
     },
     {
-        "id": "fac7ab27.77dda8",
+        "id": "e7fe4b79.28daf8",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5467,
-        "y": 1694,
-        "z": "5a4cb919.dfff38",
+        "x": 5451.75,
+        "y": 1850,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "8afff046.26af98",
+        "id": "a7626fee.35776",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5108,
-        "y": 1700,
-        "z": "5a4cb919.dfff38",
+        "x": 5092.75,
+        "y": 1856,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "546ca846.269108"
+                "fae51f86.36cbd8"
             ]
         ]
     },
     {
-        "id": "5118b1e.53f805",
+        "id": "f55d0ed2.02e038",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5100,
-        "y": 1755,
-        "z": "5a4cb919.dfff38",
+        "x": 5084.75,
+        "y": 1911,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "6f850c0f.e212ac"
+                "2c34e3d1.56f314"
             ]
         ]
     },
     {
-        "id": "5a800db8.063d6c",
+        "id": "47407f5a.98f7f8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5105,
-        "y": 1812,
-        "z": "5a4cb919.dfff38",
+        "x": 5089.75,
+        "y": 1968,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "2523ddf0.8e1c8a"
+                "d6ea76ec.6a17f8"
             ]
         ]
     },
     {
-        "id": "a1edca3.1a62bb8",
+        "id": "3dd6564a.788bea",
         "type": "switchNode",
         "name": "switch vpn-binding has dst-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3139,
-        "y": 658,
-        "z": "5a4cb919.dfff38",
+        "x": 3123.75,
+        "y": 814,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d4bdeded.3ef248",
-                "eead64c.0115918"
+                "4498685c.f8a9c8",
+                "ce59ca85.515708"
             ]
         ]
     },
     {
-        "id": "d4bdeded.3ef248",
+        "id": "4498685c.f8a9c8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3353,
-        "y": 695,
-        "z": "5a4cb919.dfff38",
+        "x": 3337.75,
+        "y": 851,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "614a0644.b0e3e"
+                "b9aa4ba2.44d89"
             ]
         ]
     },
     {
-        "id": "eead64c.0115918",
+        "id": "ce59ca85.515708",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3355,
-        "y": 633,
-        "z": "5a4cb919.dfff38",
+        "x": 3339.75,
+        "y": 789,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "295e16ce.878c6a"
+                "50bc7adf.71a1d4"
             ]
         ]
     },
     {
-        "id": "614a0644.b0e3e",
+        "id": "b9aa4ba2.44d89",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2933,
-        "y": 1938,
-        "z": "5a4cb919.dfff38",
+        "x": 2917.75,
+        "y": 2094,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "75bfd38b.356f64",
-                "f4c4b096.a3ce2"
+                "28dcb01c.f45e6",
+                "415698c1.9dad18"
             ]
         ]
     },
     {
-        "id": "75bfd38b.356f64",
+        "id": "28dcb01c.f45e6",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3186,
-        "y": 1972,
-        "z": "5a4cb919.dfff38",
+        "x": 3170.75,
+        "y": 2128,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "b0597a28.514d3"
+                "8cf945af.2f52c8"
             ]
         ]
     },
     {
-        "id": "f4c4b096.a3ce2",
+        "id": "415698c1.9dad18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3186,
-        "y": 1916,
-        "z": "5a4cb919.dfff38",
+        "x": 3170.75,
+        "y": 2072,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "64045150.224658"
+                "c8aba811.103238"
             ]
         ]
     },
     {
-        "id": "b0597a28.514d3",
+        "id": "8cf945af.2f52c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3337,
-        "y": 1972,
-        "z": "5a4cb919.dfff38",
+        "x": 3321.75,
+        "y": 2128,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "cf5b963d.2b5a08",
+        "id": "eb2e2de2.a53528",
         "type": "set",
         "name": "set vpn-bindingA and connectivityA",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4213,
-        "y": 70,
-        "z": "5a4cb919.dfff38",
+        "x": 4197.75,
+        "y": 226,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "4badfb31.b82c1c",
+        "id": "15f47b8b.7e00dc",
         "type": "set",
         "name": "set vpn-bindingB and connectivityB",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
         "comments": "",
-        "x": 3621,
-        "y": 1529,
-        "z": "5a4cb919.dfff38",
+        "x": 3605.75,
+        "y": 1685,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "552020c2.f01db",
+        "id": "9c2c3c17.6c4b68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3904,
-        "y": 327,
-        "z": "5a4cb919.dfff38",
+        "x": 3888.75,
+        "y": 483,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cf5b963d.2b5a08",
-                "123fcc82.b79ae3",
-                "fbd17573.b91cd8",
-                "985dbb20.1c3b78",
-                "e308a3a2.af826",
-                "ec3b4a19.7f5ee",
-                "881b2d7a.c4e888",
-                "1a392cd7.238923"
+                "eb2e2de2.a53528",
+                "bd448e7d.80d888",
+                "47a40348.350864",
+                "e86c4698.44de68",
+                "13f5ead.1dca895",
+                "94ce35b5.84e9d",
+                "9dbb6108.db3f08",
+                "7f10b67d.13cbf"
             ]
         ]
     },
     {
-        "id": "64045150.224658",
+        "id": "c8aba811.103238",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3337,
-        "y": 1915,
-        "z": "5a4cb919.dfff38",
+        "x": 3321.75,
+        "y": 2071,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "4badfb31.b82c1c",
-                "139f2f1e.8fa159",
-                "a49aeabe.b5ff8",
-                "642d00da.b53c68",
-                "18d2c2bc.05fd85",
-                "724930a5.f44628",
-                "98331ea2.d141f",
-                "f84de17e.e8ea08"
+                "15f47b8b.7e00dc",
+                "a51ca3ec.fcbd9",
+                "93204f2.1b4a73",
+                "4ba3f303.c0a41c",
+                "75a3839f.237ba4",
+                "b13189f3.5c00c",
+                "72e7ea14.321c0c",
+                "a1c10f72.410b08"
             ]
         ]
     },
     {
-        "id": "ed40d4d6.135678",
+        "id": "30be8f1c.c2c68",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
-        "x": 3575,
-        "y": 2214,
-        "z": "5a4cb919.dfff38",
+        "x": 3559.75,
+        "y": 2370,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "b71c97.3dad8368",
+        "id": "60d95124.1573e8",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3729,
-        "y": 2262,
-        "z": "5a4cb919.dfff38",
+        "x": 3713.75,
+        "y": 2418,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "aa1d9a65.d56ee",
-                "ce785491.f82258"
+                "626c41a5.4a556",
+                "319f7c4c.700584"
             ]
         ]
     },
     {
-        "id": "aa1d9a65.d56ee",
+        "id": "626c41a5.4a556",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4074.5,
-        "y": 2243,
-        "z": "5a4cb919.dfff38",
+        "x": 4059.25,
+        "y": 2399,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d8df230a.b47018"
+                "a16c0d6b.aa021"
             ]
         ]
     },
     {
-        "id": "ce785491.f82258",
+        "id": "319f7c4c.700584",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4078.5,
-        "y": 2283,
-        "z": "5a4cb919.dfff38",
+        "x": 4063.25,
+        "y": 2439,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d2d57048.de12f"
+                "c46066f7.6ad638"
             ]
         ]
     },
     {
-        "id": "d8df230a.b47018",
+        "id": "a16c0d6b.aa021",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4232.5,
-        "y": 2243,
-        "z": "5a4cb919.dfff38",
+        "x": 4217.25,
+        "y": 2399,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "d2d57048.de12f",
+        "id": "c46066f7.6ad638",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4236,
-        "y": 2283,
-        "z": "5a4cb919.dfff38",
+        "x": 4220.75,
+        "y": 2439,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "703675c3.1d187c",
-                "6a8e2764.0748e8"
+                "dbf72bce.fe4fd",
+                "da41ce10.71c4a8"
             ]
         ]
     },
     {
-        "id": "703675c3.1d187c",
+        "id": "dbf72bce.fe4fd",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4576,
-        "y": 2282,
-        "z": "5a4cb919.dfff38",
+        "x": 4560.75,
+        "y": 2438,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "b9adfc7b.f1d908",
+        "id": "a0a6a7a2.80538",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4434,
-        "y": 2240,
-        "z": "5a4cb919.dfff38",
+        "x": 4418.75,
+        "y": 2396,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "6a8e2764.0748e8",
+        "id": "da41ce10.71c4a8",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4505,
-        "y": 2331,
-        "z": "5a4cb919.dfff38",
+        "x": 4489.75,
+        "y": 2487,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "641093d5.a73774",
+        "id": "509b9ad8.503f2c",
         "type": "set",
         "name": "set attachment_param (gfp-n) for OTN",
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
         "comments": "",
-        "x": 3130,
-        "y": 598,
-        "z": "5a4cb919.dfff38",
+        "x": 3114.75,
+        "y": 754,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "29b91b19.d2edf4",
+        "id": "8edfc4cd.8a0528",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3725,
-        "y": 284,
-        "z": "5a4cb919.dfff38",
+        "x": 3709.75,
+        "y": 440,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "df88a98e.3b797",
+        "id": "f79b26c9.540128",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3282,
-        "y": 1862,
-        "z": "5a4cb919.dfff38",
+        "x": 3266.75,
+        "y": 2018,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "295e16ce.878c6a",
+        "id": "50bc7adf.71a1d4",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3461,
-        "y": 446,
-        "z": "5a4cb919.dfff38",
+        "x": 3445.75,
+        "y": 602,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fdfbdf68.ace01",
-                "8f7ef737.3d4208"
+                "ebf4cc93.93ec7",
+                "8e7f6f60.66ae28"
             ]
         ]
     },
     {
-        "id": "8f7ef737.3d4208",
+        "id": "8e7f6f60.66ae28",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3703,
-        "y": 1035,
-        "z": "5a4cb919.dfff38",
+        "x": 3687.75,
+        "y": 1191,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d545d977.39f008"
+                "d55e670.1fa9f18"
             ]
         ]
     },
     {
-        "id": "fdfbdf68.ace01",
+        "id": "ebf4cc93.93ec7",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3697,
-        "y": 326,
-        "z": "5a4cb919.dfff38",
+        "x": 3681.75,
+        "y": 482,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "552020c2.f01db"
+                "9c2c3c17.6c4b68"
             ]
         ]
     },
     {
-        "id": "d545d977.39f008",
+        "id": "d55e670.1fa9f18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3861,
-        "y": 1034,
-        "z": "5a4cb919.dfff38",
+        "x": 3845.75,
+        "y": 1190,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "127c7c35.f5600c",
-                "aa22b9fb.8c00d",
-                "7a8bb8ff.a3807",
-                "b6e4b7cd.3aab58",
-                "9befe6d.bfbfb18",
-                "61ff745d.2cf8b4"
+                "f4e2a19a.1a35e",
+                "f86044a9.f193d",
+                "4b4e2775.d6044",
+                "86690982.b14b6",
+                "21d875df.4e5d92",
+                "971d8a82.30a53"
             ]
         ]
     },
     {
-        "id": "aa22b9fb.8c00d",
+        "id": "f86044a9.f193d",
         "type": "set",
         "name": "set attachment_param for OTN G",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
         "comments": "",
-        "x": 4125,
-        "y": 917,
-        "z": "5a4cb919.dfff38",
+        "x": 4109.75,
+        "y": 1073,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "9befe6d.bfbfb18",
+        "id": "21d875df.4e5d92",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4206,
-        "y": 1232,
-        "z": "5a4cb919.dfff38",
+        "x": 4190.75,
+        "y": 1388,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "602f32f4.cac7b4",
-                "1d093526.32224b"
+                "cd1830a.9a25b5",
+                "5f7c3883.6456e"
             ]
         ]
     },
     {
-        "id": "602f32f4.cac7b4",
+        "id": "cd1830a.9a25b5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4515.5,
-        "y": 1201,
-        "z": "5a4cb919.dfff38",
+        "x": 4500.25,
+        "y": 1357,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "4513cd6b.369634"
+                "cf35e2b3.2c8468"
             ]
         ]
     },
     {
-        "id": "1d093526.32224b",
+        "id": "5f7c3883.6456e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4520.5,
-        "y": 1266,
-        "z": "5a4cb919.dfff38",
+        "x": 4505.25,
+        "y": 1422,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "7640c8ac.188fc8"
+                "b3a80e08.d037b"
             ]
         ]
     },
     {
-        "id": "4513cd6b.369634",
+        "id": "cf35e2b3.2c8468",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4691.5,
-        "y": 1201,
-        "z": "5a4cb919.dfff38",
+        "x": 4676.25,
+        "y": 1357,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "7640c8ac.188fc8",
+        "id": "b3a80e08.d037b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4687,
-        "y": 1266,
-        "z": "5a4cb919.dfff38",
+        "x": 4671.75,
+        "y": 1422,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a8bb8ff.a3807",
+        "id": "4b4e2775.d6044",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4063,
-        "y": 965,
-        "z": "5a4cb919.dfff38",
+        "x": 4047.75,
+        "y": 1121,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "b6e4b7cd.3aab58",
+        "id": "86690982.b14b6",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4089,
-        "y": 1082,
-        "z": "5a4cb919.dfff38",
+        "x": 4073.75,
+        "y": 1238,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "bc604696.f19bf",
-                "6b2ab2eb.e94cac",
-                "158e3d74.81687b"
+                "85fe6961.6a7908",
+                "3fb6fcbe.a3fa0c",
+                "89e44c19.cf1b38"
             ]
         ]
     },
     {
-        "id": "bc604696.f19bf",
+        "id": "85fe6961.6a7908",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4284.5001220703125,
-        "y": 1034,
-        "z": "5a4cb919.dfff38",
+        "x": 4269.2501220703125,
+        "y": 1190,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fbbae41a.6bb8"
+                "8a104557.0ad8d8"
             ]
         ]
     },
     {
-        "id": "6b2ab2eb.e94cac",
+        "id": "3fb6fcbe.a3fa0c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4276.5001220703125,
-        "y": 1089,
-        "z": "5a4cb919.dfff38",
+        "x": 4261.2501220703125,
+        "y": 1245,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "5e10560f.7f2a6"
+                "42db739a.3307d4"
             ]
         ]
     },
     {
-        "id": "fbbae41a.6bb8",
+        "id": "8a104557.0ad8d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4428.8824462890625,
-        "y": 1033.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 4413.6324462890625,
+        "y": 1189.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "4ab90ec7.0f8a1"
+                "f760615b.c41c38"
             ]
         ]
     },
     {
-        "id": "4ab90ec7.0f8a1",
+        "id": "f760615b.c41c38",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4613,
-        "y": 1032,
-        "z": "5a4cb919.dfff38",
+        "x": 4597.75,
+        "y": 1188,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "3bb025b6.92298a"
+                "142416ba.388749"
             ]
         ]
     },
     {
-        "id": "3bb025b6.92298a",
+        "id": "142416ba.388749",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4808,
-        "y": 1032,
-        "z": "5a4cb919.dfff38",
+        "x": 4792.75,
+        "y": 1188,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ce204654.d589e8"
+                "ee80fb82.914478"
             ]
         ]
     },
     {
-        "id": "158e3d74.81687b",
+        "id": "89e44c19.cf1b38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4281.5001220703125,
-        "y": 1146,
-        "z": "5a4cb919.dfff38",
+        "x": 4266.2501220703125,
+        "y": 1302,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cfe04507.17faa"
+                "190fd174.e420e7"
             ]
         ]
     },
     {
-        "id": "cfe04507.17faa",
+        "id": "190fd174.e420e7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4433.5001220703125,
-        "y": 1147,
-        "z": "5a4cb919.dfff38",
+        "x": 4418.2501220703125,
+        "y": 1303,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "5e10560f.7f2a6",
+        "id": "42db739a.3307d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4444.5001220703125,
-        "y": 1090,
-        "z": "5a4cb919.dfff38",
+        "x": 4429.2501220703125,
+        "y": 1246,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "127c7c35.f5600c",
+        "id": "f4e2a19a.1a35e",
         "type": "set",
         "name": "set vpn-bindingG and connectivityG",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4120,
-        "y": 857,
-        "z": "5a4cb919.dfff38",
+        "x": 4104.75,
+        "y": 1013,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "ce204654.d589e8",
+        "id": "ee80fb82.914478",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5011,
-        "y": 1036,
-        "z": "5a4cb919.dfff38",
+        "x": 4995.75,
+        "y": 1192,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fea8f5c8.b664d8"
+                "16f58788.f805f"
             ]
         ]
     },
     {
-        "id": "17936311.45c0f5",
+        "id": "4337aa6a.e7854c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5396,
-        "y": 1049,
-        "z": "5a4cb919.dfff38",
+        "x": 5380.75,
+        "y": 1205,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "bda3b861.07af08",
-                "8ce8739f.28fc08",
-                "8098fa71.4cbf3"
+                "d59e46ba.4f5ed8",
+                "51e7728a.8676fc",
+                "dbdd6c65.aefc38"
             ]
         ]
     },
     {
-        "id": "fea8f5c8.b664d8",
+        "id": "16f58788.f805f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5190,
-        "y": 1036,
-        "z": "5a4cb919.dfff38",
+        "x": 5174.75,
+        "y": 1192,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "619520a0.18d9e",
-                "17936311.45c0f5"
+                "925f4411.b3c5c",
+                "4337aa6a.e7854c"
             ]
         ]
     },
     {
-        "id": "619520a0.18d9e",
+        "id": "925f4411.b3c5c",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5426,
-        "y": 997,
-        "z": "5a4cb919.dfff38",
+        "x": 5410.75,
+        "y": 1153,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "bda3b861.07af08",
+        "id": "d59e46ba.4f5ed8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5606,
-        "y": 1040,
-        "z": "5a4cb919.dfff38",
+        "x": 5590.75,
+        "y": 1196,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "3c9ad3f5.e5e4a4"
+                "9fb3d6ee.612538"
             ]
         ]
     },
     {
-        "id": "8ce8739f.28fc08",
+        "id": "51e7728a.8676fc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5598,
-        "y": 1095,
-        "z": "5a4cb919.dfff38",
+        "x": 5582.75,
+        "y": 1251,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ec86cd9f.a15968"
+                "1c483cb2.44cb23"
             ]
         ]
     },
     {
-        "id": "8098fa71.4cbf3",
+        "id": "dbdd6c65.aefc38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5603,
-        "y": 1152,
-        "z": "5a4cb919.dfff38",
+        "x": 5587.75,
+        "y": 1308,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "244270ad.8dfe1"
+                "c131e872.bad5c8"
             ]
         ]
     },
     {
-        "id": "244270ad.8dfe1",
+        "id": "c131e872.bad5c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5755,
-        "y": 1153,
-        "z": "5a4cb919.dfff38",
+        "x": 5739.75,
+        "y": 1309,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "ec86cd9f.a15968",
+        "id": "1c483cb2.44cb23",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5766,
-        "y": 1098,
-        "z": "5a4cb919.dfff38",
+        "x": 5750.75,
+        "y": 1254,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "3c9ad3f5.e5e4a4",
+        "id": "9fb3d6ee.612538",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5750.38232421875,
-        "y": 1037.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 5735.13232421875,
+        "y": 1193.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "2068f2a1.5ec866"
+                "e9716a08.a0ba08"
             ]
         ]
     },
     {
-        "id": "2068f2a1.5ec866",
+        "id": "e9716a08.a0ba08",
         "type": "set",
         "name": "set controller domainG data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5965,
-        "y": 1034,
-        "z": "5a4cb919.dfff38",
+        "x": 5949.75,
+        "y": 1190,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "e69cbe2a.82be58",
+        "id": "c1f0320d.223f",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3739,
-        "y": 975,
-        "z": "5a4cb919.dfff38",
+        "x": 3723.75,
+        "y": 1131,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "957d0d12.f7d338",
+        "id": "db55a5db.cc9e2",
         "type": "switchNode",
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2301,
-        "y": 702,
-        "z": "5a4cb919.dfff38",
+        "x": 2285.75,
+        "y": 858,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "7969493f.6a54d",
-                "9a6050c4.300548"
+                "8cfca669.4c31d",
+                "1cedd7fb.e18cd"
             ]
         ]
     },
     {
-        "id": "9a6050c4.300548",
+        "id": "1cedd7fb.e18cd",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2708,
-        "y": 720,
-        "z": "5a4cb919.dfff38",
+        "x": 2692.75,
+        "y": 876,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "66cd0943.de62f"
+                "91bf0188.93b52"
             ]
         ]
     },
     {
-        "id": "7969493f.6a54d",
+        "id": "8cfca669.4c31d",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2708,
-        "y": 665,
-        "z": "5a4cb919.dfff38",
+        "x": 2692.75,
+        "y": 821,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "7c5fc999.6b62c"
+                "6ae8a7fa.83375"
             ]
         ]
     },
     {
-        "id": "7c5fc999.6b62c",
+        "id": "6ae8a7fa.83375",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2864,
-        "y": 663,
-        "z": "5a4cb919.dfff38",
+        "x": 2848.75,
+        "y": 819,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "641093d5.a73774",
-                "a1edca3.1a62bb8"
+                "509b9ad8.503f2c",
+                "3dd6564a.788bea"
             ]
         ]
     },
     {
-        "id": "66cd0943.de62f",
+        "id": "91bf0188.93b52",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2841,
-        "y": 721,
-        "z": "5a4cb919.dfff38",
+        "x": 2825.75,
+        "y": 877,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "cce8745e.b515b8",
+        "id": "14b40144.c74357",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 1018,
-        "y": 137,
-        "z": "5a4cb919.dfff38",
+        "x": 1002.75,
+        "y": 293,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "48ad099a.c16688",
+        "id": "470acf69.6a7218",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 4135,
-        "y": 555,
-        "z": "5a4cb919.dfff38",
+        "x": 4119.75,
+        "y": 711,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "ec3b4a19.7f5ee",
+        "id": "94ce35b5.84e9d",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4195,
-        "y": 594,
-        "z": "5a4cb919.dfff38",
+        "x": 4179.75,
+        "y": 750,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "706cb78c.da92b",
+        "id": "8371652a.c1422",
         "type": "set",
         "name": "unset leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",
         "comments": "",
-        "x": 1011,
-        "y": 45,
-        "z": "5a4cb919.dfff38",
+        "x": 995.75,
+        "y": 201,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "9a38eb9e.71f4d8",
+        "id": "180e951c.adb823",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 3547,
-        "y": 2071,
-        "z": "5a4cb919.dfff38",
+        "x": 3531.75,
+        "y": 2227,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "724930a5.f44628",
+        "id": "b13189f3.5c00c",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3603,
-        "y": 2120,
-        "z": "5a4cb919.dfff38",
+        "x": 3587.75,
+        "y": 2276,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "2a414bdc.2311dc",
+        "id": "68b96268.5bf0d4",
         "type": "set",
         "name": "unset root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",
         "comments": "",
-        "x": 1011,
-        "y": 84,
-        "z": "5a4cb919.dfff38",
+        "x": 995.75,
+        "y": 240,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "88772a4.9b58658",
+        "id": "ab74b4be.cbc48",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1042,
-        "y": 185,
-        "z": "5a4cb919.dfff38",
+        "x": 1026.75,
+        "y": 341,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "4ace150.4554dec",
+        "id": "77984a30.f32474",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 252,
-        "y": 660,
-        "z": "5a4cb919.dfff38",
+        "x": 236.75,
+        "y": 816,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ce4ab0d3.b836a",
-                "9dbee6c6.1a60a",
-                "290803ec.65c94c"
+                "6b466955.39f7e8",
+                "ea72fa7a.37647",
+                "256cca7a.4ba78e"
             ]
         ]
     },
     {
-        "id": "ce4ab0d3.b836a",
+        "id": "6b466955.39f7e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 471,
-        "y": 598,
-        "z": "5a4cb919.dfff38",
+        "x": 455.75,
+        "y": 754,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "280015e3.c315e2"
+                "ff154227.b5783"
             ]
         ]
     },
     {
-        "id": "9dbee6c6.1a60a",
+        "id": "ea72fa7a.37647",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 480.490966796875,
-        "y": 640.5740356445312,
-        "z": "5a4cb919.dfff38",
+        "x": 465.240966796875,
+        "y": 796.5740356445312,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "290803ec.65c94c",
+        "id": "256cca7a.4ba78e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 469,
-        "y": 687,
-        "z": "5a4cb919.dfff38",
+        "x": 453.75,
+        "y": 843,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "f842cdf9.29a79"
+                "9c1b438c.70f6e8"
             ]
         ]
     },
     {
-        "id": "280015e3.c315e2",
+        "id": "ff154227.b5783",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 668,
-        "y": 594,
-        "z": "5a4cb919.dfff38",
+        "x": 652.75,
+        "y": 750,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cd508bdd.302a88"
+                "d19cd8ca.093408"
             ]
         ]
     },
     {
-        "id": "f842cdf9.29a79",
+        "id": "9c1b438c.70f6e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 638,
-        "y": 688,
-        "z": "5a4cb919.dfff38",
+        "x": 622.75,
+        "y": 844,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "cd508bdd.302a88",
+        "id": "d19cd8ca.093408",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 891.33349609375,
-        "y": 593.9999389648438,
-        "z": "5a4cb919.dfff38",
+        "x": 876.08349609375,
+        "y": 749.9999389648438,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d4df8e14.56fc08"
+                "ec3530b4.60943"
             ]
         ]
     },
     {
-        "id": "d4df8e14.56fc08",
+        "id": "ec3530b4.60943",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1092.0001335144043,
-        "y": 595.000020980835,
-        "z": "5a4cb919.dfff38",
+        "x": 1076.7501335144043,
+        "y": 751.000020980835,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "b67eb6e5.58b31"
+                "732a5938.51aee8"
             ]
         ]
     },
     {
-        "id": "b67eb6e5.58b31",
+        "id": "732a5938.51aee8",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 222,
-        "y": 857,
-        "z": "5a4cb919.dfff38",
+        "x": 206.75,
+        "y": 1013,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "eb910f68.8a5408",
-                "a6536ba8.c4e148",
-                "6d1288a7.3722b8"
+                "23a8b591.9364c2",
+                "8c7cc41e.285ad",
+                "a093cec4.b44ed"
             ]
         ]
     },
     {
-        "id": "eb910f68.8a5408",
+        "id": "23a8b591.9364c2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 430,
-        "y": 821,
-        "z": "5a4cb919.dfff38",
+        "x": 414.75,
+        "y": 977,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "6687da8.fb06ca4"
+                "9b9627ac.373dc8"
             ]
         ]
     },
     {
-        "id": "a6536ba8.c4e148",
+        "id": "8c7cc41e.285ad",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 430.490966796875,
-        "y": 866.5740356445312,
-        "z": "5a4cb919.dfff38",
+        "x": 415.240966796875,
+        "y": 1022.5740356445312,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "6d1288a7.3722b8",
+        "id": "a093cec4.b44ed",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 428,
-        "y": 910,
-        "z": "5a4cb919.dfff38",
+        "x": 412.75,
+        "y": 1066,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "a3e6b31.4b2495"
+                "26fe918.5a2edee"
             ]
         ]
     },
     {
-        "id": "a3e6b31.4b2495",
+        "id": "26fe918.5a2edee",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 597,
-        "y": 911,
-        "z": "5a4cb919.dfff38",
+        "x": 581.75,
+        "y": 1067,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "64de189c.ea0ca",
+        "id": "f6f3f7dd.ddd42",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 569,
-        "y": 1405,
-        "z": "5a4cb919.dfff38",
+        "x": 553.75,
+        "y": 1561,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "f09d5f3a.90b09"
+                "8744e477.6cb05"
             ]
         ]
     },
     {
-        "id": "f09d5f3a.90b09",
+        "id": "8744e477.6cb05",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 772,
-        "y": 1417,
-        "z": "5a4cb919.dfff38",
+        "x": 756.75,
+        "y": 1573,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "be069a3d.2f258"
+                "9fc39c57.082728"
             ]
         ]
     },
     {
-        "id": "be069a3d.2f258",
+        "id": "9fc39c57.082728",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 938,
-        "y": 1414,
-        "z": "5a4cb919.dfff38",
+        "x": 922.75,
+        "y": 1570,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "b33327bf.cf44b8"
+                "5d341323.92886c"
             ]
         ]
     },
     {
-        "id": "b33327bf.cf44b8",
+        "id": "5d341323.92886c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1099,
-        "y": 1411,
-        "z": "5a4cb919.dfff38",
+        "x": 1083.75,
+        "y": 1567,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9b6250ff.75cf18",
-                "6e8e9c3e.00f634",
-                "db16830a.f6a5",
-                "611e4d54.277574",
-                "c0f4e533.035be8",
-                "ee82569c.a25768"
+                "878fc20b.33088",
+                "9a421f91.9b1b28",
+                "7916417b.dd4858",
+                "277d0a08.b51776",
+                "5d833ac3.a3e554",
+                "6bd95e1e.6c91d8"
             ]
         ]
     },
     {
-        "id": "6e8e9c3e.00f634",
+        "id": "9a421f91.9b1b28",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1305,
-        "y": 1010.9999389648438,
-        "z": "5a4cb919.dfff38",
+        "x": 1289.75,
+        "y": 1166.9999389648438,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "9b6250ff.75cf18",
+        "id": "878fc20b.33088",
         "type": "save",
         "name": "get uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1302,
-        "y": 1055.9999389648438,
-        "z": "5a4cb919.dfff38",
+        "x": 1286.75,
+        "y": 1211.9999389648438,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "1b290eb5.e974c9",
-                "b84573d.a8be19",
-                "ef2334eb.3c1b68"
+                "1277502d.c8e7a",
+                "3575cdbd.1f32e2",
+                "bad103b9.14ac5"
             ]
         ]
     },
     {
-        "id": "b84573d.a8be19",
+        "id": "3575cdbd.1f32e2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1497.490966796875,
-        "y": 1029.5739135742188,
-        "z": "5a4cb919.dfff38",
+        "x": 1482.240966796875,
+        "y": 1185.5739135742188,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "45bb14a8.1a7924"
+                "245198ca.86efd8"
             ]
         ]
     },
     {
-        "id": "ef2334eb.3c1b68",
+        "id": "bad103b9.14ac5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1493,
-        "y": 1073.9998779296875,
-        "z": "5a4cb919.dfff38",
+        "x": 1477.75,
+        "y": 1229.9998779296875,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cd1f6950.fef1f"
+                "564cd01d.c60fe8"
             ]
         ]
     },
     {
-        "id": "45bb14a8.1a7924",
+        "id": "245198ca.86efd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1660.0625,
-        "y": 1028.859619140625,
-        "z": "5a4cb919.dfff38",
+        "x": 1644.8125,
+        "y": 1184.859619140625,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "cd1f6950.fef1f",
+        "id": "564cd01d.c60fe8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1661,
-        "y": 1073.9998779296875,
-        "z": "5a4cb919.dfff38",
+        "x": 1645.75,
+        "y": 1229.9998779296875,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "cd4af41f.be1a78",
+        "id": "57d2d0ba.ac96f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1663,
-        "y": 1120.9998779296875,
-        "z": "5a4cb919.dfff38",
+        "x": 1647.75,
+        "y": 1276.9998779296875,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "1b290eb5.e974c9",
+        "id": "1277502d.c8e7a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1494,
-        "y": 1120.9998779296875,
-        "z": "5a4cb919.dfff38",
+        "x": 1478.75,
+        "y": 1276.9998779296875,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cd4af41f.be1a78"
+                "57d2d0ba.ac96f"
             ]
         ]
     },
     {
-        "id": "60f7024f.a382fc",
+        "id": "5f14d939.b7d6d",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 1276,
-        "y": 1642,
-        "z": "5a4cb919.dfff38",
+        "x": 1260.75,
+        "y": 1798,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "db16830a.f6a5",
+        "id": "7916417b.dd4858",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1367,
-        "y": 1696,
-        "z": "5a4cb919.dfff38",
+        "x": 1351.75,
+        "y": 1852,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "1989ebd9.8b76bc",
+        "id": "780a0f58.bba71",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2043.5,
-        "y": 1109,
-        "z": "5a4cb919.dfff38",
+        "x": 2028.25,
+        "y": 1265,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "9da50ff.0241af",
+        "id": "423abc5f.68ffa4",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2048.5,
-        "y": 1211,
-        "z": "5a4cb919.dfff38",
+        "x": 2033.25,
+        "y": 1367,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "eda2f0f7.d8fb38",
+        "id": "9ae45b75.53fe1",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 532,
-        "y": 1661,
-        "z": "5a4cb919.dfff38",
+        "x": 516.75,
+        "y": 1817,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "62852429.1f30ac"
+                "a1c491a.b9e1cf"
             ]
         ]
     },
     {
-        "id": "62852429.1f30ac",
+        "id": "a1c491a.b9e1cf",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 764,
-        "y": 1660,
-        "z": "5a4cb919.dfff38",
+        "x": 748.75,
+        "y": 1816,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ede4a749.9f1af8"
+                "c7d001fc.995ef"
             ]
         ]
     },
     {
-        "id": "ede4a749.9f1af8",
+        "id": "c7d001fc.995ef",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 976,
-        "y": 1661,
-        "z": "5a4cb919.dfff38",
+        "x": 960.75,
+        "y": 1817,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "b699a292.eb6f88"
+                "af8caf57.c80ff"
             ]
         ]
     },
     {
-        "id": "b699a292.eb6f88",
+        "id": "af8caf57.c80ff",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 232,
-        "y": 1817,
-        "z": "5a4cb919.dfff38",
+        "x": 216.75,
+        "y": 1973,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "13d7e483.3188fb",
-                "74bc3a8f.9628d4"
+                "dbb11610.758b08",
+                "e6442fee.44c628"
             ]
         ]
     },
     {
-        "id": "74bc3a8f.9628d4",
+        "id": "e6442fee.44c628",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 467,
-        "y": 1804,
-        "z": "5a4cb919.dfff38",
+        "x": 451.75,
+        "y": 1960,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "13d7e483.3188fb",
+        "id": "dbb11610.758b08",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 457,
-        "y": 1865,
-        "z": "5a4cb919.dfff38",
+        "x": 441.75,
+        "y": 2021,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "bcef8cd9.e20998",
-                "764e27eb.b5496",
-                "21958602.3fa0ea"
+                "afa88564.16a37",
+                "83950a7.2f6c078",
+                "12b1aba5.e7a0f4"
             ]
         ]
     },
     {
-        "id": "764e27eb.b5496",
+        "id": "83950a7.2f6c078",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 670.490966796875,
-        "y": 1849.5740356445312,
-        "z": "5a4cb919.dfff38",
+        "x": 655.240966796875,
+        "y": 2005.5740356445312,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9c812de2.87639"
+                "ea85ca6d.e8d7e"
             ]
         ]
     },
     {
-        "id": "21958602.3fa0ea",
+        "id": "12b1aba5.e7a0f4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 666,
-        "y": 1894,
-        "z": "5a4cb919.dfff38",
+        "x": 650.75,
+        "y": 2050,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "2915d3a6.63730c"
+                "eb678b0e.5293e8"
             ]
         ]
     },
     {
-        "id": "bcef8cd9.e20998",
+        "id": "afa88564.16a37",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 668,
-        "y": 1954,
-        "z": "5a4cb919.dfff38",
+        "x": 652.75,
+        "y": 2110,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "bb26f0d0.bc6288"
+                "46f07676.1e063"
             ]
         ]
     },
     {
-        "id": "9c812de2.87639",
+        "id": "ea85ca6d.e8d7e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 833.0625,
-        "y": 1848.8597412109375,
-        "z": "5a4cb919.dfff38",
+        "x": 817.8125,
+        "y": 2004.8597412109375,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "2915d3a6.63730c",
+        "id": "eb678b0e.5293e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 834,
-        "y": 1894,
-        "z": "5a4cb919.dfff38",
+        "x": 818.75,
+        "y": 2050,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "bb26f0d0.bc6288",
+        "id": "46f07676.1e063",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 837,
-        "y": 1953,
-        "z": "5a4cb919.dfff38",
+        "x": 821.75,
+        "y": 2109,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "e8fb0469.22a408",
-                "b503b0ba.b1ff6"
+                "d6f04402.414508",
+                "ac4ce335.0555f"
             ]
         ]
     },
     {
-        "id": "445d8bb1.6c470c",
+        "id": "42a4fda9.57619c",
         "type": "set",
         "name": "set sotn_value",
-        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
         "comments": "",
-        "x": 236,
-        "y": 2452,
-        "z": "5a4cb919.dfff38",
+        "x": 241.75,
+        "y": 2611,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "925823e9.1c4a4",
+        "id": "3738a9bc.2f26e6",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 379,
-        "y": 2512,
-        "z": "5a4cb919.dfff38",
+        "x": 363.75,
+        "y": 2668,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "345842a4.88ef2e",
-                "a4dc32a8.6620d8"
+                "ac81680a.65fae",
+                "96fc6628.148e78"
             ]
         ]
     },
     {
-        "id": "345842a4.88ef2e",
+        "id": "ac81680a.65fae",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 691.5,
-        "y": 2489,
-        "z": "5a4cb919.dfff38",
+        "x": 676.25,
+        "y": 2645,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "a4dc32a8.6620d8",
+        "id": "96fc6628.148e78",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 695.5,
-        "y": 2529,
-        "z": "5a4cb919.dfff38",
+        "x": 680.25,
+        "y": 2685,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "d1fda3bb.92b0e"
+                "bf7ee9c0.419518"
             ]
         ]
     },
     {
-        "id": "cde1b667.7c4d6",
+        "id": "6f03e95e.3ec198",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 871.5,
-        "y": 2493,
-        "z": "5a4cb919.dfff38",
+        "x": 856.25,
+        "y": 2649,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "d1fda3bb.92b0e",
+        "id": "bf7ee9c0.419518",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 887,
-        "y": 2547,
-        "z": "5a4cb919.dfff38",
+        "x": 871.75,
+        "y": 2703,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "a9ee92c3.93f6e8"
+                "846842ab.33ca8",
+                "5e1c0ed5.c69c48",
+                "9a742833.7a10a8",
+                "feb8a80.2e93d58"
             ]
         ]
     },
     {
-        "id": "459839ba.ae33c",
+        "id": "214d3a40.5474be",
         "type": "save",
         "name": "update vpn-binding resource (aka. OTN ) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1182.5,
-        "y": 2516,
-        "z": "5a4cb919.dfff38",
+        "x": 1167.25,
+        "y": 2672,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "120147ed.79206",
+        "id": "4243a8af.47f99",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 2649.5,
-        "y": 1867,
-        "z": "5a4cb919.dfff38",
+        "x": 2634.25,
+        "y": 2023,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "a9ee92c3.93f6e8",
+        "id": "846842ab.33ca8",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1144.5,
-        "y": 2558,
-        "z": "5a4cb919.dfff38",
+        "x": 1129.25,
+        "y": 2714,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "9d25e547.75567",
+        "id": "eb2c1071.d160d8",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 2009.5,
-        "y": 1147,
-        "z": "5a4cb919.dfff38",
+        "x": 1994.25,
+        "y": 1303,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "52a255e0.e77dec",
+        "id": "3c1d8397.66cfbc",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 2010.5,
-        "y": 1251,
-        "z": "5a4cb919.dfff38",
+        "x": 1995.25,
+        "y": 1407,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "881b2d7a.c4e888",
+        "id": "9dbb6108.db3f08",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4304,
-        "y": 508,
-        "z": "5a4cb919.dfff38",
+        "x": 4288.75,
+        "y": 664,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "61ff745d.2cf8b4",
+        "id": "971d8a82.30a53",
         "type": "save",
         "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4207,
-        "y": 1327,
-        "z": "5a4cb919.dfff38",
+        "x": 4191.75,
+        "y": 1483,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "98331ea2.d141f",
+        "id": "72e7ea14.321c0c",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3701,
-        "y": 1999,
-        "z": "5a4cb919.dfff38",
+        "x": 3685.75,
+        "y": 2155,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "6687da8.fb06ca4",
+        "id": "9b9627ac.373dc8",
         "type": "switchNode",
         "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 802,
-        "y": 807,
-        "z": "5a4cb919.dfff38",
+        "x": 786.75,
+        "y": 963,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "11a4a5f5.385f32",
-                "192499d2.667f1e"
+                "20416bfa.abd944",
+                "3157f22c.bca4c6"
             ]
         ]
     },
     {
-        "id": "11a4a5f5.385f32",
+        "id": "20416bfa.abd944",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1165,
-        "y": 830,
-        "z": "5a4cb919.dfff38",
+        "x": 1149.75,
+        "y": 986,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "1fc9c5be.8fac2a"
+                "16371b2a.82f3f5"
             ]
         ]
     },
     {
-        "id": "192499d2.667f1e",
+        "id": "3157f22c.bca4c6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1165,
-        "y": 779,
-        "z": "5a4cb919.dfff38",
+        "x": 1149.75,
+        "y": 935,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "5fe8520c.50e664"
+                "7c942827.229d68"
             ]
         ]
     },
     {
-        "id": "1fc9c5be.8fac2a",
+        "id": "16371b2a.82f3f5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1321,
-        "y": 828,
-        "z": "5a4cb919.dfff38",
+        "x": 1305.75,
+        "y": 984,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "a46faf22.6dbda8"
+                "6516a515.9e0ed4"
             ]
         ]
     },
     {
-        "id": "5fe8520c.50e664",
+        "id": "7c942827.229d68",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1298,
-        "y": 780,
-        "z": "5a4cb919.dfff38",
+        "x": 1282.75,
+        "y": 936,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "1f9b767f.d670b2",
+        "id": "d1721022.90ae5",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2058,
-        "y": 178,
-        "z": "5a4cb919.dfff38",
+        "x": 2042.75,
+        "y": 334,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "f84de17e.e8ea08",
+        "id": "a1c10f72.410b08",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3600,
-        "y": 2159,
-        "z": "5a4cb919.dfff38",
+        "x": 3584.75,
+        "y": 2315,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "1a392cd7.238923",
+        "id": "7f10b67d.13cbf",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4190,
-        "y": 632,
-        "z": "5a4cb919.dfff38",
+        "x": 4174.75,
+        "y": 788,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "611e4d54.277574",
+        "id": "277d0a08.b51776",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1364,
-        "y": 1738,
-        "z": "5a4cb919.dfff38",
+        "x": 1348.75,
+        "y": 1894,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "dc7d7df9.afb81",
+        "id": "dbed9630.5fe208",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 543,
-        "y": 1472,
-        "z": "5a4cb919.dfff38",
+        "x": 527.75,
+        "y": 1628,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "c70f6326.e297a",
+        "id": "b8630526.556578",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 574,
-        "y": 1512,
-        "z": "5a4cb919.dfff38",
+        "x": 558.75,
+        "y": 1668,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "e8fb0469.22a408",
+        "id": "d6f04402.414508",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1122,
-        "y": 1920,
-        "z": "5a4cb919.dfff38",
+        "x": 1106.75,
+        "y": 2076,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "b503b0ba.b1ff6",
+        "id": "ac4ce335.0555f",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1125,
-        "y": 1962,
-        "z": "5a4cb919.dfff38",
+        "x": 1109.75,
+        "y": 2118,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "f7d70d92.8a17d",
+        "id": "d6151d45.cfb988",
         "type": "set",
         "name": "unset otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",
         "comments": "",
-        "x": 568,
-        "y": 1602,
-        "z": "5a4cb919.dfff38",
+        "x": 552.75,
+        "y": 1758,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "93ecab9f.5bb27",
+        "id": "f1b784f.6be4af8",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 323,
-        "y": 1981,
-        "z": "5a4cb919.dfff38",
+        "x": 307.75,
+        "y": 2137,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "e1bf516d.80132",
+        "id": "b54d5a69.762db",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 331,
-        "y": 2038,
-        "z": "5a4cb919.dfff38",
+        "x": 315.75,
+        "y": 2194,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
     },
     {
-        "id": "c0f4e533.035be8",
+        "id": "5d833ac3.a3e554",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1342,
-        "y": 1587,
-        "z": "5a4cb919.dfff38",
+        "x": 1326.75,
+        "y": 1743,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ff9a5641.69fda",
-                "a44c9ce4.5d2008"
+                "5ddf355f.54101c",
+                "1bdf6619.a36342"
             ]
         ]
     },
     {
-        "id": "a44c9ce4.5d2008",
+        "id": "1bdf6619.a36342",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1565,
-        "y": 1542,
-        "z": "5a4cb919.dfff38",
+        "x": 1549.75,
+        "y": 1698,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "eaca171f.944a48"
+                "754506fa.d51aa8"
             ]
         ]
     },
     {
-        "id": "ff9a5641.69fda",
+        "id": "5ddf355f.54101c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1567,
-        "y": 1606,
-        "z": "5a4cb919.dfff38",
+        "x": 1551.75,
+        "y": 1762,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "93d69fa.52d496"
+                "68209615.eef37"
             ]
         ]
     },
     {
-        "id": "eaca171f.944a48",
+        "id": "754506fa.d51aa8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1730,
-        "y": 1539,
-        "z": "5a4cb919.dfff38",
+        "x": 1714.75,
+        "y": 1695,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "b0447236.92d3b"
+                "714f4595.b88ec4"
             ]
         ]
     },
     {
-        "id": "93d69fa.52d496",
+        "id": "68209615.eef37",
         "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": 1729,
-        "y": 1602,
-        "z": "5a4cb919.dfff38",
+        "x": 1713.75,
+        "y": 1758,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "b0447236.92d3b",
+        "id": "714f4595.b88ec4",
         "type": "set",
         "name": "set tmp.uni-node-id-short",
         "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",
         "comments": "",
-        "x": 1950,
-        "y": 1553,
-        "z": "5a4cb919.dfff38",
+        "x": 1934.75,
+        "y": 1709,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "ab15b7a9.bc6bc8",
+        "id": "1db1829e.06c1d5",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1495,
-        "y": 2278,
-        "z": "5a4cb919.dfff38",
+        "x": 1479.75,
+        "y": 2434,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "be2440af.c20c98"
+                "2cbd7342.8e2ecc"
             ]
         ]
     },
     {
-        "id": "1405448e.40f263",
+        "id": "fa138a5b.3e0008",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 1880,
-        "y": 2291,
-        "z": "5a4cb919.dfff38",
+        "x": 1864.75,
+        "y": 2447,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "facba133.b01618",
-                "36457cd.f85a104",
-                "a0c24437.cf174"
+                "e14f1acf.1bcd",
+                "c2e19be7.fca29",
+                "775dbfec.d9501"
             ]
         ]
     },
     {
-        "id": "be2440af.c20c98",
+        "id": "2cbd7342.8e2ecc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1674,
-        "y": 2278,
-        "z": "5a4cb919.dfff38",
+        "x": 1658.75,
+        "y": 2434,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "eec40e11.9fdab",
-                "1405448e.40f263"
+                "6f327062.742838",
+                "fa138a5b.3e0008"
             ]
         ]
     },
     {
-        "id": "eec40e11.9fdab",
+        "id": "6f327062.742838",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainConn id",
         "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 1910,
-        "y": 2239,
-        "z": "5a4cb919.dfff38",
+        "x": 1894.75,
+        "y": 2395,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "facba133.b01618",
+        "id": "e14f1acf.1bcd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2090,
-        "y": 2282,
-        "z": "5a4cb919.dfff38",
+        "x": 2074.75,
+        "y": 2438,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "926a046d.eed228"
+                "d0fc139e.1761"
             ]
         ]
     },
     {
-        "id": "36457cd.f85a104",
+        "id": "c2e19be7.fca29",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2082,
-        "y": 2337,
-        "z": "5a4cb919.dfff38",
+        "x": 2066.75,
+        "y": 2493,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "6ca22053.c9fba8"
+                "43b937df.ececd8"
             ]
         ]
     },
     {
-        "id": "a0c24437.cf174",
+        "id": "775dbfec.d9501",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2087,
-        "y": 2394,
-        "z": "5a4cb919.dfff38",
+        "x": 2071.75,
+        "y": 2550,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "f91dd017.676d7"
+                "ac944679.99243"
             ]
         ]
     },
     {
-        "id": "f91dd017.676d7",
+        "id": "ac944679.99243",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2239,
-        "y": 2395,
-        "z": "5a4cb919.dfff38",
+        "x": 2223.75,
+        "y": 2551,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "6ca22053.c9fba8",
+        "id": "43b937df.ececd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2250,
-        "y": 2340,
-        "z": "5a4cb919.dfff38",
+        "x": 2234.75,
+        "y": 2496,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "926a046d.eed228",
+        "id": "d0fc139e.1761",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2234.38232421875,
-        "y": 2279.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 2219.13232421875,
+        "y": 2435.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "1e25e04f.ee7df"
+                "79bc2aa4.303284"
             ]
         ]
     },
     {
-        "id": "1e25e04f.ee7df",
+        "id": "79bc2aa4.303284",
         "type": "set",
         "name": "set controller domainConn data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 2449,
-        "y": 2276,
-        "z": "5a4cb919.dfff38",
+        "x": 2433.75,
+        "y": 2432,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "46842cb8.91c5bc",
+        "id": "d91a9773.8b97d8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 573,
-        "y": 2324,
-        "z": "5a4cb919.dfff38",
+        "x": 557.75,
+        "y": 2480,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "80e94eed.70f82",
-                "e1101309.b00428",
-                "6cefa506.12a2dc"
+                "fd5d97.57110a68",
+                "e3891e3f.2fa52",
+                "6282c457.966ab4"
             ]
         ]
     },
     {
-        "id": "80e94eed.70f82",
+        "id": "fd5d97.57110a68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 768.5001220703125,
-        "y": 2276,
-        "z": "5a4cb919.dfff38",
+        "x": 753.2501220703125,
+        "y": 2432,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "a961cabf.5d77d8"
+                "ee247bd7.5fac58"
             ]
         ]
     },
     {
-        "id": "e1101309.b00428",
+        "id": "e3891e3f.2fa52",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 760.5001220703125,
-        "y": 2331,
-        "z": "5a4cb919.dfff38",
+        "x": 745.2501220703125,
+        "y": 2487,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "cfce6a08.8d1818"
+                "91fa570e.651ca8"
             ]
         ]
     },
     {
-        "id": "a961cabf.5d77d8",
+        "id": "ee247bd7.5fac58",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 912.8824462890625,
-        "y": 2275.6556701660156,
-        "z": "5a4cb919.dfff38",
+        "x": 897.6324462890625,
+        "y": 2431.6556701660156,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "41f5578e.096c08"
+                "ea7d04e7.1afcb8"
             ]
         ]
     },
     {
-        "id": "41f5578e.096c08",
+        "id": "ea7d04e7.1afcb8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1097,
-        "y": 2274,
-        "z": "5a4cb919.dfff38",
+        "x": 1081.75,
+        "y": 2430,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "78702bad.3695f4"
+                "40c13bcd.4d6ac4"
             ]
         ]
     },
     {
-        "id": "78702bad.3695f4",
+        "id": "40c13bcd.4d6ac4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1292,
-        "y": 2274,
-        "z": "5a4cb919.dfff38",
+        "x": 1276.75,
+        "y": 2430,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ab15b7a9.bc6bc8"
+                "1db1829e.06c1d5"
             ]
         ]
     },
     {
-        "id": "6cefa506.12a2dc",
+        "id": "6282c457.966ab4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 765.5001220703125,
-        "y": 2388,
-        "z": "5a4cb919.dfff38",
+        "x": 750.2501220703125,
+        "y": 2544,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "bbb236e9.1d475"
+                "4979dd8d.1f5f3c"
             ]
         ]
     },
     {
-        "id": "bbb236e9.1d475",
+        "id": "4979dd8d.1f5f3c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 917.5001220703125,
-        "y": 2389,
-        "z": "5a4cb919.dfff38",
+        "x": 902.2501220703125,
+        "y": 2545,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "cfce6a08.8d1818",
+        "id": "91fa570e.651ca8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 928.5001220703125,
-        "y": 2332,
-        "z": "5a4cb919.dfff38",
+        "x": 913.2501220703125,
+        "y": 2488,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "fd11a034.71ffe8",
+        "id": "bd1da98.2130f58",
         "type": "set",
         "name": "set tmp.pnf-name-forUrl",
         "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
         "comments": "",
-        "x": 563,
-        "y": 2236,
-        "z": "5a4cb919.dfff38",
+        "x": 547.75,
+        "y": 2392,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "2ab715a0.ab46a2",
+        "id": "aa3bbb2.a6f0e48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 308,
-        "y": 2367,
-        "z": "5a4cb919.dfff38",
+        "x": 292.75,
+        "y": 2523,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "fd11a034.71ffe8",
-                "46842cb8.91c5bc"
+                "bd1da98.2130f58",
+                "d91a9773.8b97d8"
             ]
         ]
     },
     {
-        "id": "c68339b5.636678",
+        "id": "4b46d34a.40e874",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1522.9666748046875,
-        "y": 184.88333129882812,
-        "z": "5a4cb919.dfff38",
+        "x": 1507.7166748046875,
+        "y": 340.8833312988281,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "6b1a691d.f6617",
+        "id": "1d9a3789.c423c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 725,
-        "y": 407,
-        "z": "5a4cb919.dfff38",
+        "x": 709.75,
+        "y": 563,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "a46faf22.6dbda8",
+        "id": "6516a515.9e0ed4",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 284.5,
-        "y": 1376,
-        "z": "5a4cb919.dfff38",
+        "x": 269.25,
+        "y": 1532,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "64de189c.ea0ca",
-                "eda2f0f7.d8fb38",
-                "dc7d7df9.afb81",
-                "c70f6326.e297a",
-                "445d8bb1.6c470c",
-                "925823e9.1c4a4",
-                "f7d70d92.8a17d",
-                "93ecab9f.5bb27",
-                "e1bf516d.80132",
-                "2ab715a0.ab46a2"
+                "f6f3f7dd.ddd42",
+                "9ae45b75.53fe1",
+                "dbed9630.5fe208",
+                "b8630526.556578",
+                "42a4fda9.57619c",
+                "3738a9bc.2f26e6",
+                "d6151d45.cfb988",
+                "f1b784f.6be4af8",
+                "b54d5a69.762db",
+                "aa3bbb2.a6f0e48"
             ]
         ]
     },
     {
-        "id": "ee82569c.a25768",
+        "id": "6bd95e1e.6c91d8",
         "type": "switchNode",
         "name": "switch uni type",
         "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1315,
-        "y": 1214,
-        "z": "5a4cb919.dfff38",
+        "x": 1299.75,
+        "y": 1370,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "ef11d348.e67b18",
-                "db4eac49.9ee78",
-                "ccd7386e.438c4",
-                "8a1e26c1.925918"
+                "92533584.a5f61",
+                "18980475.16f3b4",
+                "ec63f877.0fd998",
+                "c1c9dc9a.d31ec"
             ]
         ]
     },
     {
-        "id": "ef11d348.e67b18",
+        "id": "92533584.a5f61",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1480,
-        "y": 1196,
-        "z": "5a4cb919.dfff38",
+        "x": 1464.75,
+        "y": 1352,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "1989ebd9.8b76bc",
-                "9d25e547.75567"
+                "b00f22e0.6a5e"
             ]
         ]
     },
     {
-        "id": "db4eac49.9ee78",
+        "id": "18980475.16f3b4",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1483,
-        "y": 1235,
-        "z": "5a4cb919.dfff38",
+        "x": 1467.75,
+        "y": 1391,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "9da50ff.0241af",
-                "52a255e0.e77dec"
+                "52cb104.aabcaf"
             ]
         ]
     },
     {
-        "id": "8a1e26c1.925918",
+        "id": "c1c9dc9a.d31ec",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1477,
-        "y": 1313,
-        "z": "5a4cb919.dfff38",
+        "x": 1461.75,
+        "y": 1469,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "af3eb285.34bda8"
+                "4eaa272a.ec5048"
             ]
         ]
     },
     {
-        "id": "ccd7386e.438c4",
+        "id": "ec63f877.0fd998",
         "type": "outcome",
         "name": "root-secondary",
         "xml": "<outcome value='root-secondary'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1500,
-        "y": 1276,
-        "z": "5a4cb919.dfff38",
+        "x": 1484.75,
+        "y": 1432,
+        "z": "111f91bb.269a56",
         "wires": [
             [
-                "8dd3ee03.704618",
-                "3acf3b0f.3b0184"
+                "e77dda82.efac78"
             ]
         ]
     },
     {
-        "id": "8dd3ee03.704618",
+        "id": "fb2c8aff.5902e",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2046,
-        "y": 1309,
-        "z": "5a4cb919.dfff38",
+        "x": 2030.75,
+        "y": 1465,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "3acf3b0f.3b0184",
+        "id": "c8ca91d0.91a568",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
         "comments": "",
-        "x": 2008,
-        "y": 1349,
-        "z": "5a4cb919.dfff38",
+        "x": 1992.75,
+        "y": 1505,
+        "z": "111f91bb.269a56",
         "wires": []
     },
     {
-        "id": "af3eb285.34bda8",
+        "id": "4eaa272a.ec5048",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1629,
-        "y": 1334,
-        "z": "5a4cb919.dfff38",
+        "x": 1613.75,
+        "y": 1490,
+        "z": "111f91bb.269a56",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5e1c0ed5.c69c48",
+        "type": "execute",
+        "name": "execute RestApiCallNode Create Performance Monitoring Data",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1203.3333740234375,
+        "y": 2789.3336181640625,
+        "z": "111f91bb.269a56",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b00f22e0.6a5e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1599.6666259765625,
+        "y": 1348.333251953125,
+        "z": "111f91bb.269a56",
+        "wires": [
+            [
+                "eb2c1071.d160d8"
+            ]
+        ]
+    },
+    {
+        "id": "52cb104.aabcaf",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1601.6666259765625,
+        "y": 1386.333251953125,
+        "z": "111f91bb.269a56",
+        "wires": [
+            [
+                "3c1d8397.66cfbc"
+            ]
+        ]
+    },
+    {
+        "id": "e77dda82.efac78",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1644.6666259765625,
+        "y": 1433.333251953125,
+        "z": "111f91bb.269a56",
+        "wires": [
+            [
+                "c8ca91d0.91a568"
+            ]
+        ]
+    },
+    {
+        "id": "9a742833.7a10a8",
+        "type": "execute",
+        "name": "execute RestconfDiscoveryNode establishSubscription",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1171.3333740234375,
+        "y": 2861.33349609375,
+        "z": "111f91bb.269a56",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "feb8a80.2e93d58",
+        "type": "execute",
+        "name": "execute RestconfDiscoveryNode establishPersistentConnection",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1201.3333740234375,
+        "y": 2923.33349609375,
+        "z": "111f91bb.269a56",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
new file mode 100644
index 00000000..3fb30cdb
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.json
@@ -0,0 +1,190 @@
+[
+    {
+        "id": "4bf68406.ddcfc4",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 252.33331298828125,
+        "y": 102.33334350585938,
+        "z": "f5fa16f3.117ab8",
+        "wires": [
+            [
+                "556d56b1.8aa24"
+            ]
+        ]
+    },
+    {
+        "id": "556d56b1.8aa24",
+        "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": 536.6190032958984,
+        "y": 163.5714521408081,
+        "z": "f5fa16f3.117ab8",
+        "wires": [
+            [
+                "5ee8264.6655ed8"
+            ]
+        ]
+    },
+    {
+        "id": "5ee8264.6655ed8",
+        "type": "method",
+        "name": "method cll-vnf-topology-operation-cll-callbackdg-notification",
+        "xml": "<method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 523.7619018554688,
+        "y": 239.3333740234375,
+        "z": "f5fa16f3.117ab8",
+        "wires": [
+            [
+                "662af79a.da0ee8"
+            ]
+        ]
+    },
+    {
+        "id": "662af79a.da0ee8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 852.5713500976562,
+        "y": 240.00003051757812,
+        "z": "f5fa16f3.117ab8",
+        "wires": [
+            [
+                "49cf2266.9e9664",
+                "6d86a3cf.e795b4",
+                "747b5a7a.94fc0c",
+                "82c91d0d.6b833",
+                "d8e4f1a3.d839d",
+                "32379d64.d2f70a",
+                "2e37faa.5c2ae06",
+                "83f79f41.a9ad3"
+            ]
+        ]
+    },
+    {
+        "id": "49cf2266.9e9664",
+        "type": "execute",
+        "name": "execute properties",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1103.3333129882812,
+        "y": 240.33334350585938,
+        "z": "f5fa16f3.117ab8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "6d86a3cf.e795b4",
+        "type": "set",
+        "name": "set received notification parameters",
+        "xml": "<set>\n<!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->\n<parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />\n<parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />\n<parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />\n<parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />",
+        "comments": "",
+        "x": 1131.3333740234375,
+        "y": 413.3333435058594,
+        "z": "f5fa16f3.117ab8",
+        "wires": []
+    },
+    {
+        "id": "83f79f41.a9ad3",
+        "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=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"CallBack DG For SSE CONNECTION is called\"/>\n<!--<parameter name=\"field2\" value=\"`$rcvdNotif`\"/>-->",
+        "comments": "",
+        "outputs": 1,
+        "x": 1067.3333740234375,
+        "y": 184.33334350585938,
+        "z": "f5fa16f3.117ab8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "747b5a7a.94fc0c",
+        "type": "save",
+        "name": "save:metadata to AAI",
+        "xml": "<!--<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"-->\n<!-- key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id  -->\n<!--\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->\n<!--\t  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->\n<!--\t  AND service-instance.service-instance-id =  $rcvd-service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">\n    <parameter name=\"metadata.metadatum[0].metaname\" value=\"`$rcvd-etht-svc-end-point`\" />\n    <parameter name=\"metadata.metadatum[0].metaval\" value=\"`$rcvd-bandwidth-value`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1088.3333740234375,
+        "y": 476.3333435058594,
+        "z": "f5fa16f3.117ab8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "32379d64.d2f70a",
+        "type": "set",
+        "name": "set parameters",
+        "xml": "<set>\n<parameter name='eventIdUuid' value=\"`'BandwidthChanged_' + $eventId-uuid`\" />\n<parameter name='eventNameUuid' value='`$eventName-uuid`' />\n<parameter name='cclId' value='`$rcvd-service-instance-id`' />\n<parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />\n<parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />\n",
+        "comments": "",
+        "x": 1067.3333740234375,
+        "y": 723.3333129882812,
+        "z": "f5fa16f3.117ab8",
+        "wires": []
+    },
+    {
+        "id": "2e37faa.5c2ae06",
+        "type": "execute",
+        "name": "execute RestApiCallNode call VES",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.dcaeAddrAndPort + '/eventListener/v7'`\" />\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />-->\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"ves-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1125.3333740234375,
+        "y": 766.3333129882812,
+        "z": "f5fa16f3.117ab8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "82c91d0d.6b833",
+        "type": "execute",
+        "name": "execute UUID generator for eventId",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventId-uuid\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1129.3333740234375,
+        "y": 631.3333129882812,
+        "z": "f5fa16f3.117ab8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d8e4f1a3.d839d",
+        "type": "execute",
+        "name": "execute UUID generator for eventName",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventName-uuid\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1142.3333740234375,
+        "y": 673.3333129882812,
+        "z": "f5fa16f3.117ab8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d1081f1a.6938",
+        "type": "comment",
+        "name": "Calling VES and passing notification parameters",
+        "info": "",
+        "comments": "",
+        "x": 1156.3333740234375,
+        "y": 576.3333129882812,
+        "z": "f5fa16f3.117ab8",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
index 2a4ee233..1a4c8400 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "a85fdd45.18532",
+        "id": "d6c73c0b.0d5f48",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 171.88333129882812,
-        "y": 177,
-        "z": "8bd89607.6248d8",
+        "x": 157.88330078125,
+        "y": 156.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2eaf78b5.ba0318"
+                "d49f5b5f.8b9338"
             ]
         ]
     },
     {
-        "id": "2eaf78b5.ba0318",
+        "id": "d49f5b5f.8b9338",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -23,221 +23,221 @@
         "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": 456.1690216064453,
-        "y": 238.23810863494873,
-        "z": "8bd89607.6248d8",
+        "y": 212.52387523651123,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "28e9741c.d81dfc"
+                "3720330.25593ce"
             ]
         ]
     },
     {
-        "id": "28e9741c.d81dfc",
+        "id": "3720330.25593ce",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-delete",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
         "x": 462.3119354248047,
-        "y": 323.0000305175781,
-        "z": "8bd89607.6248d8",
+        "y": 297.2857971191406,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "df14e360.a098e8"
+                "7f694928.267bb8"
             ]
         ]
     },
     {
-        "id": "df14e360.a098e8",
+        "id": "7f694928.267bb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 811.8833312988281,
-        "y": 382,
-        "z": "8bd89607.6248d8",
+        "y": 356.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e87fcff0.55123",
-                "b8bbed17.73d098",
-                "ed2f6b65.8be208"
+                "14360151.1c2e2f",
+                "2b05d42f.ff48b4",
+                "b833ca08.643e2"
             ]
         ]
     },
     {
-        "id": "e87fcff0.55123",
+        "id": "14360151.1c2e2f",
         "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": 1113.2168273925781,
-        "y": 652.9302978515625,
-        "z": "8bd89607.6248d8",
+        "y": 627.216064453125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b8bbed17.73d098",
+        "id": "2b05d42f.ff48b4",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
         "comments": "",
         "outputs": 1,
         "x": 1134.6452941894531,
-        "y": 355.33331298828125,
-        "z": "8bd89607.6248d8",
+        "y": 329.61907958984375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c5539326.dc2ce",
-                "9370873a.5ec85",
-                "3f911b4d.a21904"
+                "41fb5683.e713a",
+                "80e71c24.60d2d",
+                "fe4111b5.f2228"
             ]
         ]
     },
     {
-        "id": "c5539326.dc2ce",
+        "id": "41fb5683.e713a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1359.6452941894531,
-        "y": 213.33331298828125,
-        "z": "8bd89607.6248d8",
+        "y": 187.61907958984375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a5dbcf8a.fe1748"
+                "41abc238.ea1884"
             ]
         ]
     },
     {
-        "id": "9370873a.5ec85",
+        "id": "80e71c24.60d2d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1355.1362609863281,
-        "y": 282.9073486328125,
-        "z": "8bd89607.6248d8",
+        "y": 257.193115234375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "49f0af9f.5fedb8"
+                "844c0ad5.c095b"
             ]
         ]
     },
     {
-        "id": "3f911b4d.a21904",
+        "id": "fe4111b5.f2228",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1343.6452941894531,
-        "y": 329.33331298828125,
-        "z": "8bd89607.6248d8",
+        "y": 303.61907958984375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "61830ec6.dfc06"
+                "1e9cd9f4.55835e"
             ]
         ]
     },
     {
-        "id": "f78d475.109eab8",
+        "id": "692bc437.51a034",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
         "x": 1113.6452941894531,
-        "y": 243.33331298828125,
-        "z": "8bd89607.6248d8",
+        "y": 217.61907958984375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ed2f6b65.8be208",
+        "id": "b833ca08.643e2",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
         "x": 1101.6452941894531,
-        "y": 295.33331298828125,
-        "z": "8bd89607.6248d8",
+        "y": 269.61907958984375,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "a5dbcf8a.fe1748",
+        "id": "41abc238.ea1884",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1599.8833312988281,
-        "y": 210,
-        "z": "8bd89607.6248d8",
+        "y": 184.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b303ce6.b126d3",
-                "55aeefb2.59b1e8"
+                "edbcfce1.4d552",
+                "d741e3bd.0b6788"
             ]
         ]
     },
     {
-        "id": "49f0af9f.5fedb8",
+        "id": "844c0ad5.c095b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 1509.9457092285156,
-        "y": 285.8597717285156,
-        "z": "8bd89607.6248d8",
+        "y": 260.1455383300781,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "61830ec6.dfc06",
+        "id": "1e9cd9f4.55835e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 1513.8833312988281,
-        "y": 330,
-        "z": "8bd89607.6248d8",
+        "y": 304.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b303ce6.b126d3",
+        "id": "edbcfce1.4d552",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1804.8833312988281,
-        "y": 247,
-        "z": "8bd89607.6248d8",
+        "y": 221.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f1542288.012e3"
+                "589ae77f.807888"
             ]
         ]
     },
     {
-        "id": "55aeefb2.59b1e8",
+        "id": "d741e3bd.0b6788",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1814.8833312988281,
-        "y": 174,
-        "z": "8bd89607.6248d8",
+        "y": 148.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "f1542288.012e3",
+        "id": "589ae77f.807888",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -245,547 +245,547 @@
         "comments": "",
         "outputs": 1,
         "x": 1797.8833312988281,
-        "y": 322,
-        "z": "8bd89607.6248d8",
+        "y": 296.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "abe13a08.545e98",
-                "7178c36c.cf3274",
-                "ac38a7a3.b352e8",
-                "d727f01e.ad9c98",
-                "8cb68ccc.e851f8"
+                "10bd96f7.8fa059",
+                "cb92da4c.da1bb",
+                "cbe49015.ae0dd",
+                "6c495f2.f763aa",
+                "4304e2aa.cc073c"
             ]
         ]
     },
     {
-        "id": "66649512.c7d5bc",
+        "id": "5f06cb70.adae8c",
         "type": "save",
         "name": "get allotted-resource from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 2283.883331298828,
-        "y": 373,
-        "z": "8bd89607.6248d8",
+        "y": 347.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b9d85c6f.27205",
-                "376ece8a.ca776a",
-                "b6dfab0d.b44bd8"
+                "c68fbf4e.5d82c",
+                "2146d17e.d0a56e",
+                "f04a7ec7.eb68d"
             ]
         ]
     },
     {
-        "id": "b9d85c6f.27205",
+        "id": "c68fbf4e.5d82c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2499.883331298828,
-        "y": 440,
-        "z": "8bd89607.6248d8",
+        "y": 414.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c1b489c1.9564e8"
+                "cbd25b41.5a644"
             ]
         ]
     },
     {
-        "id": "376ece8a.ca776a",
+        "id": "2146d17e.d0a56e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2500.374298095703,
-        "y": 339.573974609375,
-        "z": "8bd89607.6248d8",
+        "y": 313.8597412109375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "742662fc.5de6dc"
+                "d020f647.b48948"
             ]
         ]
     },
     {
-        "id": "b6dfab0d.b44bd8",
+        "id": "f04a7ec7.eb68d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2495.883331298828,
-        "y": 389,
-        "z": "8bd89607.6248d8",
+        "y": 363.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b4af8420.603268"
+                "bf60182e.46d6e"
             ]
         ]
     },
     {
-        "id": "abe13a08.545e98",
+        "id": "10bd96f7.8fa059",
         "type": "for",
         "name": "for each allotted-resource",
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 2000.8833312988281,
-        "y": 354,
-        "z": "8bd89607.6248d8",
+        "y": 328.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7d659bd1.1ff4ec",
-                "66649512.c7d5bc",
-                "cfd6a168.75b7d8",
-                "fe93cfa.921edb"
+                "9d7e7b42.ef2a18",
+                "5f06cb70.adae8c",
+                "b4f5dada.48378",
+                "5db562b1.71111c"
             ]
         ]
     },
     {
-        "id": "7d659bd1.1ff4ec",
+        "id": "9d7e7b42.ef2a18",
         "type": "set",
         "name": "set the current allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
         "comments": "",
         "x": 2280.883331298828,
-        "y": 292,
-        "z": "8bd89607.6248d8",
+        "y": 266.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d727f01e.ad9c98",
+        "id": "6c495f2.f763aa",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
         "comments": "",
         "x": 1974.8833312988281,
-        "y": 304,
-        "z": "8bd89607.6248d8",
+        "y": 278.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7178c36c.cf3274",
+        "id": "cb92da4c.da1bb",
         "type": "get-resource",
         "name": "get-resource pnfs-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
         "comments": "",
         "outputs": 1,
         "x": 2017.8833312988281,
-        "y": 163,
-        "z": "8bd89607.6248d8",
+        "y": 137.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "ac38a7a3.b352e8",
+        "id": "cbe49015.ae0dd",
         "type": "get-resource",
         "name": "get-resource logical-links",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
         "comments": "",
         "outputs": 1,
         "x": 2029.8833312988281,
-        "y": 204,
-        "z": "8bd89607.6248d8",
+        "y": 178.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "eed8a5a0.afccb8",
+        "id": "f6d3e50c.b329e8",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
         "x": 2054.883331298828,
-        "y": 116,
-        "z": "8bd89607.6248d8",
+        "y": 90.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "141349a5.fce93e",
+        "id": "300ce0be.29882",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
         "comments": "",
         "x": 1974.8833312988281,
-        "y": 250,
-        "z": "8bd89607.6248d8",
+        "y": 224.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "742662fc.5de6dc",
+        "id": "d020f647.b48948",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 2678.883331298828,
-        "y": 342,
-        "z": "8bd89607.6248d8",
+        "y": 316.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b4af8420.603268",
+        "id": "bf60182e.46d6e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 2678.820831298828,
-        "y": 391.1402587890625,
-        "z": "8bd89607.6248d8",
+        "y": 365.426025390625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c1b489c1.9564e8",
+        "id": "cbd25b41.5a644",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2680.820831298828,
-        "y": 442.1402587890625,
-        "z": "8bd89607.6248d8",
+        "y": 416.426025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "fcfb8da2.5eaaf8"
+                "365e9f97.d4a028"
             ]
         ]
     },
     {
-        "id": "fcfb8da2.5eaaf8",
+        "id": "365e9f97.d4a028",
         "type": "save",
         "name": "get allotted-resource relationship from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 2973.820831298828,
-        "y": 389.1402587890625,
-        "z": "8bd89607.6248d8",
+        "y": 363.426025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c3da29e4.d4aec",
-                "5d798b7c.bb38bc",
-                "f79e6540.82af6"
+                "6e92372c.3a07f8",
+                "c96fb012.9bb888",
+                "95b7cbb5.ac06c8"
             ]
         ]
     },
     {
-        "id": "5d798b7c.bb38bc",
+        "id": "c96fb012.9bb888",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3277.311767578125,
-        "y": 45.7142333984375,
-        "z": "8bd89607.6248d8",
+        "y": 20,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "90e8e37d.ca8e98"
+                "58ab1443.358994"
             ]
         ]
     },
     {
-        "id": "90e8e37d.ca8e98",
+        "id": "58ab1443.358994",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 3454.88330078125,
-        "y": 46,
-        "z": "8bd89607.6248d8",
+        "y": 20.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f79e6540.82af6",
+        "id": "95b7cbb5.ac06c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3272.82080078125,
-        "y": 95.1402587890625,
-        "z": "8bd89607.6248d8",
+        "y": 69.426025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9bf9393a.ada1c"
+                "1f97dde6.30f20a"
             ]
         ]
     },
     {
-        "id": "9bf9393a.ada1c",
+        "id": "1f97dde6.30f20a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3454.82080078125,
-        "y": 95.1402587890625,
-        "z": "8bd89607.6248d8",
+        "y": 69.426025390625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c3da29e4.d4aec",
+        "id": "6e92372c.3a07f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3276.82080078125,
-        "y": 146.1402587890625,
-        "z": "8bd89607.6248d8",
+        "y": 120.426025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "614d711.ad6151"
+                "7a25dc67.63046c"
             ]
         ]
     },
     {
-        "id": "614d711.ad6151",
+        "id": "7a25dc67.63046c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3456.82080078125,
-        "y": 146.1402587890625,
-        "z": "8bd89607.6248d8",
+        "y": 120.426025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6f9dfac6.7f7acc"
+                "742cdaa9.4808c4"
             ]
         ]
     },
     {
-        "id": "6f9dfac6.7f7acc",
+        "id": "742cdaa9.4808c4",
         "type": "switchNode",
         "name": "switch allotted-resource.relationship-list not empty",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2992.883331298828,
-        "y": 517,
-        "z": "8bd89607.6248d8",
+        "y": 491.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cc5d43a6.52dac",
-                "df06d31e.f926b8"
+                "9afa3e4f.f2f2c8",
+                "ce58b166.b2448"
             ]
         ]
     },
     {
-        "id": "df06d31e.f926b8",
+        "id": "ce58b166.b2448",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3332.88330078125,
-        "y": 288,
-        "z": "8bd89607.6248d8",
+        "y": 262.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc5d43a6.52dac",
+        "id": "9afa3e4f.f2f2c8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3331.88330078125,
-        "y": 342,
-        "z": "8bd89607.6248d8",
+        "y": 316.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9005c08e.45bff"
+                "aba0f7b5.b64ec8"
             ]
         ]
     },
     {
-        "id": "7cc4c3ab.96110c",
+        "id": "50f7604e.0c4dc8",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4076.88330078125,
-        "y": 296,
-        "z": "8bd89607.6248d8",
+        "y": 270.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e1ccec43.b4b718"
+                "e079a6c2.9c941"
             ]
         ]
     },
     {
-        "id": "e1ccec43.b4b718",
+        "id": "e079a6c2.9c941",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4253.8831787109375,
-        "y": 288.9998779296875,
-        "z": "8bd89607.6248d8",
+        "y": 263.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6a0eff2d.7a17d8",
-                "c12539fb.18b098"
+                "83280d27.4bae7",
+                "92c6fb1f.05a328"
             ]
         ]
     },
     {
-        "id": "9005c08e.45bff",
+        "id": "aba0f7b5.b64ec8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3495.88330078125,
-        "y": 268,
-        "z": "8bd89607.6248d8",
+        "y": 242.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c7cdd797.5d9c98",
-                "a2ea3a5e.b8028"
+                "a8c08369.0aef78",
+                "98755b5f.40e4a"
             ]
         ]
     },
     {
-        "id": "c7cdd797.5d9c98",
+        "id": "a8c08369.0aef78",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3776.88330078125,
-        "y": 224,
-        "z": "8bd89607.6248d8",
+        "y": 198.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "fdc5f0cb.fc2a38"
+                "64ebbb1e.14821c"
             ]
         ]
     },
     {
-        "id": "fdc5f0cb.fc2a38",
+        "id": "64ebbb1e.14821c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4038.88330078125,
-        "y": 224,
-        "z": "8bd89607.6248d8",
+        "y": 198.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7cc4c3ab.96110c"
+                "50f7604e.0c4dc8"
             ]
         ]
     },
     {
-        "id": "6a0eff2d.7a17d8",
+        "id": "83280d27.4bae7",
         "type": "set",
         "name": "set the 1st network-policy-id",
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
         "x": 4496.8831787109375,
-        "y": 245.9998779296875,
-        "z": "8bd89607.6248d8",
+        "y": 220.28564453125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c12539fb.18b098",
+        "id": "92c6fb1f.05a328",
         "type": "save",
         "name": "get network-policy from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
         "comments": "",
         "outputs": 1,
         "x": 4485.8831787109375,
-        "y": 300.9998779296875,
-        "z": "8bd89607.6248d8",
+        "y": 275.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "53e90890.b88808",
-                "99815c1a.2d5d9",
-                "ef9ec486.51c458"
+                "26a63936.d2dcb6",
+                "935c2a76.01522",
+                "61809f6c.f102a"
             ]
         ]
     },
     {
-        "id": "ef9ec486.51c458",
+        "id": "61809f6c.f102a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4738.88330078125,
-        "y": 187,
-        "z": "8bd89607.6248d8",
+        "y": 161.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "928a2f6e.9dcef"
+                "8483d549.4ff1d8"
             ]
         ]
     },
     {
-        "id": "928a2f6e.9dcef",
+        "id": "8483d549.4ff1d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 4887.454833984375,
-        "y": 187.2857666015625,
-        "z": "8bd89607.6248d8",
+        "y": 161.571533203125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5f26f831.604e6",
+        "id": "79f73429.37a0f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4886.392333984375,
-        "y": 231.426025390625,
-        "z": "8bd89607.6248d8",
+        "y": 205.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "99815c1a.2d5d9",
+        "id": "935c2a76.01522",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4727.392333984375,
-        "y": 231.426025390625,
-        "z": "8bd89607.6248d8",
+        "y": 205.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5f26f831.604e6"
+                "79f73429.37a0f4"
             ]
         ]
     },
     {
-        "id": "53e90890.b88808",
+        "id": "26a63936.d2dcb6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4734.392333984375,
-        "y": 310.426025390625,
-        "z": "8bd89607.6248d8",
+        "y": 284.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c7f5e24b.264e08"
+                "4efa868e.4aaf8"
             ]
         ]
     },
     {
-        "id": "c7f5e24b.264e08",
+        "id": "4efa868e.4aaf8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -793,203 +793,203 @@
         "comments": "",
         "outputs": 1,
         "x": 4873.392333984375,
-        "y": 310.426025390625,
-        "z": "8bd89607.6248d8",
+        "y": 284.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bd533599.870598",
-                "5b846fca.358228"
+                "ac693539.f50e98",
+                "9a31854c.efaef8"
             ]
         ]
     },
     {
-        "id": "bd533599.870598",
+        "id": "ac693539.f50e98",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
         "x": 5078.88330078125,
-        "y": 308,
-        "z": "8bd89607.6248d8",
+        "y": 282.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5b846fca.358228",
+        "id": "9a31854c.efaef8",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
         "x": 5077.88330078125,
-        "y": 354,
-        "z": "8bd89607.6248d8",
+        "y": 328.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a2ea3a5e.b8028",
+        "id": "98755b5f.40e4a",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3593.88330078125,
-        "y": 340,
-        "z": "8bd89607.6248d8",
+        "y": 314.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "25258bcb.d218b4"
+                "a599949c.47c2"
             ]
         ]
     },
     {
-        "id": "25258bcb.d218b4",
+        "id": "a599949c.47c2",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3873.88330078125,
-        "y": 340,
-        "z": "8bd89607.6248d8",
+        "y": 314.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f26cca47.0cf8c8"
+                "9f30fb79.9864f8"
             ]
         ]
     },
     {
-        "id": "f26cca47.0cf8c8",
+        "id": "9f30fb79.9864f8",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2256.8834533691406,
-        "y": 829.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 803.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d5f97832.254d88"
+                "4497a7be.db159"
             ]
         ]
     },
     {
-        "id": "d5f97832.254d88",
+        "id": "4497a7be.db159",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2433.883331298828,
-        "y": 822,
-        "z": "8bd89607.6248d8",
+        "y": 796.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ae5af3.3e9a4d1",
-                "12544593.6754f2"
+                "748da704.3dc228",
+                "132fdd9a.6a584a"
             ]
         ]
     },
     {
-        "id": "ae5af3.3e9a4d1",
+        "id": "748da704.3dc228",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
         "x": 2676.883331298828,
-        "y": 779,
-        "z": "8bd89607.6248d8",
+        "y": 753.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "12544593.6754f2",
+        "id": "132fdd9a.6a584a",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
         "x": 2665.883331298828,
-        "y": 834,
-        "z": "8bd89607.6248d8",
+        "y": 808.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "79a8fecf.d1f59",
-                "b24729e3.47e65",
-                "4a9529bf.26c65"
+                "1d5c52ad.8a4fcd",
+                "c6fd8eb5.369a58",
+                "b0ba9e98.5ef29"
             ]
         ]
     },
     {
-        "id": "79a8fecf.d1f59",
+        "id": "1d5c52ad.8a4fcd",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2957.374298095703,
-        "y": 812.573974609375,
-        "z": "8bd89607.6248d8",
+        "y": 786.8597412109375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d25941f1.946b68"
+                "81786826.f1adc"
             ]
         ]
     },
     {
-        "id": "b24729e3.47e65",
+        "id": "c6fd8eb5.369a58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2945.883331298828,
-        "y": 857,
-        "z": "8bd89607.6248d8",
+        "y": 831.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "11547725.a203f9"
+                "568abbfd.c78f14"
             ]
         ]
     },
     {
-        "id": "d25941f1.946b68",
+        "id": "81786826.f1adc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 3105.945831298828,
-        "y": 812.8597412109375,
-        "z": "8bd89607.6248d8",
+        "y": 787.1455078125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "11547725.a203f9",
+        "id": "568abbfd.c78f14",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3104.883331298828,
-        "y": 857,
-        "z": "8bd89607.6248d8",
+        "y": 831.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4a9529bf.26c65",
+        "id": "b0ba9e98.5ef29",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2952.883331298828,
-        "y": 936,
-        "z": "8bd89607.6248d8",
+        "y": 910.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a4fd9348.176d48"
+                "56d4032d.446f0c"
             ]
         ]
     },
     {
-        "id": "a4fd9348.176d48",
+        "id": "56d4032d.446f0c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -997,867 +997,867 @@
         "comments": "",
         "outputs": 1,
         "x": 3091.883331298828,
-        "y": 936,
-        "z": "8bd89607.6248d8",
-        "wires": [
-            [
-                "6c4953ff.9536c4",
-                "757555b7.a275b4",
-                "da8313.90b574f",
-                "a53e9db6.011d6",
-                "2b20579c.df8a7",
-                "1abe7496.3f7c9b",
-                "652968a1.d93e88",
-                "f369a6e9.5de548",
-                "fc221d76.582c9",
-                "5fd92a3e.ed6fec",
-                "4a864e6a.471e",
-                "e264db5d.2744d",
-                "afaae138.bb9798",
-                "121ba89c.f4d387",
-                "e7a924f9.c6032",
-                "e3b4a4d3.b60598",
-                "22dcd918.a9e88e",
-                "1743864d.d3d2f2",
-                "898efbe9.b7aab8",
-                "3ddfa25a.4bc3f6",
-                "f7bdbced.e4e6e",
-                "b2f7d29a.c36bc8"
-            ]
-        ]
-    },
-    {
-        "id": "3c4bd54a.0e1cfa",
+        "y": 910.2857666015625,
+        "z": "1806503a.76a7a",
+        "wires": [
+            [
+                "a588efb1.b17fd",
+                "9c7e31dc.43bc2",
+                "64cc49aa.338118",
+                "a266d487.c02dd",
+                "f1099f4d.7efe5",
+                "6aa3951e.157a4c",
+                "4618e1c0.461d88",
+                "d38e0865.514348",
+                "eef6ad07.9c7d5",
+                "78d4922e.8ebe04",
+                "c220ecdf.76a978",
+                "940f9aa.5464fe8",
+                "14f1d608.fff342",
+                "5e5dd175.2ee1b",
+                "95f11825.f517d8",
+                "79dba259.2612cc",
+                "11c024cf.1cb7db",
+                "8bfce836.dcd148",
+                "ec6aad53.7d628",
+                "c02bc34.16c814",
+                "ad2e0fde.b44de8",
+                "d87e7a94.9bda08"
+            ]
+        ]
+    },
+    {
+        "id": "6986f9e3.b25bc8",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 3435.883270263672,
-        "y": 410,
-        "z": "8bd89607.6248d8",
+        "y": 384.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "6c4953ff.9536c4",
+        "id": "a588efb1.b17fd",
         "type": "execute",
         "name": "execute UUID generator for otn-tunnel-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 3416.883270263672,
-        "y": 510,
-        "z": "8bd89607.6248d8",
+        "y": 484.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e264db5d.2744d",
+        "id": "940f9aa.5464fe8",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
         "x": 3370.883270263672,
-        "y": 561,
-        "z": "8bd89607.6248d8",
+        "y": 535.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "757555b7.a275b4",
+        "id": "9c7e31dc.43bc2",
         "type": "set",
         "name": "set network-route-one",
         "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
         "comments": "",
         "x": 3344.883270263672,
-        "y": 610,
-        "z": "8bd89607.6248d8",
+        "y": 584.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "da8313.90b574f",
+        "id": "64cc49aa.338118",
         "type": "set",
         "name": "set network-route-two",
         "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
         "x": 3343.883270263672,
-        "y": 659,
-        "z": "8bd89607.6248d8",
+        "y": 633.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a53e9db6.011d6",
+        "id": "a266d487.c02dd",
         "type": "save",
         "name": "get network-route-one from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
         "comments": "",
         "outputs": 1,
         "x": 3352.883270263672,
-        "y": 797,
-        "z": "8bd89607.6248d8",
+        "y": 771.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cca9aa9c.5b4b58",
-                "6d66b175.a27548",
-                "6cf4995a.fab31"
+                "1276721a.95abce",
+                "59c480c0.a5bb2",
+                "56433b78.3dde04"
             ]
         ]
     },
     {
-        "id": "2b20579c.df8a7",
+        "id": "f1099f4d.7efe5",
         "type": "save",
         "name": "get network-route-two from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
         "comments": "",
         "outputs": 1,
         "x": 3345.883270263672,
-        "y": 857.9998779296875,
-        "z": "8bd89607.6248d8",
+        "y": 832.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a115586d.1910d8",
-                "61de0330.a424c4",
-                "89e5a0b3.03b87"
+                "194bfca3.59d3d3",
+                "f16b27ad.e4a0d",
+                "a3a5e961.07f0a"
             ]
         ]
     },
     {
-        "id": "cca9aa9c.5b4b58",
+        "id": "1276721a.95abce",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3601.883026123047,
-        "y": 692,
-        "z": "8bd89607.6248d8",
+        "y": 666.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "294610ae.745698"
+                "5d3d475c.e8e038"
             ]
         ]
     },
     {
-        "id": "6d66b175.a27548",
+        "id": "59c480c0.a5bb2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3595.392059326172,
-        "y": 733.426025390625,
-        "z": "8bd89607.6248d8",
+        "y": 707.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "61b00039.d9b688"
+                "c3e2bb46.01e6a"
             ]
         ]
     },
     {
-        "id": "6cf4995a.fab31",
+        "id": "56433b78.3dde04",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3590.392059326172,
-        "y": 783.426025390625,
-        "z": "8bd89607.6248d8",
+        "y": 757.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1fe35696.f7e9f9"
+                "1b66d741.6f4631"
             ]
         ]
     },
     {
-        "id": "294610ae.745698",
+        "id": "5d3d475c.e8e038",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 3750.454559326172,
-        "y": 691.2857666015625,
-        "z": "8bd89607.6248d8",
+        "y": 665.571533203125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "61b00039.d9b688",
+        "id": "c3e2bb46.01e6a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3740.392059326172,
-        "y": 741.426025390625,
-        "z": "8bd89607.6248d8",
+        "y": 715.7117919921875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a115586d.1910d8",
+        "id": "194bfca3.59d3d3",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3566.883270263672,
-        "y": 843.9998779296875,
-        "z": "8bd89607.6248d8",
+        "y": 818.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "807fba07.07f6d"
+                "8a4c46dd.2c996"
             ]
         ]
     },
     {
-        "id": "61de0330.a424c4",
+        "id": "f16b27ad.e4a0d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3562.392303466797,
-        "y": 893.4259033203125,
-        "z": "8bd89607.6248d8",
+        "y": 867.711669921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9f751353.b361d"
+                "171f1743.fcb899"
             ]
         ]
     },
     {
-        "id": "89e5a0b3.03b87",
+        "id": "a3a5e961.07f0a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3563.392303466797,
-        "y": 946.4259033203125,
-        "z": "8bd89607.6248d8",
+        "y": 920.711669921875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "17e5ea49.0fe58e"
+                "c731b8e7.238d38"
             ]
         ]
     },
     {
-        "id": "807fba07.07f6d",
+        "id": "8a4c46dd.2c996",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 3719.4546508789062,
-        "y": 849.28564453125,
-        "z": "8bd89607.6248d8",
+        "y": 823.5714111328125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9f751353.b361d",
+        "id": "171f1743.fcb899",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3705.392303466797,
-        "y": 893.4259033203125,
-        "z": "8bd89607.6248d8",
+        "y": 867.711669921875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1fe35696.f7e9f9",
+        "id": "1b66d741.6f4631",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3762.883026123047,
-        "y": 794,
-        "z": "8bd89607.6248d8",
+        "y": 768.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6a90f954.4bce88"
+                "cecd018.605a88"
             ]
         ]
     },
     {
-        "id": "17e5ea49.0fe58e",
+        "id": "c731b8e7.238d38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3716.883270263672,
-        "y": 945.9998779296875,
-        "z": "8bd89607.6248d8",
+        "y": 920.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f51128b5.0b454"
+                "f9f52da3.b95878"
             ]
         ]
     },
     {
-        "id": "6a90f954.4bce88",
+        "id": "cecd018.605a88",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3923.883270263672,
-        "y": 681,
-        "z": "8bd89607.6248d8",
+        "y": 655.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d28de3c8.def278",
-                "32596d77.fd201a",
-                "c2039341.ed7fe"
+                "f0539c95.2ea1d",
+                "44b1b904.08834",
+                "41d8ce05.5caae"
             ]
         ]
     },
     {
-        "id": "f51128b5.0b454",
+        "id": "f9f52da3.b95878",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3915.883270263672,
-        "y": 866,
-        "z": "8bd89607.6248d8",
+        "y": 840.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6179a2a6.c7a764",
-                "6a08da95.c46784",
-                "49cd1e6.2c21e6"
+                "abd0f375.c30ff",
+                "eba9832a.ffee4",
+                "4bc67983.47c6f"
             ]
         ]
     },
     {
-        "id": "d28de3c8.def278",
+        "id": "f0539c95.2ea1d",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4147.883758544922,
-        "y": 384.99993896484375,
-        "z": "8bd89607.6248d8",
+        "y": 359.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "af392071.289a38"
+                "653aef18.035f68"
             ]
         ]
     },
     {
-        "id": "32596d77.fd201a",
+        "id": "44b1b904.08834",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4149.883758544922,
-        "y": 438.99993896484375,
-        "z": "8bd89607.6248d8",
+        "y": 413.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7fbb2a1.f3ae954"
+                "4456e14a.c61538"
             ]
         ]
     },
     {
-        "id": "6179a2a6.c7a764",
+        "id": "abd0f375.c30ff",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4113.883758544922,
-        "y": 645,
-        "z": "8bd89607.6248d8",
+        "y": 619.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "92f10d9d.0be95"
+                "dc25cb2f.e0da48"
             ]
         ]
     },
     {
-        "id": "6a08da95.c46784",
+        "id": "eba9832a.ffee4",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4115.883758544922,
-        "y": 699,
-        "z": "8bd89607.6248d8",
+        "y": 673.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bbb0db7f.fd9908"
+                "7b200b08.d1724c"
             ]
         ]
     },
     {
-        "id": "892e5669.1ea2b",
+        "id": "a11ab8.c3c2f548",
         "type": "set",
         "name": "set network-route-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
         "x": 4457.883758544922,
-        "y": 336.99993896484375,
-        "z": "8bd89607.6248d8",
+        "y": 311.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6a564e86.c1193",
+        "id": "7e53eaf1.53c434",
         "type": "set",
         "name": "set network-route-LEAF",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
         "x": 4450.883758544922,
-        "y": 434.99993896484375,
-        "z": "8bd89607.6248d8",
+        "y": 409.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a3abd24c.7a5ec",
+        "id": "231b0ffb.372688",
         "type": "set",
         "name": "set network-route-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4429.883758544922,
-        "y": 618,
-        "z": "8bd89607.6248d8",
+        "y": 592.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "dc9fae61.a17b2",
+        "id": "1b4ef1ae.221bae",
         "type": "set",
         "name": "set network-route-LEAF",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4433.883758544922,
-        "y": 711,
-        "z": "8bd89607.6248d8",
+        "y": 685.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "50eeb433.a27fd4",
+        "id": "f61c43e6.4dbe28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3609.88330078125,
-        "y": 1371,
-        "z": "8bd89607.6248d8",
+        "y": 1345.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c94a30c2.a398b"
+                "58e01c76.2a233c"
             ]
         ]
     },
     {
-        "id": "a408ed17.7674d",
+        "id": "f239d755.e3888",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3619.374267578125,
-        "y": 1413.5740356445312,
-        "z": "8bd89607.6248d8",
+        "y": 1387.8598022460938,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "82ef970c.862378"
+                "ffe24b12.95af4"
             ]
         ]
     },
     {
-        "id": "3bc8671c.26c7e",
+        "id": "7fecb9.d188bb48",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3607.88330078125,
-        "y": 1460,
-        "z": "8bd89607.6248d8",
+        "y": 1434.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5a6a5226.7899ec"
+                "6af9609c.4c1ea"
             ]
         ]
     },
     {
-        "id": "246e8fda.9e3d88",
+        "id": "6132f0e6.1cd1a8",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
         "x": 3309.88330078125,
-        "y": 1333,
-        "z": "8bd89607.6248d8",
+        "y": 1307.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "652968a1.d93e88",
+        "id": "4618e1c0.461d88",
         "type": "save",
         "name": "get p-interface-src from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3352.88330078125,
-        "y": 1398,
-        "z": "8bd89607.6248d8",
+        "y": 1372.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "50eeb433.a27fd4",
-                "a408ed17.7674d",
-                "3bc8671c.26c7e"
+                "f61c43e6.4dbe28",
+                "f239d755.e3888",
+                "7fecb9.d188bb48"
             ]
         ]
     },
     {
-        "id": "1abe7496.3f7c9b",
+        "id": "6aa3951e.157a4c",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3353.883270263672,
-        "y": 1150,
-        "z": "8bd89607.6248d8",
+        "y": 1124.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "56f8321f.20ee54",
-                "27baf83a.a648a"
+                "273ca4a1.1ba064",
+                "4a30eba.076bb14"
             ]
         ]
     },
     {
-        "id": "27baf83a.a648a",
+        "id": "4a30eba.076bb14",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3576.883270263672,
-        "y": 1136,
-        "z": "8bd89607.6248d8",
+        "y": 1110.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "89fdb9b4.3821e8"
+                "3b0c1a6c.5d807e"
             ]
         ]
     },
     {
-        "id": "56f8321f.20ee54",
+        "id": "273ca4a1.1ba064",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3578.883270263672,
-        "y": 1169,
-        "z": "8bd89607.6248d8",
+        "y": 1143.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bd796d50.897138"
+                "1277d9f.69171a6"
             ]
         ]
     },
     {
-        "id": "c94a30c2.a398b",
+        "id": "58e01c76.2a233c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3782.5498046875,
-        "y": 1370,
-        "z": "8bd89607.6248d8",
+        "y": 1344.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5b1520ee.c993d8",
-                "92906f1e.302de8"
+                "f718a065.a6f86",
+                "66055190.fb6538"
             ]
         ]
     },
     {
-        "id": "82ef970c.862378",
+        "id": "ffe24b12.95af4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 3772.9456787109375,
-        "y": 1416.8597717285156,
-        "z": "8bd89607.6248d8",
+        "y": 1391.1455383300781,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5a6a5226.7899ec",
+        "id": "6af9609c.4c1ea",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3776.88330078125,
-        "y": 1461,
-        "z": "8bd89607.6248d8",
+        "y": 1435.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5b1520ee.c993d8",
+        "id": "f718a065.a6f86",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4046.88330078125,
-        "y": 1354,
-        "z": "8bd89607.6248d8",
+        "y": 1328.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "40f95927.3e48a8",
-                "155b2019.4d901"
+                "97c35025.9a9a9",
+                "3a478d5e.f8179a"
             ]
         ]
     },
     {
-        "id": "155b2019.4d901",
+        "id": "3a478d5e.f8179a",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4269.88330078125,
-        "y": 1309,
-        "z": "8bd89607.6248d8",
+        "y": 1283.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8cff212e.fd093"
+                "e66b8dbe.739f2"
             ]
         ]
     },
     {
-        "id": "40f95927.3e48a8",
+        "id": "97c35025.9a9a9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4271.88330078125,
-        "y": 1373,
-        "z": "8bd89607.6248d8",
+        "y": 1347.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9ea2b228.156828"
+                "8b5a4d36.3a2bb8"
             ]
         ]
     },
     {
-        "id": "9ea2b228.156828",
+        "id": "8b5a4d36.3a2bb8",
         "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": 4433.88330078125,
-        "y": 1369,
-        "z": "8bd89607.6248d8",
+        "y": 1343.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8cff212e.fd093",
+        "id": "e66b8dbe.739f2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4434.88330078125,
-        "y": 1306,
-        "z": "8bd89607.6248d8",
+        "y": 1280.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ea39175a.08155",
-                "81bb5906.bb1848"
+                "9ab6076f.b64fb",
+                "39801818.ba2ad"
             ]
         ]
     },
     {
-        "id": "bd796d50.897138",
+        "id": "1277d9f.69171a6",
         "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": 3721.883270263672,
-        "y": 1166,
-        "z": "8bd89607.6248d8",
+        "y": 1140.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "89fdb9b4.3821e8",
+        "id": "3b0c1a6c.5d807e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3724.883270263672,
-        "y": 1129,
-        "z": "8bd89607.6248d8",
+        "y": 1103.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "242e596.6a45da6",
-                "c522f465.9b1b48"
+                "67f68b93.dc06f4",
+                "41f439c7.6c07f8"
             ]
         ]
     },
     {
-        "id": "242e596.6a45da6",
+        "id": "67f68b93.dc06f4",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
         "x": 3916.883270263672,
-        "y": 1131,
-        "z": "8bd89607.6248d8",
+        "y": 1105.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "92906f1e.302de8",
+        "id": "66055190.fb6538",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 4006.88330078125,
-        "y": 1486,
-        "z": "8bd89607.6248d8",
+        "y": 1460.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9d7e97d1.f3da4"
+                "c328fdc0.a05af"
             ]
         ]
     },
     {
-        "id": "9d7e97d1.f3da4",
+        "id": "c328fdc0.a05af",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4212.88330078125,
-        "y": 1486,
-        "z": "8bd89607.6248d8",
+        "y": 1460.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "39469ddd.cce81a"
+                "23ec2727.c8e7f"
             ]
         ]
     },
     {
-        "id": "39469ddd.cce81a",
+        "id": "23ec2727.c8e7f",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4428.1689453125,
-        "y": 1485.82177734375,
-        "z": "8bd89607.6248d8",
+        "y": 1460.1075439453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "286435fd.520a92"
+                "e1b77e00.282c4"
             ]
         ]
     },
     {
-        "id": "c522f465.9b1b48",
+        "id": "41f439c7.6c07f8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3913.883270263672,
-        "y": 1196,
-        "z": "8bd89607.6248d8",
+        "y": 1170.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9a817681.2b7108",
-                "845c0857.7834f8",
-                "aae3c73d.eac74"
+                "89a8d2d0.88f3",
+                "6334a351.696854",
+                "c542e0e0.bf42b"
             ]
         ]
     },
     {
-        "id": "9a817681.2b7108",
+        "id": "89a8d2d0.88f3",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4109.383392333984,
-        "y": 1148,
-        "z": "8bd89607.6248d8",
+        "y": 1122.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d82b3eae.4c278"
+                "c62cbf2d.6fa458"
             ]
         ]
     },
     {
-        "id": "845c0857.7834f8",
+        "id": "6334a351.696854",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4101.383392333984,
-        "y": 1203,
-        "z": "8bd89607.6248d8",
+        "y": 1177.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c5b5dd85.a284c8"
+                "143c4bf3.014b4c"
             ]
         ]
     },
     {
-        "id": "aae3c73d.eac74",
+        "id": "c542e0e0.bf42b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4106.383392333984,
-        "y": 1260,
-        "z": "8bd89607.6248d8",
+        "y": 1234.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "535d5ed7.3fd4e"
+                "ca788cf9.3c8038"
             ]
         ]
     },
     {
-        "id": "535d5ed7.3fd4e",
+        "id": "ca788cf9.3c8038",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4258.383392333984,
-        "y": 1261,
-        "z": "8bd89607.6248d8",
+        "y": 1235.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c5b5dd85.a284c8",
+        "id": "143c4bf3.014b4c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4269.383392333984,
-        "y": 1206,
-        "z": "8bd89607.6248d8",
+        "y": 1180.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d82b3eae.4c278",
+        "id": "c62cbf2d.6fa458",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -1865,345 +1865,345 @@
         "comments": "",
         "outputs": 1,
         "x": 4253.765716552734,
-        "y": 1145.6556701660156,
-        "z": "8bd89607.6248d8",
+        "y": 1119.9414367675781,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5176f492.5f7e8c"
+                "aab3feab.bcb5b"
             ]
         ]
     },
     {
-        "id": "5176f492.5f7e8c",
+        "id": "aab3feab.bcb5b",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 4447.883270263672,
-        "y": 1189.9999389648438,
-        "z": "8bd89607.6248d8",
+        "y": 1164.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1d42fe6d.851b3a"
+                "ac9dba33.9ee3a8"
             ]
         ]
     },
     {
-        "id": "81bb5906.bb1848",
+        "id": "39801818.ba2ad",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
         "x": 4604.88330078125,
-        "y": 1264,
-        "z": "8bd89607.6248d8",
+        "y": 1238.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ea39175a.08155",
+        "id": "9ab6076f.b64fb",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
         "x": 4605.88330078125,
-        "y": 1372,
-        "z": "8bd89607.6248d8",
+        "y": 1346.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ea0872ed.58cfa",
+        "id": "6381354a.11146c",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
         "x": 4606.88330078125,
-        "y": 1321,
-        "z": "8bd89607.6248d8",
+        "y": 1295.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "286435fd.520a92",
+        "id": "e1b77e00.282c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4635.00048828125,
-        "y": 1486.34033203125,
-        "z": "8bd89607.6248d8",
+        "y": 1460.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b0e3cfe1.6d40f",
-                "7126b880.f67e48",
-                "ad3a7086.abf6b"
+                "a1ad6a91.cdad1",
+                "bef51671.772a1",
+                "55e08f7a.b87978"
             ]
         ]
     },
     {
-        "id": "b0e3cfe1.6d40f",
+        "id": "a1ad6a91.cdad1",
         "type": "set",
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 4850.00048828125,
-        "y": 1448.34033203125,
-        "z": "8bd89607.6248d8",
+        "y": 1422.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7126b880.f67e48",
+        "id": "bef51671.772a1",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4847.00048828125,
-        "y": 1487.34033203125,
-        "z": "8bd89607.6248d8",
+        "y": 1461.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7a65c420.1080dc"
+                "db81e8e0.68e13"
             ]
         ]
     },
     {
-        "id": "ad3a7086.abf6b",
+        "id": "55e08f7a.b87978",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4802.50048828125,
-        "y": 1529.34033203125,
-        "z": "8bd89607.6248d8",
+        "y": 1503.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7a65c420.1080dc",
+        "id": "db81e8e0.68e13",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5027.50048828125,
-        "y": 1486.34033203125,
-        "z": "8bd89607.6248d8",
+        "y": 1460.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "96c8a7ed.e41958"
+                "52661a57.fe0a3c"
             ]
         ]
     },
     {
-        "id": "90470a6f.8ef5f8",
+        "id": "409a042d.2fadac",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4835.88330078125,
-        "y": 1082,
-        "z": "8bd89607.6248d8",
+        "y": 1056.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e5efb625.18037"
+                "f76f51b8.a98b3"
             ]
         ]
     },
     {
-        "id": "e5efb625.18037",
+        "id": "f76f51b8.a98b3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5012.88330078125,
-        "y": 1074,
-        "z": "8bd89607.6248d8",
+        "y": 1048.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "732587d3.ab7a9",
-                "4baffabc.103f3c"
+                "f1cd5bd3.ddbdb8",
+                "b8b89faf.7ac19"
             ]
         ]
     },
     {
-        "id": "1d42fe6d.851b3a",
+        "id": "ac9dba33.9ee3a8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4638.883270263672,
-        "y": 1179.9999389648438,
-        "z": "8bd89607.6248d8",
+        "y": 1154.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "90470a6f.8ef5f8",
-                "6cae07e7.8ff81"
+                "409a042d.2fadac",
+                "80f5aaec.b0ffc8"
             ]
         ]
     },
     {
-        "id": "6cae07e7.8ff81",
+        "id": "80f5aaec.b0ffc8",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
         "x": 4838.88330078125,
-        "y": 1156,
-        "z": "8bd89607.6248d8",
+        "y": 1130.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8681155.73991e8"
+                "bf72647d.49f538"
             ]
         ]
     },
     {
-        "id": "8681155.73991e8",
+        "id": "bf72647d.49f538",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5015.88330078125,
-        "y": 1148,
-        "z": "8bd89607.6248d8",
+        "y": 1122.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c2e2c331.f24d7"
+                "97239b14.6f12c8"
             ]
         ]
     },
     {
-        "id": "96c8a7ed.e41958",
+        "id": "52661a57.fe0a3c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5185.50048828125,
-        "y": 1486.34033203125,
-        "z": "8bd89607.6248d8",
+        "y": 1460.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d73ce805.51d21"
+                "5700a19e.1dbeb8"
             ]
         ]
     },
     {
-        "id": "d73ce805.51d21",
+        "id": "5700a19e.1dbeb8",
         "type": "set",
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
         "x": 5392.50048828125,
-        "y": 1486.34033203125,
-        "z": "8bd89607.6248d8",
+        "y": 1460.6260986328125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4baffabc.103f3c",
+        "id": "b8b89faf.7ac19",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 5220.88330078125,
-        "y": 1081,
-        "z": "8bd89607.6248d8",
+        "y": 1055.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "276c589.f8898a8",
-                "b6b78749.64c52",
-                "710e31ca.f7c328"
+                "5d74c4c9.fd207c",
+                "bdb7d238.f96a08",
+                "7cf71a83.19030c"
             ]
         ]
     },
     {
-        "id": "732587d3.ab7a9",
+        "id": "f1cd5bd3.ddbdb8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5250.88330078125,
-        "y": 1029,
-        "z": "8bd89607.6248d8",
+        "y": 1003.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "276c589.f8898a8",
+        "id": "5d74c4c9.fd207c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5430.88330078125,
-        "y": 1072,
-        "z": "8bd89607.6248d8",
+        "y": 1046.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6595904d.14fc"
+                "e430f4b5.90b5d"
             ]
         ]
     },
     {
-        "id": "b6b78749.64c52",
+        "id": "bdb7d238.f96a08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5422.88330078125,
-        "y": 1127,
-        "z": "8bd89607.6248d8",
+        "y": 1101.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "870ff6d4.3b5618"
+                "46b0e213.0f69d4"
             ]
         ]
     },
     {
-        "id": "710e31ca.f7c328",
+        "id": "7cf71a83.19030c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5427.88330078125,
-        "y": 1184,
-        "z": "8bd89607.6248d8",
+        "y": 1158.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "14dafdf8.cfb5c2"
+                "99bfc958.cc2928"
             ]
         ]
     },
     {
-        "id": "14dafdf8.cfb5c2",
+        "id": "99bfc958.cc2928",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 5579.88330078125,
-        "y": 1185,
-        "z": "8bd89607.6248d8",
+        "y": 1159.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "870ff6d4.3b5618",
+        "id": "46b0e213.0f69d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 5590.88330078125,
-        "y": 1130,
-        "z": "8bd89607.6248d8",
+        "y": 1104.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6595904d.14fc",
+        "id": "e430f4b5.90b5d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2211,60 +2211,60 @@
         "comments": "",
         "outputs": 1,
         "x": 5575.265625,
-        "y": 1069.6556701660156,
-        "z": "8bd89607.6248d8",
+        "y": 1043.9414367675781,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4578d3b4.cc9aac"
+                "3d0751e6.cf382e"
             ]
         ]
     },
     {
-        "id": "c2e2c331.f24d7",
+        "id": "97239b14.6f12c8",
         "type": "set",
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5250.88330078125,
-        "y": 1272,
-        "z": "8bd89607.6248d8",
+        "y": 1246.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4578d3b4.cc9aac",
+        "id": "3d0751e6.cf382e",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 5789.88330078125,
-        "y": 1066,
-        "z": "8bd89607.6248d8",
+        "y": 1040.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d9f780b3.339398",
+        "id": "33b11d1b.98a69a",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
         "x": 4445.883758544922,
-        "y": 372.99993896484375,
-        "z": "8bd89607.6248d8",
+        "y": 347.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "eeaf4d12.9621",
+        "id": "2dc9cffb.3878b8",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
         "x": 4446.883728027344,
-        "y": 476.99993896484375,
-        "z": "8bd89607.6248d8",
+        "y": 451.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "af392071.289a38",
+        "id": "653aef18.035f68",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2272,17 +2272,17 @@
         "comments": "",
         "outputs": 1,
         "x": 4270.883758544922,
-        "y": 378.99993896484375,
-        "z": "8bd89607.6248d8",
+        "y": 353.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "892e5669.1ea2b",
-                "d9f780b3.339398"
+                "a11ab8.c3c2f548",
+                "33b11d1b.98a69a"
             ]
         ]
     },
     {
-        "id": "7fbb2a1.f3ae954",
+        "id": "4456e14a.c61538",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2290,17 +2290,17 @@
         "comments": "",
         "outputs": 1,
         "x": 4276.883758544922,
-        "y": 442.99993896484375,
-        "z": "8bd89607.6248d8",
+        "y": 417.28570556640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6a564e86.c1193",
-                "eeaf4d12.9621"
+                "7e53eaf1.53c434",
+                "2dc9cffb.3878b8"
             ]
         ]
     },
     {
-        "id": "92f10d9d.0be95",
+        "id": "dc25cb2f.e0da48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2308,17 +2308,17 @@
         "comments": "",
         "outputs": 1,
         "x": 4241.883758544922,
-        "y": 645,
-        "z": "8bd89607.6248d8",
+        "y": 619.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a3abd24c.7a5ec",
-                "d4111de3.168d5"
+                "231b0ffb.372688",
+                "3979d153.538ee6"
             ]
         ]
     },
     {
-        "id": "bbb0db7f.fd9908",
+        "id": "7b200b08.d1724c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2326,456 +2326,456 @@
         "comments": "",
         "outputs": 1,
         "x": 4244.883758544922,
-        "y": 698,
-        "z": "8bd89607.6248d8",
+        "y": 672.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "dc9fae61.a17b2",
-                "daba5f73.79ab3"
+                "1b4ef1ae.221bae",
+                "49dc9fac.676fe"
             ]
         ]
     },
     {
-        "id": "d4111de3.168d5",
+        "id": "3979d153.538ee6",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4415.883758544922,
-        "y": 658,
-        "z": "8bd89607.6248d8",
+        "y": 632.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "daba5f73.79ab3",
+        "id": "49dc9fac.676fe",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4418.883758544922,
-        "y": 749,
-        "z": "8bd89607.6248d8",
+        "y": 723.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f11652ec.f5ecc",
+        "id": "f7cb7391.6f67a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3741.88330078125,
-        "y": 1828.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1802.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2518ba78.6d21ae",
-                "ca887fb4.4fa748"
+                "9a5ca37c.910178",
+                "2a8d98c8.2c78a"
             ]
         ]
     },
     {
-        "id": "5d22eff5.ad4738",
+        "id": "fd44019f.688f6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3569.216796875,
-        "y": 1829.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1803.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f11652ec.f5ecc"
+                "f7cb7391.6f67a"
             ]
         ]
     },
     {
-        "id": "f62aa8b7.81c7a8",
+        "id": "3eb019bb.1ee706",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3578.707763671875,
-        "y": 1871.5741577148438,
-        "z": "8bd89607.6248d8",
+        "y": 1845.8599243164062,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3ccb36a1.cd58ba"
+                "f4d10bee.1b32c"
             ]
         ]
     },
     {
-        "id": "949b65da.c62778",
+        "id": "ef74e13b.116b3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3567.216796875,
-        "y": 1918.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1892.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b3008d52.d5dec"
+                "7a977b6c.124a74"
             ]
         ]
     },
     {
-        "id": "3ccb36a1.cd58ba",
+        "id": "f4d10bee.1b32c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 3732.2791748046875,
-        "y": 1874.8598937988281,
-        "z": "8bd89607.6248d8",
+        "y": 1849.1456604003906,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b3008d52.d5dec",
+        "id": "7a977b6c.124a74",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3736.216796875,
-        "y": 1919.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1893.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2518ba78.6d21ae",
+        "id": "9a5ca37c.910178",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4028.216796875,
-        "y": 1832.000244140625,
-        "z": "8bd89607.6248d8",
+        "y": 1806.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2fdbf5bd.c09292",
-                "9a5de981.0de7c"
+                "efd0a9b7.e547a8",
+                "caaf5e66.b1cb"
             ]
         ]
     },
     {
-        "id": "9a5de981.0de7c",
+        "id": "caaf5e66.b1cb",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4251.216796875,
-        "y": 1787.000244140625,
-        "z": "8bd89607.6248d8",
+        "y": 1761.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "82242071.f4a9f"
+                "5ec876cd.f1dea8"
             ]
         ]
     },
     {
-        "id": "2fdbf5bd.c09292",
+        "id": "efd0a9b7.e547a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4253.216796875,
-        "y": 1851.000244140625,
-        "z": "8bd89607.6248d8",
+        "y": 1825.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "56361c44.c984a4"
+                "72d34df6.13ce64"
             ]
         ]
     },
     {
-        "id": "56361c44.c984a4",
+        "id": "72d34df6.13ce64",
         "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": 4412.216796875,
-        "y": 1870.000244140625,
-        "z": "8bd89607.6248d8",
+        "y": 1844.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "82242071.f4a9f",
+        "id": "5ec876cd.f1dea8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4416.216796875,
-        "y": 1784.000244140625,
-        "z": "8bd89607.6248d8",
+        "y": 1758.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "10610dd4.f6c112",
-                "ddf5e2c4.67d9f8"
+                "2854b6e2.b50402",
+                "1fbd987b.e2c578"
             ]
         ]
     },
     {
-        "id": "fc221d76.582c9",
+        "id": "eef6ad07.9c7d5",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3341.216796875,
-        "y": 1864.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1838.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5d22eff5.ad4738",
-                "f62aa8b7.81c7a8",
-                "949b65da.c62778"
+                "fd44019f.688f6",
+                "3eb019bb.1ee706",
+                "ef74e13b.116b3"
             ]
         ]
     },
     {
-        "id": "322a186d.549ed",
+        "id": "46101f8f.1fb8b8",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
         "x": 3302.216796875,
-        "y": 1808.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1782.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f369a6e9.5de548",
+        "id": "d38e0865.514348",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3353.216796875,
-        "y": 1603,
-        "z": "8bd89607.6248d8",
+        "y": 1577.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cb8e448.206bab8",
-                "778779f6.be6098"
+                "f536d783.2e1028",
+                "54ea75a9.fca1c4"
             ]
         ]
     },
     {
-        "id": "778779f6.be6098",
+        "id": "54ea75a9.fca1c4",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3576.216796875,
-        "y": 1589,
-        "z": "8bd89607.6248d8",
+        "y": 1563.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4c771f34.9e70b8"
+                "3ffa66c6.048e62"
             ]
         ]
     },
     {
-        "id": "cb8e448.206bab8",
+        "id": "f536d783.2e1028",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3578.216796875,
-        "y": 1622,
-        "z": "8bd89607.6248d8",
+        "y": 1596.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7c64438a.ff9f5c"
+                "73c7be78.48771"
             ]
         ]
     },
     {
-        "id": "7c64438a.ff9f5c",
+        "id": "73c7be78.48771",
         "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": 3721.216796875,
-        "y": 1619,
-        "z": "8bd89607.6248d8",
+        "y": 1593.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4c771f34.9e70b8",
+        "id": "3ffa66c6.048e62",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3724.216796875,
-        "y": 1582,
-        "z": "8bd89607.6248d8",
+        "y": 1556.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8b5ae92b.18937",
-                "acd78677.da7398"
+                "116bcef1.41b689",
+                "bd9fbc09.ccb15"
             ]
         ]
     },
     {
-        "id": "8b5ae92b.18937",
+        "id": "116bcef1.41b689",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
         "x": 3918.216796875,
-        "y": 1585.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1559.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ca887fb4.4fa748",
+        "id": "2a8d98c8.2c78a",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3969.216766357422,
-        "y": 1965,
-        "z": "8bd89607.6248d8",
+        "y": 1939.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d3ca912e.f0454"
+                "821e2eef.7d9ce8"
             ]
         ]
     },
     {
-        "id": "d3ca912e.f0454",
+        "id": "821e2eef.7d9ce8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4175.216766357422,
-        "y": 1965,
-        "z": "8bd89607.6248d8",
+        "y": 1939.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e775983e.c87c6"
+                "b9228d23.f35b1"
             ]
         ]
     },
     {
-        "id": "e775983e.c87c6",
+        "id": "b9228d23.f35b1",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4392.502410888672,
-        "y": 1963.82177734375,
-        "z": "8bd89607.6248d8",
+        "y": 1938.1075439453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8510e412.3775c"
+                "1db12922.ce9147"
             ]
         ]
     },
     {
-        "id": "acd78677.da7398",
+        "id": "bd9fbc09.ccb15",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3940.216796875,
-        "y": 1653.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1627.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e413099e.5580f8",
-                "73fbbbe6.41f3fc",
-                "be84a2f7.e2d8"
+                "71a75cfd.cb2324",
+                "c5a92d1c.748898",
+                "d4c41231.0d38f"
             ]
         ]
     },
     {
-        "id": "e413099e.5580f8",
+        "id": "71a75cfd.cb2324",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4135.7169189453125,
-        "y": 1605.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1579.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6607b5e0.cc2a14"
+                "55c143a3.bf5e9c"
             ]
         ]
     },
     {
-        "id": "73fbbbe6.41f3fc",
+        "id": "c5a92d1c.748898",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4127.7169189453125,
-        "y": 1660.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1634.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c946d76.aa97f28"
+                "a19a5afd.bfc2c"
             ]
         ]
     },
     {
-        "id": "be84a2f7.e2d8",
+        "id": "d4c41231.0d38f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4132.7169189453125,
-        "y": 1717.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1691.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "55c1c0e2.5aae38"
+                "5c56b620.c82d88"
             ]
         ]
     },
     {
-        "id": "55c1c0e2.5aae38",
+        "id": "5c56b620.c82d88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4284.7169189453125,
-        "y": 1718.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1692.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c946d76.aa97f28",
+        "id": "a19a5afd.bfc2c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4295.7169189453125,
-        "y": 1663.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1637.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6607b5e0.cc2a14",
+        "id": "55c143a3.bf5e9c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -2783,356 +2783,356 @@
         "comments": "",
         "outputs": 1,
         "x": 4280.0992431640625,
-        "y": 1602.6557922363281,
-        "z": "8bd89607.6248d8",
+        "y": 1576.9415588378906,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "eb6f70d5.e0fd88"
+                "79a34acd.c9a0bc"
             ]
         ]
     },
     {
-        "id": "10610dd4.f6c112",
+        "id": "2854b6e2.b50402",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
         "x": 4586.216796875,
-        "y": 1745.000244140625,
-        "z": "8bd89607.6248d8",
+        "y": 1719.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ddf5e2c4.67d9f8",
+        "id": "1fbd987b.e2c578",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
         "x": 4587.216796875,
-        "y": 1850.000244140625,
-        "z": "8bd89607.6248d8",
+        "y": 1824.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f866aa99.a64d6",
+        "id": "8823cb9b.b21f5",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
         "x": 4582.216796875,
-        "y": 1799.000244140625,
-        "z": "8bd89607.6248d8",
+        "y": 1773.2860107421875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8510e412.3775c",
+        "id": "1db12922.ce9147",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4599.333953857422,
-        "y": 1953.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 1927.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3eb610b6.e19958",
-                "2b4d2f26.4fc18",
-                "56b44513.ed17bc"
+                "4fe8713d.4f503",
+                "c4b73dd8.f86748",
+                "cf5e37a1.834b48"
             ]
         ]
     },
     {
-        "id": "3eb610b6.e19958",
+        "id": "4fe8713d.4f503",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 4814.333953857422,
-        "y": 1915.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 1889.626220703125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2b4d2f26.4fc18",
+        "id": "c4b73dd8.f86748",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4811.333953857422,
-        "y": 1954.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 1928.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b7623c50.89af3"
+                "fd454717.5864e8"
             ]
         ]
     },
     {
-        "id": "56b44513.ed17bc",
+        "id": "cf5e37a1.834b48",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4766.833953857422,
-        "y": 1996.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 1970.626220703125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b7623c50.89af3",
+        "id": "fd454717.5864e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4991.833953857422,
-        "y": 1953.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 1927.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e2420b84.cbf938"
+                "6021f32a.54d8fc"
             ]
         ]
     },
     {
-        "id": "e2420b84.cbf938",
+        "id": "6021f32a.54d8fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5149.833953857422,
-        "y": 1953.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 1927.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d3754257.cdbb9"
+                "1a613df3.ff444a"
             ]
         ]
     },
     {
-        "id": "d3754257.cdbb9",
+        "id": "1a613df3.ff444a",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
         "x": 5356.833953857422,
-        "y": 1953.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 1927.626220703125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "303b1a28.56bd56",
+        "id": "1465bad2.a0d805",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4862.216796875,
-        "y": 1621.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1595.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8f6cdb8f.90967"
+                "f75a0195.2a4c5"
             ]
         ]
     },
     {
-        "id": "8f6cdb8f.90967",
+        "id": "f75a0195.2a4c5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5039.216796875,
-        "y": 1613.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1587.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5fcf484f.8e6e78",
-                "f4e9d00a.c60c9"
+                "1de23279.e8bad6",
+                "95237093.1f1c18"
             ]
         ]
     },
     {
-        "id": "eb6f70d5.e0fd88",
+        "id": "79a34acd.c9a0bc",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 4464.216796875,
-        "y": 1617.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1591.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "93bac5db.c9063"
+                "b5cddb2a.47fb5"
             ]
         ]
     },
     {
-        "id": "93bac5db.c9063",
+        "id": "b5cddb2a.47fb5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4659.216796875,
-        "y": 1617.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1591.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "303b1a28.56bd56",
-                "6dd697d7.ade42"
+                "1465bad2.a0d805",
+                "a6e303e4.3eb668"
             ]
         ]
     },
     {
-        "id": "f4e9d00a.c60c9",
+        "id": "95237093.1f1c18",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 5247.216796875,
-        "y": 1620.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1594.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "af18531c.f561e8",
-                "6d4f9387.cdc244",
-                "7f999aa.ecc8a64"
+                "2d3d2acb.c107b6",
+                "fb5337e0.94ced8",
+                "752448e6.ec72a8"
             ]
         ]
     },
     {
-        "id": "6e464f44.674b68",
+        "id": "6879e9be.d7aee",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5041.216796875,
-        "y": 1686.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1660.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c6202cfd.8bcb4"
+                "8691b2ec.22b9d8"
             ]
         ]
     },
     {
-        "id": "6dd697d7.ade42",
+        "id": "a6e303e4.3eb668",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
         "x": 4864.216796875,
-        "y": 1694.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1668.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6e464f44.674b68"
+                "6879e9be.d7aee"
             ]
         ]
     },
     {
-        "id": "5fcf484f.8e6e78",
+        "id": "1de23279.e8bad6",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5277.216796875,
-        "y": 1568.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1542.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c6202cfd.8bcb4",
+        "id": "8691b2ec.22b9d8",
         "type": "set",
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5254.216796875,
-        "y": 1752.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1726.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "af18531c.f561e8",
+        "id": "2d3d2acb.c107b6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5457.216796875,
-        "y": 1611.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1585.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5e16aade.ea368c"
+                "a3e7410.2b3c44"
             ]
         ]
     },
     {
-        "id": "6d4f9387.cdc244",
+        "id": "fb5337e0.94ced8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5449.216796875,
-        "y": 1666.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1640.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "77d34b30.5fb23c"
+                "656cbbf6.41438c"
             ]
         ]
     },
     {
-        "id": "7f999aa.ecc8a64",
+        "id": "752448e6.ec72a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5454.216796875,
-        "y": 1723.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1697.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "674c6f5c.5f0f88"
+                "6bb525a1.9cb52c"
             ]
         ]
     },
     {
-        "id": "674c6f5c.5f0f88",
+        "id": "6bb525a1.9cb52c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 5606.216796875,
-        "y": 1724.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1698.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "77d34b30.5fb23c",
+        "id": "656cbbf6.41438c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 5617.216796875,
-        "y": 1669.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1643.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5e16aade.ea368c",
+        "id": "a3e7410.2b3c44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -3140,234 +3140,234 @@
         "comments": "",
         "outputs": 1,
         "x": 5601.59912109375,
-        "y": 1608.6557922363281,
-        "z": "8bd89607.6248d8",
+        "y": 1582.9415588378906,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4cb5ebab.b25f64"
+                "99742e42.2fdbd8"
             ]
         ]
     },
     {
-        "id": "4cb5ebab.b25f64",
+        "id": "99742e42.2fdbd8",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 5816.216796875,
-        "y": 1605.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1579.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5fd92a3e.ed6fec",
+        "id": "78d4922e.8ebe04",
         "type": "set",
         "name": "set LEAF stuff",
         "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
         "comments": "",
         "x": 3314.88330078125,
-        "y": 1475,
-        "z": "8bd89607.6248d8",
+        "y": 1449.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4a864e6a.471e",
+        "id": "c220ecdf.76a978",
         "type": "set",
         "name": "set ROOT stuff",
         "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
         "comments": "",
         "x": 3301.88330078125,
-        "y": 1995.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 1969.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "cfd6a168.75b7d8",
+        "id": "b4f5dada.48378",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 2426.883331298828,
-        "y": 188,
-        "z": "8bd89607.6248d8",
+        "y": 162.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "fe93cfa.921edb",
+        "id": "5db562b1.71111c",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
         "x": 2360.883331298828,
-        "y": 224,
-        "z": "8bd89607.6248d8",
+        "y": 198.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "85869c3a.24ed3",
+        "id": "3f2dec8d.5c3844",
         "type": "comment",
         "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
         "info": "",
         "comments": "",
         "x": 2545.883331298828,
-        "y": 151,
-        "z": "8bd89607.6248d8",
+        "y": 125.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f5ea8856.4eb3f",
+        "id": "8ae1ae92.9d4708",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
         "x": 4072.88330078125,
-        "y": 1453,
-        "z": "8bd89607.6248d8",
+        "y": 1427.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8e941b0d.26d14",
+        "id": "f4b4f4b0.73db2",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
         "x": 4028.883270263672,
-        "y": 1917,
-        "z": "8bd89607.6248d8",
+        "y": 1891.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8cb68ccc.e851f8",
+        "id": "4304e2aa.cc073c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3441.8837890625,
-        "y": 7483.999969482422,
-        "z": "8bd89607.6248d8",
+        "x": 2737.8836669921875,
+        "y": 7259.28564453125,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "80d49243.ddf01",
+        "id": "f849984b.dddac",
         "type": "comment",
         "name": "START OF DELETE OPERATION",
         "info": "",
         "comments": "",
         "x": 3296.88330078125,
-        "y": 2476.999969482422,
-        "z": "8bd89607.6248d8",
+        "y": 2451.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8f2ca941.64e03",
+        "id": "ff6310d.2048a7",
         "type": "save",
         "name": "delete LEAF uni resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3880.566650390625,
-        "y": 2578.4000854492188,
-        "z": "8bd89607.6248d8",
+        "y": 2552.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "afaae138.bb9798",
+        "id": "14f1d608.fff342",
         "type": "save",
         "name": "get LEAF uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.LEAF.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.leafuni\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 3251.566650390625,
-        "y": 2558.4000854492188,
-        "z": "8bd89607.6248d8",
+        "y": 2532.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "661c06cc.3908b",
-                "1ca1166.e689c6a",
-                "b5955cba.954b1"
+                "30a4f59e.3fde12",
+                "98adc704.004778",
+                "91611e7f.d3eaa8"
             ]
         ]
     },
     {
-        "id": "1ca1166.e689c6a",
+        "id": "98adc704.004778",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3479.0576171875,
-        "y": 2530.9740600585938,
-        "z": "8bd89607.6248d8",
+        "y": 2505.2598266601562,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e6c36b4a.f9b0a8"
+                "94257401.34831"
             ]
         ]
     },
     {
-        "id": "b5955cba.954b1",
+        "id": "91611e7f.d3eaa8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3474.566650390625,
-        "y": 2575.4000244140625,
-        "z": "8bd89607.6248d8",
+        "y": 2549.685791015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9464bc90.391b5"
+                "c2c26a41.57e9c"
             ]
         ]
     },
     {
-        "id": "e6c36b4a.f9b0a8",
+        "id": "94257401.34831",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 3641.629150390625,
-        "y": 2530.259765625,
-        "z": "8bd89607.6248d8",
+        "y": 2504.5455322265625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9464bc90.391b5",
+        "id": "c2c26a41.57e9c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3642.566650390625,
-        "y": 2575.4000244140625,
-        "z": "8bd89607.6248d8",
+        "y": 2549.685791015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "661c06cc.3908b",
+        "id": "30a4f59e.3fde12",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3486.566650390625,
-        "y": 2625.4000854492188,
-        "z": "8bd89607.6248d8",
+        "y": 2599.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8055efb.5ed0c9"
+                "4d0f2575.137edc"
             ]
         ]
     },
     {
-        "id": "8055efb.5ed0c9",
+        "id": "4d0f2575.137edc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -3375,267 +3375,267 @@
         "comments": "",
         "outputs": 1,
         "x": 3638.88330078125,
-        "y": 2628.9999389648438,
-        "z": "8bd89607.6248d8",
+        "y": 2603.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2d855333.ba947c",
-                "8f2ca941.64e03",
-                "7724024e.bb32ec",
-                "b98aea07.4499"
+                "589d867c.eeacb",
+                "ff6310d.2048a7",
+                "84152b78.a442c8",
+                "1e88543b.84a814"
             ]
         ]
     },
     {
-        "id": "2d855333.ba947c",
+        "id": "589d867c.eeacb",
         "type": "set",
         "name": "set bwToBeDecreased tpid cvlan",
         "xml": "<set>\n<parameter name='bwToBeDecreased' value=\"`$tmp.aai.leafuni.data-source`\" />\n<parameter name='tpid' value='`$tmp.aai.leafuni.tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.leafuni.cvlan`' />\n\n\n",
         "comments": "",
         "x": 3883.566650390625,
-        "y": 2521.4000854492188,
-        "z": "8bd89607.6248d8",
+        "y": 2495.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a9e99fa6.0d7b7",
+        "id": "243640c4.1190f8",
         "type": "comment",
         "name": "Update ROOT UNI's bw",
         "info": "",
         "comments": "",
         "x": 3845.566650390625,
-        "y": 2632.199951171875,
-        "z": "8bd89607.6248d8",
+        "y": 2606.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d2355b29.347a7",
+        "id": "83d2a0c.fbf83e",
         "type": "save",
         "name": "update ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
         "x": 4523.566650390625,
-        "y": 2675.199951171875,
-        "z": "8bd89607.6248d8",
+        "y": 2649.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "7724024e.bb32ec",
+        "id": "84152b78.a442c8",
         "type": "save",
         "name": "get root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 3837.56640625,
-        "y": 2678.199951171875,
-        "z": "8bd89607.6248d8",
+        "y": 2652.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7f7b7065.dfb0f",
-                "18f5411.3947abf",
-                "5fedf83d.ca31e8"
+                "ee63dcff.30bad",
+                "80208a9d.4e9bb",
+                "3e7ba9dc.c77e76"
             ]
         ]
     },
     {
-        "id": "18f5411.3947abf",
+        "id": "80208a9d.4e9bb",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4141.057373046875,
-        "y": 2588.77392578125,
-        "z": "8bd89607.6248d8",
+        "y": 2563.0596923828125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "58e0cfbb.eeb22"
+                "ee49c3d8.4041d8"
             ]
         ]
     },
     {
-        "id": "5fedf83d.ca31e8",
+        "id": "3e7ba9dc.c77e76",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4136.56640625,
-        "y": 2633.1998901367188,
-        "z": "8bd89607.6248d8",
+        "y": 2607.4856567382812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9a2aec0d.d77f58"
+                "e34757d5.3f1ff8"
             ]
         ]
     },
     {
-        "id": "58e0cfbb.eeb22",
+        "id": "ee49c3d8.4041d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 4303.62890625,
-        "y": 2588.0596313476562,
-        "z": "8bd89607.6248d8",
+        "y": 2562.3453979492188,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9a2aec0d.d77f58",
+        "id": "e34757d5.3f1ff8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4304.56640625,
-        "y": 2633.1998901367188,
-        "z": "8bd89607.6248d8",
+        "y": 2607.4856567382812,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2175339a.46dd54",
+        "id": "be9d3338.5121d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4301.56640625,
-        "y": 2683.199951171875,
-        "z": "8bd89607.6248d8",
+        "y": 2657.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9319905e.cf01b",
-                "d2355b29.347a7"
+                "933a8e8f.7ef918",
+                "83d2a0c.fbf83e"
             ]
         ]
     },
     {
-        "id": "7f7b7065.dfb0f",
+        "id": "ee63dcff.30bad",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4132.56640625,
-        "y": 2683.199951171875,
-        "z": "8bd89607.6248d8",
+        "y": 2657.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2175339a.46dd54"
+                "be9d3338.5121d"
             ]
         ]
     },
     {
-        "id": "9319905e.cf01b",
+        "id": "933a8e8f.7ef918",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
         "x": 4483.567138671875,
-        "y": 2625.199951171875,
-        "z": "8bd89607.6248d8",
+        "y": 2599.4857177734375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c9164c42.75d5f8",
+        "id": "21e69316.d31a3c",
         "type": "comment",
         "name": "Delete LEAF UNI",
         "info": "",
         "comments": "",
         "x": 3831.88330078125,
-        "y": 2462.9999389648438,
-        "z": "8bd89607.6248d8",
+        "y": 2437.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "82a9b10f.cbf938",
+        "id": "45cb1d93.9cef0c",
         "type": "set",
         "name": "set current-provider-id and current-cvlan-id",
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
         "comments": "",
         "x": 3311.749969482422,
-        "y": 3795.6000366210938,
-        "z": "8bd89607.6248d8",
+        "y": 3769.8858032226562,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9a0ba695.c13258",
+        "id": "95cc6144.fb6bd8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3444.749969482422,
-        "y": 3843.6000366210938,
-        "z": "8bd89607.6248d8",
+        "y": 3817.8858032226562,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "a14834df.662a8",
+        "id": "21aeddc1.06f77a",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3266.749969482422,
-        "y": 3895.4000854492188,
-        "z": "8bd89607.6248d8",
+        "y": 3869.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b9a4b0ad.78d9e8",
-                "49168449.b48e54"
+                "218077ad.f30d3",
+                "a4239ce5.8829c"
             ]
         ]
     },
     {
-        "id": "b9a4b0ad.78d9e8",
+        "id": "218077ad.f30d3",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3459.749969482422,
-        "y": 3896.4000854492188,
-        "z": "8bd89607.6248d8",
+        "y": 3870.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c7d731c2.8648d8"
+                "dcbbe6d2.fa9028"
             ]
         ]
     },
     {
-        "id": "c7d731c2.8648d8",
+        "id": "dcbbe6d2.fa9028",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
         "comments": "",
         "x": 3603.749969482422,
-        "y": 3892.6000366210938,
-        "z": "8bd89607.6248d8",
+        "y": 3866.8858032226562,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "49168449.b48e54",
+        "id": "a4239ce5.8829c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3463.749969482422,
-        "y": 3940.4000854492188,
-        "z": "8bd89607.6248d8",
+        "y": 3914.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2b5fde97.f226ea"
+                "338c28da.4908c8"
             ]
         ]
     },
     {
-        "id": "2b5fde97.f226ea",
+        "id": "338c28da.4908c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -3643,165 +3643,165 @@
         "comments": "",
         "outputs": 1,
         "x": 3602.749969482422,
-        "y": 3935.4000854492188,
-        "z": "8bd89607.6248d8",
+        "y": 3909.6858520507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6c8d251.aa4085c",
-                "1d93d9c1.b4dc36",
-                "2f3e9082.a03f"
+                "40a81b6.e879ce4",
+                "fe7c3ff6.ce34b8",
+                "af03ee84.d16068"
             ]
         ]
     },
     {
-        "id": "6c8d251.aa4085c",
+        "id": "40a81b6.e879ce4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3853.149627685547,
-        "y": 3943.9166870117188,
-        "z": "8bd89607.6248d8",
+        "y": 3918.2024536132812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8f03c967.45f27"
+                "3fc00cbe.f344f4"
             ]
         ]
     },
     {
-        "id": "8f03c967.45f27",
+        "id": "3fc00cbe.f344f4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4075.149627685547,
-        "y": 3921.9166870117188,
-        "z": "8bd89607.6248d8",
+        "y": 3896.2024536132812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3959f0cf.96f36"
+                "57d9d04a.beb888"
             ]
         ]
     },
     {
-        "id": "3959f0cf.96f36",
+        "id": "57d9d04a.beb888",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4235.149139404297,
-        "y": 3901.9166870117188,
-        "z": "8bd89607.6248d8",
+        "y": 3876.2024536132812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1414f243.3459be"
+                "5fa67fdd.e511b8"
             ]
         ]
     },
     {
-        "id": "80ad8584.1bf2c8",
+        "id": "b9bbd69a.136aa8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4388.149658203125,
-        "y": 3882.916717529297,
-        "z": "8bd89607.6248d8",
+        "y": 3857.2024841308594,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "dbcbba23.eadbb",
-                "2ba6b637.902e82"
+                "17e2ea6.f8df196",
+                "947c4850.aa8df"
             ]
         ]
     },
     {
-        "id": "dbcbba23.eadbb",
+        "id": "17e2ea6.f8df196",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
         "x": 4584.649871826172,
-        "y": 3850.9999389648438,
-        "z": "8bd89607.6248d8",
+        "y": 3825.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1d93d9c1.b4dc36",
+        "id": "fe7c3ff6.ce34b8",
         "type": "set",
         "name": "set tmp.stillHasUn tmp.keepVPNBs to FALSE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='false' />\n<parameter name='tmp.keepVPNBs' value='false' />\n",
         "comments": "",
         "x": 3959.64990234375,
-        "y": 3862.999969482422,
-        "z": "8bd89607.6248d8",
+        "y": 3837.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2f3e9082.a03f",
+        "id": "af03ee84.d16068",
         "type": "switchNode",
         "name": "switch tmp.keepVPNBs?",
         "xml": "\n<switch test=\"`$tmp.keepVPNBs`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3767.64990234375,
-        "y": 4284.000213623047,
-        "z": "8bd89607.6248d8",
+        "y": 4258.285980224609,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f5f9b41d.cada7",
-                "3f4fef24.6df1a"
+                "77a80484.fb13cc",
+                "a722846c.585ad"
             ]
         ]
     },
     {
-        "id": "2ba6b637.902e82",
+        "id": "947c4850.aa8df",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4552.88330078125,
-        "y": 3918.999969482422,
-        "z": "8bd89607.6248d8",
+        "y": 3893.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3f4fef24.6df1a",
+        "id": "a722846c.585ad",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 154.65066528320312,
-        "y": 5348.000457763672,
-        "z": "8bd89607.6248d8",
+        "y": 5322.286224365234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "16d898b2.82d4af"
+                "c0a1014a.3ea75"
             ]
         ]
     },
     {
-        "id": "f5f9b41d.cada7",
+        "id": "77a80484.fb13cc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3988.650634765625,
-        "y": 4386.000213623047,
-        "z": "8bd89607.6248d8",
+        "y": 4360.285980224609,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "26c73a8d.4562be"
+                "8774c38d.ee5b7"
             ]
         ]
     },
     {
-        "id": "26c73a8d.4562be",
+        "id": "8774c38d.ee5b7",
         "type": "block",
         "name": "block",
         "xml": "<block>",
@@ -3809,209 +3809,209 @@
         "comments": "",
         "outputs": 1,
         "x": 4131.650634765625,
-        "y": 4382.000213623047,
-        "z": "8bd89607.6248d8",
+        "y": 4356.285980224609,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e9909468.33151",
-                "efe71d55.9caa78",
-                "21b48e5f.bc8462",
-                "55b631d2.803a38",
-                "a2022ff9.9bc538",
-                "702c8bba.ca32ac",
-                "e084df79.80ceb8",
-                "624968c9.f15538",
-                "abf74f44.8bd74"
+                "f67d6e8d.c4ab",
+                "1d885097.bf6b2f",
+                "bd8e5c03.dfc108",
+                "19328269.e896be",
+                "93e60704.65dbd",
+                "8b3d1eff.18e008",
+                "ffd8a757.b8a3f",
+                "b33560b0.1278c",
+                "fc616200.2baf58"
             ]
         ]
     },
     {
-        "id": "4355739e.98f0ec",
+        "id": "9c91ac5e.705b8",
         "type": "comment",
         "name": "keepVPNBs == false, then check tmp.stillHasUni",
         "info": "(2) keepVPNBs == false, means there are no other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\ncheck if tmp.stillHasUni is True or False?\n\nif TRUE --> means this domain (connectivity) still has other UNIs\n- delete VPNBs\n- delete LEAF UNI in AAI -- DONE\n- upadte bw in ROOT UNI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC\n- change ROOT conn status to Modified\n--- mark LEAF connectivity as Modified because the underlay OTN tunnel list of this connectivity is now different\n\nif FALSE --> means this domain (connectivity) has no other UNIs\n\nif MMstillHasUni == TRUE, means scenario (3), else, means scenario (4)\n\n(3) & (4) both:\n- delete VPNBs\n- delete LEAF connectivity\n- delete LEAF Ethernet Service from PNC\n\n(3) only:\n- change ROOT conn status to Modified\n- Keep the middle-man-conn and DON'T delete\n\n(4) only:\n- delete ROOT UNI\n- delete ROOT conn from AAI\n- delete ROOT Ethernet Service from PNC\n- delete middle-man-conn from AAI\n\n",
         "comments": "",
         "x": 181,
-        "y": 5304.000457763672,
-        "z": "8bd89607.6248d8",
+        "y": 5278.286224365234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4da2ca0c.4a8b84",
+        "id": "fa1b93d9.936e7",
         "type": "comment",
         "name": "There are still other UNIs in this connectivity that share same OLT node. Only update bw of the vpn-bindings involved",
         "info": "(1) keepVPNBs == true, means there are still other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\n- Only update bw of the vpn-bindings involved -- DONE\n- upadte bw in ROOT UNI -- DONE\n- change ROOT conn status to Modified -- DONE\n- delete LEAF UNI in AAI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC -- DONE\n- DON'T delete the connectivities of LEAF and ROOT -- DONE\nAlso update the ethernet services",
         "comments": "",
         "x": 4007.884033203125,
-        "y": 4349.000213623047,
-        "z": "8bd89607.6248d8",
+        "y": 4323.285980224609,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9b3df18d.6f724",
+        "id": "30095233.787426",
         "type": "set",
         "name": "set srcTtp OTN layer",
         "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
         "comments": "",
         "x": 4820.667724609375,
-        "y": 4539.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4514.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "84df48a4.4e5358",
+        "id": "298f2b5b.0aab2c",
         "type": "switchNode",
         "name": "switch provider-id domainA",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5165.667724609375,
-        "y": 4401.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4376.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cfc0c818.79fe68"
+                "1597a82b.d6bf2"
             ]
         ]
     },
     {
-        "id": "10190e03.34bba2",
+        "id": "1126bc47.b4d98c",
         "type": "for",
         "name": "for netwidx..allNetworksList_length",
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
         "comments": "",
         "outputs": 1,
         "x": 4872.667724609375,
-        "y": 4395.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4370.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "84df48a4.4e5358"
+                "298f2b5b.0aab2c"
             ]
         ]
     },
     {
-        "id": "1796601b.dbfbf",
+        "id": "9ba49429.2785d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5127.667724609375,
-        "y": 4352.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4327.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4871207.ade70e",
+        "id": "ace3cbea.15731",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
         "comments": "",
         "x": 4816.667724609375,
-        "y": 4447.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4422.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "fe8bfdbc.e310b8",
+        "id": "1d3af694.aab3a1",
         "type": "set",
         "name": "set tmp.pce-src-node",
         "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
         "comments": "",
         "x": 4824.667724609375,
-        "y": 4492.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4467.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ed94bc94.c3085",
+        "id": "7a0d3acc.4e0354",
         "type": "set",
         "name": "unset otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
         "comments": "",
         "x": 4821.667724609375,
-        "y": 4345.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4320.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "cfc0c818.79fe68",
+        "id": "1597a82b.d6bf2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5074.667724609375,
-        "y": 4469.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4444.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3784b6ea.dad97a"
+                "247fb61.2b27f4a"
             ]
         ]
     },
     {
-        "id": "3784b6ea.dad97a",
+        "id": "247fb61.2b27f4a",
         "type": "switchNode",
         "name": "switch te-topo-id",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5259.667724609375,
-        "y": 4468.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4443.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6ba573fe.abd33c"
+                "d2d679f0.fa9e7"
             ]
         ]
     },
     {
-        "id": "6ba573fe.abd33c",
+        "id": "d2d679f0.fa9e7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5451.667724609375,
-        "y": 4471.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4446.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a8101530.41669"
+                "7d11177c.7fa498"
             ]
         ]
     },
     {
-        "id": "a8101530.41669",
+        "id": "7d11177c.7fa498",
         "type": "set",
         "name": "set otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
         "x": 5623.667724609375,
-        "y": 4467.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4442.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3a63decd.7b4cb2",
+        "id": "b338f208.2e8e8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4999.667724609375,
-        "y": 4582.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4557.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e9909468.33151",
+        "id": "f67d6e8d.c4ab",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -4019,232 +4019,232 @@
         "comments": "",
         "outputs": 1,
         "x": 4516.667724609375,
-        "y": 4367.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4342.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9c834ddf.7b5a8",
-                "1b5b7b9f.240eac",
-                "4871207.ade70e",
-                "fe8bfdbc.e310b8",
-                "9b3df18d.6f724",
-                "10190e03.34bba2",
-                "3a63decd.7b4cb2"
+                "6c238e2f.cfa52",
+                "97e28bb1.9f6bb8",
+                "ace3cbea.15731",
+                "1d3af694.aab3a1",
+                "30095233.787426",
+                "1126bc47.b4d98c",
+                "b338f208.2e8e8"
             ]
         ]
     },
     {
-        "id": "5418760e.ea421",
+        "id": "44415c7f.4f5f24",
         "type": "comment",
         "name": "The following section is to find srcTtp OTN layer (its long name)",
         "info": "The following section is to find srcTtp OTN layer (its long name)",
         "comments": "",
         "x": 4501.667724609375,
-        "y": 4301.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4276.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1b5b7b9f.240eac",
+        "id": "97e28bb1.9f6bb8",
         "type": "get-resource",
         "name": "get-resource network-resources-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
         "comments": "",
         "outputs": 1,
         "x": 4880.667724609375,
-        "y": 4288.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4263.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cdc8c3cd.7743d8",
-                "829501cc.19a87",
-                "1796601b.dbfbf"
+                "153999c3.0eb42e",
+                "a208bb99.66b2e8",
+                "9ba49429.2785d"
             ]
         ]
     },
     {
-        "id": "cdc8c3cd.7743d8",
+        "id": "153999c3.0eb42e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5116.667724609375,
-        "y": 4271.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4246.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "829501cc.19a87",
+        "id": "a208bb99.66b2e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5113.667724609375,
-        "y": 4312.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4287.069427490234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c834ddf.7b5a8",
+        "id": "6c238e2f.cfa52",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
         "comments": "",
         "x": 4829.667724609375,
-        "y": 4245.783660888672,
-        "z": "8bd89607.6248d8",
+        "y": 4220.069427490234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "efe71d55.9caa78",
+        "id": "1d885097.bf6b2f",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
         "comments": "",
         "x": 4336.667724609375,
-        "y": 4700.183563232422,
-        "z": "8bd89607.6248d8",
+        "y": 4674.469329833984,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "429a4c62.ec5bdc",
+        "id": "582ea235.e6de1c",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",
         "info": "",
         "comments": "",
         "x": 4459.968017578125,
-        "y": 4739.183563232422,
-        "z": "8bd89607.6248d8",
+        "y": 4713.469329833984,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "21b48e5f.bc8462",
+        "id": "bd8e5c03.dfc108",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 4357.968017578125,
-        "y": 4774.183563232422,
-        "z": "8bd89607.6248d8",
+        "y": 4748.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a823d247.f64a98",
-                "36823aa3.4d18a6",
-                "eb8482c0.2d4878"
+                "d0e71616.8c817",
+                "148e0bed.377164",
+                "3b175283.95d6be"
             ]
         ]
     },
     {
-        "id": "a823d247.f64a98",
+        "id": "d0e71616.8c817",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4562.968017578125,
-        "y": 4771.183563232422,
-        "z": "8bd89607.6248d8",
+        "y": 4745.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8498bebb.23bf48"
+                "39c739fc.a6fe6e"
             ]
         ]
     },
     {
-        "id": "36823aa3.4d18a6",
+        "id": "148e0bed.377164",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4546.458984375,
-        "y": 4832.757598876953,
-        "z": "8bd89607.6248d8",
+        "y": 4807.043365478516,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "386b7921.748fb6"
+                "3e1fb649.3101ea"
             ]
         ]
     },
     {
-        "id": "eb8482c0.2d4878",
+        "id": "3b175283.95d6be",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4543.968017578125,
-        "y": 4876.183563232422,
-        "z": "8bd89607.6248d8",
+        "y": 4850.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "134c42f5.f94555"
+                "681b836.365687c"
             ]
         ]
     },
     {
-        "id": "8498bebb.23bf48",
+        "id": "39c739fc.a6fe6e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4730.96826171875,
-        "y": 4766.183563232422,
-        "z": "8bd89607.6248d8",
+        "y": 4740.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6b12d916.16568"
+                "93e92e1a.778be8"
             ]
         ]
     },
     {
-        "id": "386b7921.748fb6",
+        "id": "3e1fb649.3101ea",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 4709.0303955078125,
-        "y": 4833.0433349609375,
-        "z": "8bd89607.6248d8",
+        "y": 4807.3291015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "134c42f5.f94555",
+        "id": "681b836.365687c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4710.968017578125,
-        "y": 4875.183563232422,
-        "z": "8bd89607.6248d8",
+        "y": 4849.469329833984,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6b12d916.16568",
+        "id": "93e92e1a.778be8",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 4968.96826171875,
-        "y": 4771.183563232422,
-        "z": "8bd89607.6248d8",
+        "y": 4745.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cfa150d4.94ff28"
+                "27f30922.4e6a66"
             ]
         ]
     },
     {
-        "id": "cfa150d4.94ff28",
+        "id": "27f30922.4e6a66",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4252,74 +4252,74 @@
         "comments": "",
         "outputs": 1,
         "x": 5202.968017578125,
-        "y": 4778.183563232422,
-        "z": "8bd89607.6248d8",
+        "y": 4752.469329833984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e4eccca9.9724c8"
+                "e449a33.b8b696"
             ]
         ]
     },
     {
-        "id": "dd4e0e04.50655",
+        "id": "e77a7161.49d068",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
         "info": "",
         "comments": "",
         "x": 5119.783935546875,
-        "y": 4849.349884033203,
-        "z": "8bd89607.6248d8",
+        "y": 4823.635650634766,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e4eccca9.9724c8",
+        "id": "e449a33.b8b696",
         "type": "switchNode",
         "name": "switch ops-note is srcTtpOtnLayer",
         "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5063.783935546875,
-        "y": 4898.349884033203,
-        "z": "8bd89607.6248d8",
+        "y": 4872.635650634766,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7056a1ab.16f5c8",
-                "9ff2677.5b72918"
+                "62a1336b.ab309c",
+                "57ed2482.36942c"
             ]
         ]
     },
     {
-        "id": "9ff2677.5b72918",
+        "id": "57ed2482.36942c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5306.784423828125,
-        "y": 4939.349395751953,
-        "z": "8bd89607.6248d8",
+        "y": 4913.635162353516,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "7056a1ab.16f5c8",
+        "id": "62a1336b.ab309c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5317.7841796875,
-        "y": 4896.349609375,
-        "z": "8bd89607.6248d8",
+        "y": 4870.6353759765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2f2661a7.5dc1e6"
+                "6f96293b.020fc"
             ]
         ]
     },
     {
-        "id": "a26e073.3ca98f8",
+        "id": "48fa24ff.a12f6c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4327,213 +4327,213 @@
         "comments": "",
         "outputs": 1,
         "x": 5544.767578125,
-        "y": 4903.76611328125,
-        "z": "8bd89607.6248d8",
+        "y": 4878.0518798828125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ff1ba77c.30ef7",
-                "6cee0088.2f0908",
-                "acf1096d.49e23"
+                "d949e407.7d96c8",
+                "ba00ef86.599998",
+                "e04480f3.8af1b"
             ]
         ]
     },
     {
-        "id": "6e1088cb.02b348",
+        "id": "a4fcb041.b0aaf8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 5709.8173828125,
-        "y": 4788.766571044922,
-        "z": "8bd89607.6248d8",
+        "y": 4763.052337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "28fa48d0.c1f11"
+                "dc33bc78.b33dc"
             ]
         ]
     },
     {
-        "id": "28fa48d0.c1f11",
+        "id": "dc33bc78.b33dc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5901.8173828125,
-        "y": 4777.766815185547,
-        "z": "8bd89607.6248d8",
+        "y": 4752.052581787109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "794e0693.bafff"
+                "88251130.694fa8"
             ]
         ]
     },
     {
-        "id": "ff1ba77c.30ef7",
+        "id": "d949e407.7d96c8",
         "type": "set",
         "name": "unset tmp.aai.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
         "comments": "",
         "x": 5658.334228515625,
-        "y": 4678.983612060547,
-        "z": "8bd89607.6248d8",
+        "y": 4653.269378662109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6cee0088.2f0908",
+        "id": "ba00ef86.599998",
         "type": "set",
         "name": "set tmp.aai.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
         "comments": "",
         "x": 5650.334228515625,
-        "y": 4727.983612060547,
-        "z": "8bd89607.6248d8",
+        "y": 4702.269378662109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "acf1096d.49e23",
+        "id": "e04480f3.8af1b",
         "type": "save",
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5881.751220703125,
-        "y": 4909.149627685547,
-        "z": "8bd89607.6248d8",
+        "y": 4883.435394287109,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "7591a9e8.920d7",
+        "id": "e369ae1d.045348",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
         "comments": "",
         "outputs": 1,
         "x": 5833.401123046875,
-        "y": 4956.466522216797,
-        "z": "8bd89607.6248d8",
+        "y": 4930.752288818359,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "20c2cafd.4f2b6e",
+        "id": "7bcaed73.c4335c",
         "type": "comment",
         "name": "decrease the bw of the-vpn-binding and change status to modified",
         "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
         "comments": "",
         "x": 5905.751220703125,
-        "y": 4870.149627685547,
-        "z": "8bd89607.6248d8",
+        "y": 4844.435394287109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "794e0693.bafff",
+        "id": "88251130.694fa8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6083.8173828125,
-        "y": 4756.766815185547,
-        "z": "8bd89607.6248d8",
+        "y": 4731.052581787109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cb67e673.c3b218"
+                "3faa0ed9.e49512"
             ]
         ]
     },
     {
-        "id": "cb67e673.c3b218",
+        "id": "3faa0ed9.e49512",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 6245.8173828125,
-        "y": 4745.766815185547,
-        "z": "8bd89607.6248d8",
+        "y": 4720.052581787109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "28efce3c.031a02",
-                "a7f7a502.452a7"
+                "1f4e4f1d.0faeb9",
+                "71f57a2d.ed1434"
             ]
         ]
     },
     {
-        "id": "28efce3c.031a02",
+        "id": "1f4e4f1d.0faeb9",
         "type": "set",
         "name": "unset tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
         "comments": "",
         "x": 6442.8173828125,
-        "y": 4674.766815185547,
-        "z": "8bd89607.6248d8",
+        "y": 4649.052581787109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a7f7a502.452a7",
+        "id": "71f57a2d.ed1434",
         "type": "set",
         "name": "set tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 6440.2841796875,
-        "y": 4773.983612060547,
-        "z": "8bd89607.6248d8",
+        "y": 4748.269378662109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "121ba89c.f4d387",
+        "id": "5e5dd175.2ee1b",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3097.800048828125,
-        "y": 3232.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 3207.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e7a924f9.c6032",
+        "id": "95f11825.f517d8",
         "type": "switchNode",
         "name": "switch found-middle-man?",
         "xml": "<switch test='`$found-middle-man`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2974.800048828125,
-        "y": 3342.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 3317.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a8ce787f.7ca8b8",
-                "dab4cfcf.e3306"
+                "eda02ee3.547818",
+                "24ae5a23.6efcde"
             ]
         ]
     },
     {
-        "id": "a8ce787f.7ca8b8",
+        "id": "eda02ee3.547818",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3158.800048828125,
-        "y": 3321.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 3296.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3ed4168e.db435a"
+                "25d89b5b.fea624"
             ]
         ]
     },
     {
-        "id": "3ed4168e.db435a",
+        "id": "25d89b5b.fea624",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4541,43 +4541,43 @@
         "comments": "",
         "outputs": 1,
         "x": 3301.800048828125,
-        "y": 3321.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 3296.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d46982de.a36698"
+                "a5e21959.30c488"
             ]
         ]
     },
     {
-        "id": "d46982de.a36698",
+        "id": "a5e21959.30c488",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
         "comments": "",
         "x": 3477.800048828125,
-        "y": 3319.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 3294.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "dab4cfcf.e3306",
+        "id": "24ae5a23.6efcde",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3156.800048828125,
-        "y": 3376.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 3351.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "55aae2f8.8a15b4"
+                "2aa846fb.1fdfe2"
             ]
         ]
     },
     {
-        "id": "55aae2f8.8a15b4",
+        "id": "2aa846fb.1fdfe2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4585,216 +4585,216 @@
         "comments": "",
         "outputs": 1,
         "x": 3003.800048828125,
-        "y": 3509.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 3484.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "82a9b10f.cbf938",
-                "9a0ba695.c13258",
-                "a14834df.662a8",
-                "87bd7501.49bf18",
-                "4331a4c2.0089dc",
-                "b9e9be73.6c3be"
+                "45cb1d93.9cef0c",
+                "95cc6144.fb6bd8",
+                "21aeddc1.06f77a",
+                "ab0940a1.911a68",
+                "6d6cc518.e0ec9c",
+                "3c679d7f.fbbb22"
             ]
         ]
     },
     {
-        "id": "6411a3c0.06e7c4",
+        "id": "522b1854.031bc",
         "type": "comment",
         "name": "Find LEAF connectivity",
         "info": "",
         "comments": "",
         "x": 3225.88330078125,
-        "y": 3749.999969482422,
-        "z": "8bd89607.6248d8",
+        "y": 3724.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "87bd7501.49bf18",
+        "id": "ab0940a1.911a68",
         "type": "set",
         "name": "set tmp.MMstillHasUni to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",
         "comments": "",
         "x": 3308.333251953125,
-        "y": 3522.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 3497.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4331a4c2.0089dc",
+        "id": "6d6cc518.e0ec9c",
         "type": "for",
         "name": "for each relationship of middle-man-conn",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3306.8330078125,
-        "y": 3568.716766357422,
-        "z": "8bd89607.6248d8",
+        "y": 3543.0025329589844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3cfcd803.984ff"
+                "f5f202e7.9ae08"
             ]
         ]
     },
     {
-        "id": "3cfcd803.984ff",
+        "id": "f5f202e7.9ae08",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3569.8330078125,
-        "y": 3563.716766357422,
-        "z": "8bd89607.6248d8",
+        "y": 3538.0025329589844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "19e3fea0.d430a9"
+                "186eedb6.79ae82"
             ]
         ]
     },
     {
-        "id": "19e3fea0.d430a9",
+        "id": "186eedb6.79ae82",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3729.83251953125,
-        "y": 3543.716766357422,
-        "z": "8bd89607.6248d8",
+        "y": 3518.0025329589844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cc595a48.1912e8"
+                "e8fee7bd.fc2ef8"
             ]
         ]
     },
     {
-        "id": "db4c40a7.875698",
+        "id": "774ecc4a.3ad124",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5066.834228515625,
-        "y": 3574.716796875,
-        "z": "8bd89607.6248d8",
+        "y": 3549.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7118b227.f4c97c",
-                "642017c6.da5f18",
-                "d7647a1a.599238"
+                "9464a805.69d21",
+                "af3bd9a1.948688",
+                "da386631.67d8c8"
             ]
         ]
     },
     {
-        "id": "7118b227.f4c97c",
+        "id": "9464a805.69d21",
         "type": "set",
         "name": "set tmp.MMstillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",
         "comments": "",
         "x": 5306.334716796875,
-        "y": 3523.800048828125,
-        "z": "8bd89607.6248d8",
+        "y": 3498.0858154296875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "642017c6.da5f18",
+        "id": "af3bd9a1.948688",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 5239.568145751953,
-        "y": 3596.800079345703,
-        "z": "8bd89607.6248d8",
+        "y": 3571.0858459472656,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d96806ce.d6ba3",
+        "id": "17da0805.f3e8a8",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
         "x": 4432.88427734375,
-        "y": 5131.000213623047,
-        "z": "8bd89607.6248d8",
+        "y": 5105.285980224609,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "55b631d2.803a38",
+        "id": "19328269.e896be",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
         "x": 4331.317138671875,
-        "y": 5182.916717529297,
-        "z": "8bd89607.6248d8",
+        "y": 5157.202484130859,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e084df79.80ceb8",
+        "id": "ffd8a757.b8a3f",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4482.317138671875,
-        "y": 5625.916717529297,
-        "z": "8bd89607.6248d8",
+        "y": 5600.202484130859,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "624968c9.f15538",
+        "id": "b33560b0.1278c",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4297.317138671875,
-        "y": 5692.916717529297,
-        "z": "8bd89607.6248d8",
+        "y": 5667.202484130859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3ebbf801.286498",
-                "76ebd92f.1642a"
+                "e0079417.8b765",
+                "94134a14.38a09"
             ]
         ]
     },
     {
-        "id": "3ebbf801.286498",
+        "id": "e0079417.8b765",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4562.317138671875,
-        "y": 5677.916717529297,
-        "z": "8bd89607.6248d8",
+        "y": 5652.202484130859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "37d1d73c.eecfd"
+                "c191059e.ace948"
             ]
         ]
     },
     {
-        "id": "76ebd92f.1642a",
+        "id": "94134a14.38a09",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4558.317138671875,
-        "y": 5725.916717529297,
-        "z": "8bd89607.6248d8",
+        "y": 5700.202484130859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "199fe1ad.b53f66"
+                "21c0ccb3.89b3cc"
             ]
         ]
     },
     {
-        "id": "37d1d73c.eecfd",
+        "id": "c191059e.ace948",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4802,116 +4802,116 @@
         "comments": "",
         "outputs": 1,
         "x": 4718.317138671875,
-        "y": 5673.916717529297,
-        "z": "8bd89607.6248d8",
+        "y": 5648.202484130859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "31a9971.ad96268"
+                "ea983e85.321ce"
             ]
         ]
     },
     {
-        "id": "199fe1ad.b53f66",
+        "id": "21c0ccb3.89b3cc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
         "x": 4706.317138671875,
-        "y": 5720.916717529297,
-        "z": "8bd89607.6248d8",
+        "y": 5695.202484130859,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "802c1097.dcd94",
+        "id": "11ee9928.b9a3cf",
         "type": "set",
         "name": "set tmp.rootconn.",
         "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",
         "comments": "",
         "x": 5138.3173828125,
-        "y": 5615.916717529297,
-        "z": "8bd89607.6248d8",
+        "y": 5590.202484130859,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8e64de53.2c9fe8",
+        "id": "3a447acf.2b1f0e",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",
         "comments": "",
         "x": 4540.734130859375,
-        "y": 5212.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5186.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a2022ff9.9bc538",
+        "id": "93e60704.65dbd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4311.734130859375,
-        "y": 5301.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5275.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8e64de53.2c9fe8",
-                "2a874f25.a11e68"
+                "3a447acf.2b1f0e",
+                "a0d0d144.703df8"
             ]
         ]
     },
     {
-        "id": "2a874f25.a11e68",
+        "id": "a0d0d144.703df8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 4547.734130859375,
-        "y": 5294.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5268.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "42e4546b.7efc04",
-                "8902c91a.a1454",
-                "2a8da0f.130cae"
+                "93bdcc8d.eca238",
+                "76b31045.74e9",
+                "e9dc2865.72e928"
             ]
         ]
     },
     {
-        "id": "42e4546b.7efc04",
+        "id": "93bdcc8d.eca238",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4743.2342529296875,
-        "y": 5246.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5220.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "374d8.3341eb28c"
+                "87ddaf65.395498"
             ]
         ]
     },
     {
-        "id": "8902c91a.a1454",
+        "id": "76b31045.74e9",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4735.2342529296875,
-        "y": 5301.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5275.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1ff3bcec.a42b9b"
+                "fe3d7591.8ed12"
             ]
         ]
     },
     {
-        "id": "374d8.3341eb28c",
+        "id": "87ddaf65.395498",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -4919,219 +4919,219 @@
         "comments": "",
         "outputs": 1,
         "x": 4887.6165771484375,
-        "y": 5245.8560791015625,
-        "z": "8bd89607.6248d8",
+        "y": 5220.141845703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ec0686db.c1a878"
+                "ad455c8f.ae00e8"
             ]
         ]
     },
     {
-        "id": "ec0686db.c1a878",
+        "id": "ad455c8f.ae00e8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 5071.734130859375,
-        "y": 5244.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5218.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d4462e32.3100d8"
+                "d25e267a.3e533"
             ]
         ]
     },
     {
-        "id": "d4462e32.3100d8",
+        "id": "d25e267a.3e533",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5266.734130859375,
-        "y": 5244.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5218.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3a9e0096.e3a448"
+                "93445f98.6a2b88"
             ]
         ]
     },
     {
-        "id": "2a8da0f.130cae",
+        "id": "e9dc2865.72e928",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4740.2342529296875,
-        "y": 5358.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5332.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "17a678b2.952aef"
+                "d3c476f6.a94bf"
             ]
         ]
     },
     {
-        "id": "17a678b2.952aef",
+        "id": "d3c476f6.a94bf",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4892.2342529296875,
-        "y": 5359.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5333.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1ff3bcec.a42b9b",
+        "id": "fe3d7591.8ed12",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4903.2342529296875,
-        "y": 5302.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5276.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "318d00c4.ca52c",
+        "id": "a6955939.7a731",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5648.734130859375,
-        "y": 5248.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5222.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "46db4a25.4363a4",
-                "34953acc.5d5dc6",
-                "9de681b9.d85948"
+                "9484e895.44a448",
+                "50aee0a4.445958",
+                "f7a12344.c8bde8"
             ]
         ]
     },
     {
-        "id": "3a9e0096.e3a448",
+        "id": "93445f98.6a2b88",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5469.734130859375,
-        "y": 5248.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5222.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "318d00c4.ca52c"
+                "a6955939.7a731"
             ]
         ]
     },
     {
-        "id": "34953acc.5d5dc6",
+        "id": "50aee0a4.445958",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 5854.734130859375,
-        "y": 5261.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5235.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a1306b3e.752188",
-                "af1e227.d98756",
-                "c7dc9a0c.c1a12"
+                "1af8bb44.7d7ad5",
+                "48532c3d.63b2f4",
+                "af6d67e.1e33f98"
             ]
         ]
     },
     {
-        "id": "46db4a25.4363a4",
+        "id": "9484e895.44a448",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5884.734130859375,
-        "y": 5209.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5183.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a1306b3e.752188",
+        "id": "1af8bb44.7d7ad5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6064.734130859375,
-        "y": 5252.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5226.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c17f0a30.28a8c"
+                "751438ac.f3ea9"
             ]
         ]
     },
     {
-        "id": "af1e227.d98756",
+        "id": "48532c3d.63b2f4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6056.734130859375,
-        "y": 5307.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5281.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f59cff5b.1a7268"
+                "1ab525ea.2aee0a"
             ]
         ]
     },
     {
-        "id": "c7dc9a0c.c1a12",
+        "id": "af6d67e.1e33f98",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6061.734130859375,
-        "y": 5364.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5338.486175537109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "18fa3a10.34d806"
+                "658bf37d.2cc724"
             ]
         ]
     },
     {
-        "id": "18fa3a10.34d806",
+        "id": "658bf37d.2cc724",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 6213.734130859375,
-        "y": 5365.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5339.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f59cff5b.1a7268",
+        "id": "1ab525ea.2aee0a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 6224.734130859375,
-        "y": 5310.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5284.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c17f0a30.28a8c",
+        "id": "751438ac.f3ea9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5139,82 +5139,82 @@
         "comments": "",
         "outputs": 1,
         "x": 6209.116455078125,
-        "y": 5249.8560791015625,
-        "z": "8bd89607.6248d8",
+        "y": 5224.141845703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7a04be69.78c07"
+                "3d7e0062.7d2af"
             ]
         ]
     },
     {
-        "id": "7a04be69.78c07",
+        "id": "3d7e0062.7d2af",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 6423.734130859375,
-        "y": 5246.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5220.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9de681b9.d85948",
+        "id": "f7a12344.c8bde8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 5804.734130859375,
-        "y": 5325.200408935547,
-        "z": "8bd89607.6248d8",
+        "y": 5299.486175537109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "702c8bba.ca32ac",
+        "id": "8b3d1eff.18e008",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 4453.234375,
-        "y": 5405.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5380.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b53a2357.cb19f",
-                "1f266f6e.997129"
+                "ee0f617b.5bd02",
+                "8e2d6022.079658"
             ]
         ]
     },
     {
-        "id": "b53a2357.cb19f",
+        "id": "ee0f617b.5bd02",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4813.734130859375,
-        "y": 5413.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5388.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1f814603.8b079a"
+                "e5f9197d.04b6c"
             ]
         ]
     },
     {
-        "id": "1f814603.8b079a",
+        "id": "e5f9197d.04b6c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 4971.734130859375,
-        "y": 5413.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5388.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3ef4bb2e.ea4704",
+        "id": "b5f90852.29b69",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -5222,97 +5222,97 @@
         "comments": "",
         "outputs": 1,
         "x": 4975.234130859375,
-        "y": 5453.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5428.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1f266f6e.997129",
+        "id": "8e2d6022.079658",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4817.734130859375,
-        "y": 5453.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5428.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3ef4bb2e.ea4704"
+                "b5f90852.29b69"
             ]
         ]
     },
     {
-        "id": "4cb994af.f28aac",
+        "id": "ffe0ea3.8a4d998",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5126.451171875,
-        "y": 5667.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5642.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "37db8c04.dcc65c",
-                "e00788f7.d2c01"
+                "6146efb2.cf13d",
+                "9351cf54.365048"
             ]
         ]
     },
     {
-        "id": "e00788f7.d2c01",
+        "id": "9351cf54.365048",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 5368.450927734375,
-        "y": 5617.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5592.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bd67e663.b6cc68",
-                "6a96c9e9.f60f08",
-                "24f63010.71743"
+                "d35be3cf.cc2028",
+                "74f2b735.4a4b38",
+                "4e1edc90.74b29c"
             ]
         ]
     },
     {
-        "id": "bd67e663.b6cc68",
+        "id": "d35be3cf.cc2028",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5563.951171875,
-        "y": 5551.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5526.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9c952b2f.2e4c48"
+                "8c6be2ce.3abef8"
             ]
         ]
     },
     {
-        "id": "6a96c9e9.f60f08",
+        "id": "74f2b735.4a4b38",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5559.951171875,
-        "y": 5607.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5582.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "72760d9d.ebda64"
+                "17a91916.50ea6f"
             ]
         ]
     },
     {
-        "id": "9c952b2f.2e4c48",
+        "id": "8c6be2ce.3abef8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5320,114 +5320,114 @@
         "comments": "",
         "outputs": 1,
         "x": 5708.3333740234375,
-        "y": 5569.4556884765625,
-        "z": "8bd89607.6248d8",
+        "y": 5543.741455078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "27765347.4a6a3c"
+                "41f50adf.154854"
             ]
         ]
     },
     {
-        "id": "27765347.4a6a3c",
+        "id": "41f50adf.154854",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 5892.450927734375,
-        "y": 5567.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5542.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cd6a7530.d2bb8"
+                "92f6a716.223fa8"
             ]
         ]
     },
     {
-        "id": "24f63010.71743",
+        "id": "4e1edc90.74b29c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5569.951171875,
-        "y": 5652.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5627.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a1473e64.1f4fc8"
+                "9e924b4c.b75db"
             ]
         ]
     },
     {
-        "id": "a1473e64.1f4fc8",
+        "id": "9e924b4c.b75db",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 5748.951171875,
-        "y": 5668.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5643.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "72760d9d.ebda64",
+        "id": "17a91916.50ea6f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 5730.951171875,
-        "y": 5620.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5595.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b65e14dd.2b2b98",
+        "id": "21c4fa1a.b93b46",
         "type": "execute",
         "name": "execute RestApiCallNode Delete UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.rootconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.ROOT.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 5279.951171875,
-        "y": 5723.399627685547,
-        "z": "8bd89607.6248d8",
+        "y": 5697.685394287109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f4d26e19.4a33a",
-                "2b318383.32132c"
+                "95033c2a.09c67",
+                "f1a877c4.a203d8"
             ]
         ]
     },
     {
-        "id": "f4d26e19.4a33a",
+        "id": "95033c2a.09c67",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5628.451171875,
-        "y": 5705.399627685547,
-        "z": "8bd89607.6248d8",
+        "y": 5679.685394287109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cc266f68.3170a8"
+                "76c41eff.4cfe88"
             ]
         ]
     },
     {
-        "id": "cc266f68.3170a8",
+        "id": "76c41eff.4cfe88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 5884.451171875,
-        "y": 5708.399627685547,
-        "z": "8bd89607.6248d8",
+        "y": 5682.685394287109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e9302632.da2fb8",
+        "id": "eb3b6335.123de8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -5435,190 +5435,190 @@
         "comments": "",
         "outputs": 1,
         "x": 5836.951171875,
-        "y": 5749.399627685547,
-        "z": "8bd89607.6248d8",
+        "y": 5723.685394287109,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b318383.32132c",
+        "id": "f1a877c4.a203d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5638.451171875,
-        "y": 5754.399627685547,
-        "z": "8bd89607.6248d8",
+        "y": 5728.685394287109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e9302632.da2fb8"
+                "eb3b6335.123de8"
             ]
         ]
     },
     {
-        "id": "37db8c04.dcc65c",
+        "id": "6146efb2.cf13d",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.rootconn.access-provider-id + '-clientId-' +\n                                                   $tmp.rootconn.access-client-id + '-topologyId-' +\n                                                   $tmp.rootconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.rootconn.access-node-id`\" />\n",
         "comments": "",
         "x": 5361.450927734375,
-        "y": 5535.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5510.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "cd6a7530.d2bb8",
+        "id": "92f6a716.223fa8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6087.450927734375,
-        "y": 5567.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5542.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "40d39185.b5e49"
+                "bd55517c.f87f1"
             ]
         ]
     },
     {
-        "id": "96e4f3b6.f5cd5",
+        "id": "8bf8b16.3c18f5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 6469.450927734375,
-        "y": 5571.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5546.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4ecdd233.2c761c",
-                "4b4d74a7.6aa104",
-                "563a66cd.e07e68"
+                "1bd48f8a.cba628",
+                "1ea10909.ec8b57",
+                "ecac1508.b763"
             ]
         ]
     },
     {
-        "id": "40d39185.b5e49",
+        "id": "bd55517c.f87f1",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6290.450927734375,
-        "y": 5571.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5546.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "96e4f3b6.f5cd5"
+                "8bf8b16.3c18f5"
             ]
         ]
     },
     {
-        "id": "4b4d74a7.6aa104",
+        "id": "1ea10909.ec8b57",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 6675.450927734375,
-        "y": 5584.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5559.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5212e394.a625ac",
-                "8a0a8abd.557d58",
-                "fe612827.fce1d"
+                "830127bc.8c4c18",
+                "adc00906.538428",
+                "5c009e0.e4c98e4"
             ]
         ]
     },
     {
-        "id": "4ecdd233.2c761c",
+        "id": "1bd48f8a.cba628",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 6705.450927734375,
-        "y": 5532.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5507.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5212e394.a625ac",
+        "id": "830127bc.8c4c18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6885.450927734375,
-        "y": 5575.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5550.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "22d6ab8e.b3d594"
+                "ea1d97d5.52d0a"
             ]
         ]
     },
     {
-        "id": "8a0a8abd.557d58",
+        "id": "adc00906.538428",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6877.450927734375,
-        "y": 5630.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5605.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d2e549e.aa0e038"
+                "283c974a.c2fc28"
             ]
         ]
     },
     {
-        "id": "fe612827.fce1d",
+        "id": "5c009e0.e4c98e4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6882.450927734375,
-        "y": 5687.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5662.085784912109,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "18a7205c.94ea5"
+                "dbf169ab.c4c478"
             ]
         ]
     },
     {
-        "id": "18a7205c.94ea5",
+        "id": "dbf169ab.c4c478",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 7034.450927734375,
-        "y": 5688.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5663.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d2e549e.aa0e038",
+        "id": "283c974a.c2fc28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 7045.450927734375,
-        "y": 5633.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5608.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "22d6ab8e.b3d594",
+        "id": "ea1d97d5.52d0a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5626,38 +5626,38 @@
         "comments": "",
         "outputs": 1,
         "x": 7029.833251953125,
-        "y": 5573.4556884765625,
-        "z": "8bd89607.6248d8",
+        "y": 5547.741455078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c312e16c.c44d58"
+                "eea057d1.d2c178"
             ]
         ]
     },
     {
-        "id": "c312e16c.c44d58",
+        "id": "eea057d1.d2c178",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 7244.450927734375,
-        "y": 5569.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5544.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "563a66cd.e07e68",
+        "id": "ecac1508.b763",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 6625.450927734375,
-        "y": 5648.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 5623.085784912109,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "cc595a48.1912e8",
+        "id": "e8fee7bd.fc2ef8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5665,77 +5665,77 @@
         "comments": "",
         "outputs": 1,
         "x": 3854.88330078125,
-        "y": 3537.999969482422,
-        "z": "8bd89607.6248d8",
+        "y": 3512.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "eec6a040.1af03",
-                "d560f701.2c7f08"
+                "4b07eb9e.ad1084",
+                "449a6f75.ecc4d"
             ]
         ]
     },
     {
-        "id": "eec6a040.1af03",
+        "id": "4b07eb9e.ad1084",
         "type": "set",
         "name": "set tmp.mmUNI-id-long",
         "xml": "<set>\n<parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 4045.466552734375,
-        "y": 3480.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 3455.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d560f701.2c7f08",
+        "id": "449a6f75.ecc4d",
         "type": "switchNode",
         "name": "switch tmp.mmUNI-id-long != ROOT UNI",
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4092.466552734375,
-        "y": 3551.800018310547,
-        "z": "8bd89607.6248d8",
+        "y": 3526.0857849121094,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "70d2875.2f53ff8",
-                "b1bb56dc.337f2"
+                "a5622a5e.b03c68",
+                "1b2b72f4.a20bdd"
             ]
         ]
     },
     {
-        "id": "70d2875.2f53ff8",
+        "id": "a5622a5e.b03c68",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4330.884033203125,
-        "y": 3510.999969482422,
-        "z": "8bd89607.6248d8",
+        "y": 3485.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f216f825.2991a8"
+                "d22a60e2.fd2778"
             ]
         ]
     },
     {
-        "id": "b1bb56dc.337f2",
+        "id": "1b2b72f4.a20bdd",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4337.884246826172,
-        "y": 3567.9999389648438,
-        "z": "8bd89607.6248d8",
+        "y": 3542.2857055664062,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "28b93260.26eace"
+                "b7814ecb.1580d"
             ]
         ]
     },
     {
-        "id": "f216f825.2991a8",
+        "id": "d22a60e2.fd2778",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5743,126 +5743,126 @@
         "comments": "",
         "outputs": 1,
         "x": 4458.884521484375,
-        "y": 3506.999969482422,
-        "z": "8bd89607.6248d8",
+        "y": 3481.2857360839844,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b9e9be73.6c3be",
+        "id": "3c679d7f.fbbb22",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",
         "comments": "",
         "x": 3314.083251953125,
-        "y": 3465.400115966797,
-        "z": "8bd89607.6248d8",
+        "y": 3439.6858825683594,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d7647a1a.599238",
+        "id": "da386631.67d8c8",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",
         "comments": "",
         "x": 5295.91748046875,
-        "y": 3467.400146484375,
-        "z": "8bd89607.6248d8",
+        "y": 3441.6859130859375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1414f243.3459be",
+        "id": "5fa67fdd.e511b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4407.6669921875,
-        "y": 3987.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 3961.9024353027344,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "45f92202.e9d224",
-                "9274acbb.bb64f"
+                "a814439f.bac2e",
+                "f8d770ba.37d44"
             ]
         ]
     },
     {
-        "id": "45f92202.e9d224",
+        "id": "a814439f.bac2e",
         "type": "set",
         "name": "set tmp.uni.id",
         "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 4580.5498046875,
-        "y": 3983.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 3957.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "9274acbb.bb64f",
+        "id": "f8d770ba.37d44",
         "type": "save",
         "name": "get uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.uni.id\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4583.5498046875,
-        "y": 4030.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 4004.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4b44a73a.87e16",
-                "13d9fc09.409024",
-                "52115c05.c8dcf4"
+                "7fc95f5b.ec381",
+                "28603ae9.d6e726",
+                "f736ad43.136778"
             ]
         ]
     },
     {
-        "id": "4b44a73a.87e16",
+        "id": "7fc95f5b.ec381",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4755.5498046875,
-        "y": 4014.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 3988.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "40f66b99.edebbc"
+                "47e06d70.96544c"
             ]
         ]
     },
     {
-        "id": "13d9fc09.409024",
+        "id": "28603ae9.d6e726",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4756.040771484375,
-        "y": 4059.850372314453,
-        "z": "8bd89607.6248d8",
+        "y": 4034.1361389160156,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "52115c05.c8dcf4",
+        "id": "f736ad43.136778",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4756.5498046875,
-        "y": 4100.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 4074.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "40f66b99.edebbc",
+        "id": "47e06d70.96544c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -5870,165 +5870,165 @@
         "comments": "",
         "outputs": 1,
         "x": 4916.5498046875,
-        "y": 4010.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 3984.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "de7bc652.3681b8",
-                "eebe95d8.077038",
-                "efb01679.580728"
+                "db3d2916.05167",
+                "b1e93bbf.154be8",
+                "2727d594.264d9a"
             ]
         ]
     },
     {
-        "id": "f38b6801.52bee8",
+        "id": "3055c73f.990de",
         "type": "comment",
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",
         "info": "",
         "comments": "",
         "x": 5249.5498046875,
-        "y": 3941.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 3915.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "eebe95d8.077038",
+        "id": "b1e93bbf.154be8",
         "type": "execute",
         "name": "execute split id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5184.5498046875,
-        "y": 3998.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 3972.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "20f99809.a45e68",
-                "f98fd083.5f84c"
+                "8ed99d07.46ccf",
+                "dfad78a0.2e2798"
             ]
         ]
     },
     {
-        "id": "f98fd083.5f84c",
+        "id": "dfad78a0.2e2798",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5407.5498046875,
-        "y": 3984.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 3958.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e9001fe4.5ec9"
+                "40b7643c.aa9b44"
             ]
         ]
     },
     {
-        "id": "20f99809.a45e68",
+        "id": "8ed99d07.46ccf",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5409.5498046875,
-        "y": 4017.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 3991.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c4ea9853.8f7b9"
+                "2c3f5774.427218"
             ]
         ]
     },
     {
-        "id": "e9001fe4.5ec9",
+        "id": "40b7643c.aa9b44",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5555.5498046875,
-        "y": 3977.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 3951.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "efdb6ef0.5c83c"
+                "49b755b0.ff456c"
             ]
         ]
     },
     {
-        "id": "c4ea9853.8f7b9",
+        "id": "2c3f5774.427218",
         "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": 5552.5498046875,
-        "y": 4014.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 3988.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "efdb6ef0.5c83c",
+        "id": "49b755b0.ff456c",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.uni.pnf-name' value=\"`$param-prefix-uni-pnfName[0] + '-' +\n                                                   $param-prefix-uni-pnfName[1] + '-' +\n                                                   $param-prefix-uni-pnfName[2] + '-' +\n                                                   $param-prefix-uni-pnfName[3] + '-' +\n                                                   $param-prefix-uni-pnfName[4] + '-' +\n                                                   $param-prefix-uni-pnfName[5] + '-' +\n                                                   $param-prefix-uni-pnfName[6] + '-' +\n                                                   $param-prefix-uni-pnfName[7] + '-' +\n                                                   $param-prefix-uni-pnfName[8]`\" />\n",
         "comments": "",
         "x": 5732.5498046875,
-        "y": 3977.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 3951.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "de7bc652.3681b8",
+        "id": "db3d2916.05167",
         "type": "switchNode",
         "name": "switch uni-tp-id-node-part is the same as the LEAF node",
         "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5228.5498046875,
-        "y": 4132.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 4106.562103271484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7639ee60.41df3",
-                "7e06cc80.35387c"
+                "76a8963f.4621b8",
+                "22179ab4.cea27e"
             ]
         ]
     },
     {
-        "id": "7639ee60.41df3",
+        "id": "76a8963f.4621b8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5509.5498046875,
-        "y": 4109.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 4083.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d6573f78.845c78"
+                "cdc60b24.0ad9a8"
             ]
         ]
     },
     {
-        "id": "7e06cc80.35387c",
+        "id": "22179ab4.cea27e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5502.5498046875,
-        "y": 4168.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 4142.562103271484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "14bc3378.1253a5"
+                "5846229.a88c65c"
             ]
         ]
     },
     {
-        "id": "d6573f78.845c78",
+        "id": "cdc60b24.0ad9a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6036,14 +6036,14 @@
         "comments": "",
         "outputs": 1,
         "x": 5639.5498046875,
-        "y": 4113.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 4087.5621032714844,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "14bc3378.1253a5",
+        "id": "5846229.a88c65c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -6051,276 +6051,276 @@
         "comments": "",
         "outputs": 1,
         "x": 5644.5498046875,
-        "y": 4167.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 4141.562103271484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f0b195ca.19df6",
-                "fec7cdec.3f23"
+                "a9c7c427.af4688",
+                "fe9fa034.5cb01"
             ]
         ]
     },
     {
-        "id": "f0b195ca.19df6",
+        "id": "a9c7c427.af4688",
         "type": "set",
         "name": "set no-pce-call",
         "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",
         "comments": "",
         "x": 5836.5498046875,
-        "y": 4134.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 4108.562103271484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "14cfe3f0.60188c",
+        "id": "98a16c7e.29ab68",
         "type": "set",
         "name": "set middle-man-conn",
         "xml": "<set>\n<parameter name='middle-man-conn.' value='`$tmp.aai.all-connectivities.connectivity[$connidx].`' />\n",
         "comments": "",
         "x": 5852.5498046875,
-        "y": 4186.276336669922,
-        "z": "8bd89607.6248d8",
+        "y": 4160.562103271484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "fec7cdec.3f23",
+        "id": "fe9fa034.5cb01",
         "type": "set",
         "name": "set tmp.stillHasUni and tmp.keepVPNBs to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n<parameter name='tmp.keepVPNBs' value='true' />\n",
         "comments": "",
         "x": 5870.83349609375,
-        "y": 4255.866668701172,
-        "z": "8bd89607.6248d8",
+        "y": 4230.152435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "efb01679.580728",
+        "id": "2727d594.264d9a",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
         "x": 5147.533203125,
-        "y": 4081.766571044922,
-        "z": "8bd89607.6248d8",
+        "y": 4056.0523376464844,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "16d898b2.82d4af",
+        "id": "c0a1014a.3ea75",
         "type": "switchNode",
         "name": "switch tmp.stillHasUni?",
         "xml": "\n<switch test=\"`$tmp.stillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 383.7339172363281,
-        "y": 5351.966278076172,
-        "z": "8bd89607.6248d8",
+        "y": 5326.252044677734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2ef37de6.fb696a",
-                "d4b46a3b.e544d"
+                "5bc4629f.a764e4",
+                "36ea940e.f6b704"
             ]
         ]
     },
     {
-        "id": "bb7a24ed.4756b",
+        "id": "529ae160.378f78",
         "type": "save",
         "name": "get root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 4288.516357421875,
-        "y": 5515.850067138672,
-        "z": "8bd89607.6248d8",
+        "y": 5490.135833740234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b93cd05c.18e338",
-                "28c478b5.8c3cf",
-                "ad4069fd.35ec2"
+                "e3e4b7ad.cfce5",
+                "2311d61f.89de52",
+                "cab68c6b.abd21"
             ]
         ]
     },
     {
-        "id": "cd789bfb.94ca8",
+        "id": "2b4c8a8a.8bc066",
         "type": "comment",
         "name": "Update ROOT UNI's bw -- ALREADY DONE",
         "info": "",
         "comments": "",
         "x": 4286.516845703125,
-        "y": 5467.850311279297,
-        "z": "8bd89607.6248d8",
+        "y": 5442.136077880859,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f7d2d4f8.f1e648",
+        "id": "89e149ab.f2e7c8",
         "type": "save",
         "name": "update ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
         "x": 4903.5166015625,
-        "y": 5585.850311279297,
-        "z": "8bd89607.6248d8",
+        "y": 5560.136077880859,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "28c478b5.8c3cf",
+        "id": "2311d61f.89de52",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4506.007568359375,
-        "y": 5486.424285888672,
-        "z": "8bd89607.6248d8",
+        "y": 5460.710052490234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4927866f.a84e1"
+                "983c2552.f1f49"
             ]
         ]
     },
     {
-        "id": "ad4069fd.35ec2",
+        "id": "cab68c6b.abd21",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4501.5166015625,
-        "y": 5530.850250244141,
-        "z": "8bd89607.6248d8",
+        "y": 5505.136016845703,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c4a31719.674e"
+                "62a8aa1.663f1d4"
             ]
         ]
     },
     {
-        "id": "4927866f.a84e1",
+        "id": "983c2552.f1f49",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 4668.5791015625,
-        "y": 5485.709991455078,
-        "z": "8bd89607.6248d8",
+        "y": 5459.995758056641,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c4a31719.674e",
+        "id": "62a8aa1.663f1d4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4669.5166015625,
-        "y": 5530.850250244141,
-        "z": "8bd89607.6248d8",
+        "y": 5505.136016845703,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f08cda49.ab7188",
+        "id": "d78e13a5.01de9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4666.5166015625,
-        "y": 5580.850311279297,
-        "z": "8bd89607.6248d8",
+        "y": 5555.136077880859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ed324322.59277",
-                "f7d2d4f8.f1e648"
+                "7bde7792.d9b138",
+                "89e149ab.f2e7c8"
             ]
         ]
     },
     {
-        "id": "b93cd05c.18e338",
+        "id": "e3e4b7ad.cfce5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4497.5166015625,
-        "y": 5580.850311279297,
-        "z": "8bd89607.6248d8",
+        "y": 5555.136077880859,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f08cda49.ab7188"
+                "d78e13a5.01de9"
             ]
         ]
     },
     {
-        "id": "ed324322.59277",
+        "id": "7bde7792.d9b138",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
         "x": 4859.517578125,
-        "y": 5505.850311279297,
-        "z": "8bd89607.6248d8",
+        "y": 5480.136077880859,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "61d36925.a62e",
+        "id": "cf4ce975.93215",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 5288.216796875,
-        "y": 5443.616912841797,
-        "z": "8bd89607.6248d8",
+        "y": 5417.902679443359,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "31a9971.ad96268",
+        "id": "ea983e85.321ce",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5314,
-        "y": 5485.817108154297,
-        "z": "8bd89607.6248d8",
+        "y": 5460.102874755859,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ef37de6.fb696a",
+        "id": "5bc4629f.a764e4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 567.8836059570312,
-        "y": 5402.999969482422,
-        "z": "8bd89607.6248d8",
+        "y": 5377.285736083984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "97fb2b7.67063d8"
+                "867bdfac.94705"
             ]
         ]
     },
     {
-        "id": "d4b46a3b.e544d",
+        "id": "36ea940e.f6b704",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 550.883544921875,
-        "y": 5324.999969482422,
-        "z": "8bd89607.6248d8",
+        "y": 5299.285736083984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d28cabbc.30ca5"
+                "ab9e57cf.8ef448"
             ]
         ]
     },
     {
-        "id": "4a0919d1.fbc9d8",
+        "id": "eb7859d4.8fd35",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6328,122 +6328,122 @@
         "comments": "",
         "outputs": 1,
         "x": 679.8833923339844,
-        "y": 4411.999694824219,
-        "z": "8bd89607.6248d8",
+        "y": 4386.285461425781,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "551f2a9f.a9466c",
-                "6f7adb55.d0de94",
-                "7279f474.ca532c",
-                "c28774e0.0f37e8",
-                "fd804c17.d00668",
-                "6504876a.65a0e",
-                "d39caf18.6babe"
+                "8a11a728.e1b1d8",
+                "7438f980.400318",
+                "6c2db8ea.27724",
+                "a48617f3.9f6e4",
+                "5ff63bef.c5afdc",
+                "78f62ea.0af84d",
+                "d07ac0db.fa9818"
             ]
         ]
     },
     {
-        "id": "551f2a9f.a9466c",
+        "id": "8a11a728.e1b1d8",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
         "x": 931.5667419433594,
-        "y": 4390.049499511719,
-        "z": "8bd89607.6248d8",
+        "y": 4364.335266113281,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1a5de4c8.98ba3b",
+        "id": "8aa064fb.543668",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
         "x": 1033.1338806152344,
-        "y": 4338.132995605469,
-        "z": "8bd89607.6248d8",
+        "y": 4312.418762207031,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "35555086.07bd08",
+        "id": "821af189.946d58",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",
         "comments": "",
         "x": 1140.9837341308594,
-        "y": 4419.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4393.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6f7adb55.d0de94",
+        "id": "7438f980.400318",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 911.9837341308594,
-        "y": 4508.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4482.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "35555086.07bd08",
-                "f6475b04.522d68"
+                "821af189.946d58",
+                "139cfd47.53e94b"
             ]
         ]
     },
     {
-        "id": "f6475b04.522d68",
+        "id": "139cfd47.53e94b",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 1147.9837341308594,
-        "y": 4501.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4475.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d9d0b846.fc4eb",
-                "859bebef.e15268",
-                "82bf3fe2.ca776"
+                "df64900d.741c98",
+                "681e1ffc.26592",
+                "ab39d1b3.416b58"
             ]
         ]
     },
     {
-        "id": "d9d0b846.fc4eb",
+        "id": "df64900d.741c98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1343.4838562011719,
-        "y": 4453.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4427.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "54e66745.d0a218"
+                "6f395e40.dc6b7"
             ]
         ]
     },
     {
-        "id": "859bebef.e15268",
+        "id": "681e1ffc.26592",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1335.4838562011719,
-        "y": 4508.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4482.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6c2244a0.55dae4"
+                "b25568a6.369d78"
             ]
         ]
     },
     {
-        "id": "54e66745.d0a218",
+        "id": "6f395e40.dc6b7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6451,180 +6451,180 @@
         "comments": "",
         "outputs": 1,
         "x": 1487.8661804199219,
-        "y": 4452.988861083984,
-        "z": "8bd89607.6248d8",
+        "y": 4427.274627685547,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c5450793.0d4ff8"
+                "94a27fe.8c889"
             ]
         ]
     },
     {
-        "id": "c5450793.0d4ff8",
+        "id": "94a27fe.8c889",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 1671.9837341308594,
-        "y": 4451.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4425.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8c14dfae.797ac"
+                "b448ea96.4c3af8"
             ]
         ]
     },
     {
-        "id": "8c14dfae.797ac",
+        "id": "b448ea96.4c3af8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1866.9837341308594,
-        "y": 4451.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4425.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2cd4e727.640d2"
+                "77dc6e4f.3fb428"
             ]
         ]
     },
     {
-        "id": "82bf3fe2.ca776",
+        "id": "ab39d1b3.416b58",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1340.4838562011719,
-        "y": 4565.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4539.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1f28baf3.4c601d"
+                "42bc5c1d.fe55cc"
             ]
         ]
     },
     {
-        "id": "1f28baf3.4c601d",
+        "id": "42bc5c1d.fe55cc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 1492.4838562011719,
-        "y": 4566.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4540.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6c2244a0.55dae4",
+        "id": "b25568a6.369d78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 1503.4838562011719,
-        "y": 4509.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4483.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c7d8a4a1.11fab",
+        "id": "80f1bf38.0bc68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2248.9837341308594,
-        "y": 4455.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4429.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "51d3a91c.c42e68",
-                "d0954d9b.2799a8",
-                "454e24ff.d6924c"
+                "cad7009f.f83538",
+                "d1a2dd14.715a78",
+                "689fc80.c15b238"
             ]
         ]
     },
     {
-        "id": "2cd4e727.640d2",
+        "id": "77dc6e4f.3fb428",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2069.9837341308594,
-        "y": 4455.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4429.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c7d8a4a1.11fab"
+                "80f1bf38.0bc68"
             ]
         ]
     },
     {
-        "id": "7279f474.ca532c",
+        "id": "6c2db8ea.27724",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1053.4839782714844,
-        "y": 4612.932800292969,
-        "z": "8bd89607.6248d8",
+        "y": 4587.218566894531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "63493229.c5487c",
-                "9b59a379.ae234"
+                "c3b5c5e7.57693",
+                "cf1b7699.e71658"
             ]
         ]
     },
     {
-        "id": "9b59a379.ae234",
+        "id": "cf1b7699.e71658",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1417.9837341308594,
-        "y": 4660.932800292969,
-        "z": "8bd89607.6248d8",
+        "y": 4635.218566894531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7641260e.a4325"
+                "723bcced.729e54"
             ]
         ]
     },
     {
-        "id": "63493229.c5487c",
+        "id": "c3b5c5e7.57693",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1413.9837341308594,
-        "y": 4620.932800292969,
-        "z": "8bd89607.6248d8",
+        "y": 4595.218566894531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3e92540.7763d2c"
+                "408278c5.7e5798"
             ]
         ]
     },
     {
-        "id": "3e92540.7763d2c",
+        "id": "408278c5.7e5798",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 1571.9837341308594,
-        "y": 4620.932800292969,
-        "z": "8bd89607.6248d8",
+        "y": 4595.218566894531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7641260e.a4325",
+        "id": "723bcced.729e54",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -6632,113 +6632,113 @@
         "comments": "",
         "outputs": 1,
         "x": 1575.4837341308594,
-        "y": 4660.932800292969,
-        "z": "8bd89607.6248d8",
+        "y": 4635.218566894531,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d0954d9b.2799a8",
+        "id": "d1a2dd14.715a78",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 2454.9837341308594,
-        "y": 4468.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4442.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "53623639.5d8eb",
-                "11f800c8.cf014f",
-                "e0ce2e99.74a758"
+                "e07edffa.c89278",
+                "8645511b.c4b66",
+                "a8a5443b.9b8a2"
             ]
         ]
     },
     {
-        "id": "51d3a91c.c42e68",
+        "id": "cad7009f.f83538",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 2484.9837341308594,
-        "y": 4416.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4390.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "53623639.5d8eb",
+        "id": "e07edffa.c89278",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2664.9837341308594,
-        "y": 4459.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4433.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "73587898.c5bc6"
+                "cb5c9c8e.bb8ed8"
             ]
         ]
     },
     {
-        "id": "11f800c8.cf014f",
+        "id": "8645511b.c4b66",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2656.9837341308594,
-        "y": 4514.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4488.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7759dd63.3c0bd4"
+                "29fe474c.df75c8"
             ]
         ]
     },
     {
-        "id": "e0ce2e99.74a758",
+        "id": "a8a5443b.9b8a2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2661.9837341308594,
-        "y": 4571.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4545.618957519531,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "29744fd6.f0a3"
+                "b28b1e53.869fb"
             ]
         ]
     },
     {
-        "id": "29744fd6.f0a3",
+        "id": "b28b1e53.869fb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2813.9837341308594,
-        "y": 4572.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4546.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7759dd63.3c0bd4",
+        "id": "29fe474c.df75c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2824.9837341308594,
-        "y": 4517.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4491.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "73587898.c5bc6",
+        "id": "cb5c9c8e.bb8ed8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6746,101 +6746,101 @@
         "comments": "",
         "outputs": 1,
         "x": 2809.3660583496094,
-        "y": 4456.988861083984,
-        "z": "8bd89607.6248d8",
+        "y": 4431.274627685547,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2b6c0b59.4c3f54"
+                "a908cc9.5d7f7b"
             ]
         ]
     },
     {
-        "id": "2b6c0b59.4c3f54",
+        "id": "a908cc9.5d7f7b",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 3023.9837341308594,
-        "y": 4453.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4427.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "454e24ff.d6924c",
+        "id": "689fc80.c15b238",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2404.9837341308594,
-        "y": 4532.333190917969,
-        "z": "8bd89607.6248d8",
+        "y": 4506.618957519531,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c28774e0.0f37e8",
+        "id": "a48617f3.9f6e4",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1082.5667419433594,
-        "y": 4833.049499511719,
-        "z": "8bd89607.6248d8",
+        "y": 4807.335266113281,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd804c17.d00668",
+        "id": "5ff63bef.c5afdc",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 897.5667419433594,
-        "y": 4900.049499511719,
-        "z": "8bd89607.6248d8",
+        "y": 4874.335266113281,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c90d3790.0c31f",
-                "b432c8fe.988cb"
+                "bcfca35c.21654",
+                "62c7d864.119b88"
             ]
         ]
     },
     {
-        "id": "c90d3790.0c31f",
+        "id": "bcfca35c.21654",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1162.5667419433594,
-        "y": 4885.049499511719,
-        "z": "8bd89607.6248d8",
+        "y": 4859.335266113281,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b12f48c6.75129"
+                "f4258877.5e35f"
             ]
         ]
     },
     {
-        "id": "b432c8fe.988cb",
+        "id": "62c7d864.119b88",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1158.5667419433594,
-        "y": 4933.049499511719,
-        "z": "8bd89607.6248d8",
+        "y": 4907.335266113281,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7a2784c6.a60bf4"
+                "3fb79094.abfaa8"
             ]
         ]
     },
     {
-        "id": "b12f48c6.75129",
+        "id": "f4258877.5e35f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -6848,66 +6848,66 @@
         "comments": "",
         "outputs": 1,
         "x": 1318.5667419433594,
-        "y": 4881.049499511719,
-        "z": "8bd89607.6248d8",
+        "y": 4855.335266113281,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b537e67c.ce751"
+                "2140ac57.1e83f4"
             ]
         ]
     },
     {
-        "id": "7a2784c6.a60bf4",
+        "id": "3fb79094.abfaa8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
         "x": 1306.5667419433594,
-        "y": 4928.049499511719,
-        "z": "8bd89607.6248d8",
+        "y": 4902.335266113281,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5b301854.48435",
+        "id": "8db3fd20.37f318",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 1587.4664001464844,
-        "y": 4831.749694824219,
-        "z": "8bd89607.6248d8",
+        "y": 4806.035461425781,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b537e67c.ce751",
+        "id": "2140ac57.1e83f4",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 1613.2496032714844,
-        "y": 4873.949890136719,
-        "z": "8bd89607.6248d8",
+        "y": 4848.235656738281,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "46575909.129948",
+        "id": "440b33d.dbb8acc",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1026.8833923339844,
-        "y": 4147.316589355469,
-        "z": "8bd89607.6248d8",
+        "y": 4121.602355957031,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d28cabbc.30ca5",
+        "id": "ab9e57cf.8ef448",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6915,17 +6915,17 @@
         "comments": "",
         "outputs": 1,
         "x": 632.8834228515625,
-        "y": 4151.999725341797,
-        "z": "8bd89607.6248d8",
+        "y": 4126.285491943359,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "46575909.129948",
-                "4a0919d1.fbc9d8"
+                "440b33d.dbb8acc",
+                "eb7859d4.8fd35"
             ]
         ]
     },
     {
-        "id": "97fb2b7.67063d8",
+        "id": "867bdfac.94705",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6933,175 +6933,175 @@
         "comments": "",
         "outputs": 1,
         "x": 716.3333740234375,
-        "y": 5404.516571044922,
-        "z": "8bd89607.6248d8",
+        "y": 5378.802337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8c98b36e.448bc8",
-                "4b4a8b6f.30cb4c",
-                "232ef942.027ea6",
-                "9956c6b0.e8f5b"
+                "c644609d.44bce",
+                "e7413115.aec04",
+                "d006cbe4.5a677",
+                "c786893c.7012b"
             ]
         ]
     },
     {
-        "id": "8c98b36e.448bc8",
+        "id": "c644609d.44bce",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1077.7166748046875,
-        "y": 5167.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5141.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b4a8b6f.30cb4c",
+        "id": "e7413115.aec04",
         "type": "save",
         "name": "delete LEAF connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
         "x": 988.7166748046875,
-        "y": 5236.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5210.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "232ef942.027ea6",
+        "id": "d006cbe4.5a677",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 879.88330078125,
-        "y": 5471.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5445.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3ef7ef40.ec34",
-                "afe6825d.3e4ed8",
-                "56fc7b03.ef7a34"
+                "614e61f8.50b5f",
+                "96d6a1ec.c795b",
+                "90aff610.9959f8"
             ]
         ]
     },
     {
-        "id": "8f4e88cb.a2731",
+        "id": "7ca77be7.05ec8c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 2588.882568359375,
-        "y": 5396.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5370.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4a46c897.331cf",
-                "c619cf4e.8ea4f8",
-                "c904c4c1.6a362"
+                "a9496568.146b9",
+                "c5f96edd.835cb8",
+                "e018fe0a.acb8a"
             ]
         ]
     },
     {
-        "id": "c656ce5c.18cf6",
+        "id": "b9815115.2c557",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2538.882568359375,
-        "y": 5460.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5434.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c0938886.470a7",
+        "id": "d05f3809.7521c8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 2618.882568359375,
-        "y": 5344.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5318.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4a46c897.331cf",
+        "id": "a9496568.146b9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2906.8826904296875,
-        "y": 5327.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5301.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a7e4d7d8.d8bee"
+                "b7511521.12ea3"
             ]
         ]
     },
     {
-        "id": "c619cf4e.8ea4f8",
+        "id": "c5f96edd.835cb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2898.8826904296875,
-        "y": 5382.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5356.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8289ee53.c79808"
+                "d009936c.baaf78"
             ]
         ]
     },
     {
-        "id": "c904c4c1.6a362",
+        "id": "e018fe0a.acb8a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2903.8826904296875,
-        "y": 5439.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5413.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6baa18e0.e89e88"
+                "a8c24324.12cd38"
             ]
         ]
     },
     {
-        "id": "6baa18e0.e89e88",
+        "id": "a8c24324.12cd38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 3055.8826904296875,
-        "y": 5440.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5414.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8289ee53.c79808",
+        "id": "d009936c.baaf78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 3066.8826904296875,
-        "y": 5385.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5359.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a7e4d7d8.d8bee",
+        "id": "b7511521.12ea3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7109,86 +7109,86 @@
         "comments": "",
         "outputs": 1,
         "x": 3051.2650146484375,
-        "y": 5325.172271728516,
-        "z": "8bd89607.6248d8",
+        "y": 5299.458038330078,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ec15425b.c6de8"
+                "87c431c3.fca34"
             ]
         ]
     },
     {
-        "id": "ec15425b.c6de8",
+        "id": "87c431c3.fca34",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 3265.8826904296875,
-        "y": 5321.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5295.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3ef7ef40.ec34",
+        "id": "614e61f8.50b5f",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.the-connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.the-connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.the-connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.the-connectivity.access-node-id`\" />\n",
         "comments": "",
         "x": 1161.88330078125,
-        "y": 5340.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5314.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a4339be5.b80c5",
+        "id": "c0a00c52.f1e878",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1372.3834228515625,
-        "y": 5479.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5453.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1127f42a.b3bf34"
+                "a9f88f76.4444c"
             ]
         ]
     },
     {
-        "id": "2e74a78.3df33d8",
+        "id": "62d1e19f.b39a2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1375.3834228515625,
-        "y": 5367.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5341.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5612018f.6df8"
+                "957f349.e76e4c8"
             ]
         ]
     },
     {
-        "id": "70a06659.f7e26",
+        "id": "b9cbc6ac.26846",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1367.3834228515625,
-        "y": 5422.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5396.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f549eabc.91dae8"
+                "48a6f350.0417c4"
             ]
         ]
     },
     {
-        "id": "5612018f.6df8",
+        "id": "957f349.e76e4c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7196,182 +7196,182 @@
         "comments": "",
         "outputs": 1,
         "x": 1509.765625,
-        "y": 5362.17236328125,
-        "z": "8bd89607.6248d8",
+        "y": 5336.4581298828125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e700427f.a90ed"
+                "d4741dab.7b5f78"
             ]
         ]
     },
     {
-        "id": "1127f42a.b3bf34",
+        "id": "a9f88f76.4444c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 1524.3834228515625,
-        "y": 5480.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5454.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f549eabc.91dae8",
+        "id": "48a6f350.0417c4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 1535.3834228515625,
-        "y": 5423.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5397.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e700427f.a90ed",
+        "id": "d4741dab.7b5f78",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 1696.8828125,
-        "y": 5363.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5337.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5799adae.feee0c"
+                "93c0e1e7.1663a8"
             ]
         ]
     },
     {
-        "id": "5799adae.feee0c",
+        "id": "93c0e1e7.1663a8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1924.8828125,
-        "y": 5356.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5330.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1e23480b.f981d8"
+                "eb0c27f.1616058"
             ]
         ]
     },
     {
-        "id": "afe6825d.3e4ed8",
+        "id": "96d6a1ec.c795b",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 1179.88330078125,
-        "y": 5415.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5389.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a4339be5.b80c5",
-                "2e74a78.3df33d8",
-                "70a06659.f7e26"
+                "c0a00c52.f1e878",
+                "62d1e19f.b39a2",
+                "b9cbc6ac.26846"
             ]
         ]
     },
     {
-        "id": "1e23480b.f981d8",
+        "id": "eb0c27f.1616058",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2130.8828125,
-        "y": 5353.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5327.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "82b93b0b.3752a"
+                "63e7e6f3.2a24f"
             ]
         ]
     },
     {
-        "id": "82b93b0b.3752a",
+        "id": "63e7e6f3.2a24f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2345.8822021484375,
-        "y": 5356.5166015625,
-        "z": "8bd89607.6248d8",
+        "y": 5330.8023681640625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c0938886.470a7",
-                "8f4e88cb.a2731",
-                "c656ce5c.18cf6"
+                "d05f3809.7521c8",
+                "7ca77be7.05ec8c",
+                "b9815115.2c557"
             ]
         ]
     },
     {
-        "id": "56fc7b03.ef7a34",
+        "id": "90aff610.9959f8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.the-connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1303.6500244140625,
-        "y": 5564.91650390625,
-        "z": "8bd89607.6248d8",
+        "y": 5539.2022705078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5de191f6.0adf08",
-                "8645dbc5.336bd"
+                "b38f67ee.531ff",
+                "7cc55d59.0067b4"
             ]
         ]
     },
     {
-        "id": "5de191f6.0adf08",
+        "id": "b38f67ee.531ff",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1650.1500244140625,
-        "y": 5557.91650390625,
-        "z": "8bd89607.6248d8",
+        "y": 5532.2022705078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1d2e7b8b.bb158c"
+                "bec12c24.0b2378"
             ]
         ]
     },
     {
-        "id": "8645dbc5.336bd",
+        "id": "7cc55d59.0067b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1654.1500244140625,
-        "y": 5597.91650390625,
-        "z": "8bd89607.6248d8",
+        "y": 5572.2022705078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7a1f5009.c19bf"
+                "9701e6f5.8bd518"
             ]
         ]
     },
     {
-        "id": "1d2e7b8b.bb158c",
+        "id": "bec12c24.0b2378",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 1808.1500244140625,
-        "y": 5557.91650390625,
-        "z": "8bd89607.6248d8",
+        "y": 5532.2022705078125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7a1f5009.c19bf",
+        "id": "9701e6f5.8bd518",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -7379,63 +7379,65 @@
         "comments": "",
         "outputs": 1,
         "x": 1811.6500244140625,
-        "y": 5597.91650390625,
-        "z": "8bd89607.6248d8",
+        "y": 5572.2022705078125,
+        "z": "1806503a.76a7a",
         "wires": [
-            []
+            [
+                "29311664.f24592"
+            ]
         ]
     },
     {
-        "id": "9956c6b0.e8f5b",
+        "id": "c786893c.7012b",
         "type": "switchNode",
         "name": "switch tmp.MMstillHasUni?",
         "xml": "\n<switch test=\"`$tmp.MMstillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 913.183349609375,
-        "y": 5894.716766357422,
-        "z": "8bd89607.6248d8",
+        "y": 5869.002532958984,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1b3dc283.1c72c5",
-                "6927d979.135438"
+                "a3861250.d254d8",
+                "3c90d5bf.82245a"
             ]
         ]
     },
     {
-        "id": "1b3dc283.1c72c5",
+        "id": "a3861250.d254d8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1107.183349609375,
-        "y": 5721.716796875,
-        "z": "8bd89607.6248d8",
+        "y": 5696.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "90688337.4fcde8"
+                "6ee92ba3.68178c"
             ]
         ]
     },
     {
-        "id": "6927d979.135438",
+        "id": "3c90d5bf.82245a",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1093.3500366210938,
-        "y": 6044.316864013672,
-        "z": "8bd89607.6248d8",
+        "y": 6018.602630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "66475002.0efde8"
+                "31cd7353.b764a4"
             ]
         ]
     },
     {
-        "id": "90688337.4fcde8",
+        "id": "6ee92ba3.68178c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7443,81 +7445,81 @@
         "comments": "",
         "outputs": 1,
         "x": 1255.35009765625,
-        "y": 5721.31689453125,
-        "z": "8bd89607.6248d8",
+        "y": 5695.6026611328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "88d77fb7.cde5d8",
-                "89314dbf.8366b8",
-                "68e0d31a.2e51f4"
+                "94f88b26.f34ce",
+                "497fa775.3b5f3",
+                "e88fc760.9f3988"
             ]
         ]
     },
     {
-        "id": "88d77fb7.cde5d8",
+        "id": "94f88b26.f34ce",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1677.199951171875,
-        "y": 5692.716796875,
-        "z": "8bd89607.6248d8",
+        "y": 5667.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "89314dbf.8366b8",
+        "id": "497fa775.3b5f3",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1492.199951171875,
-        "y": 5759.716796875,
-        "z": "8bd89607.6248d8",
+        "y": 5734.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4d863da6.047404",
-                "e3c67257.c0375"
+                "ef60935.82bca7",
+                "9065d9f2.54ee4"
             ]
         ]
     },
     {
-        "id": "4d863da6.047404",
+        "id": "ef60935.82bca7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1757.199951171875,
-        "y": 5744.716796875,
-        "z": "8bd89607.6248d8",
+        "y": 5719.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "798adf3a.473ef"
+                "2819744b.f6ef4c"
             ]
         ]
     },
     {
-        "id": "e3c67257.c0375",
+        "id": "9065d9f2.54ee4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1756.199951171875,
-        "y": 5792.716796875,
-        "z": "8bd89607.6248d8",
+        "y": 5767.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "88e52eb1.fc93f"
+                "8f406878.70a"
             ]
         ]
     },
     {
-        "id": "798adf3a.473ef",
+        "id": "2819744b.f6ef4c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -7525,52 +7527,52 @@
         "comments": "",
         "outputs": 1,
         "x": 1913.199951171875,
-        "y": 5740.716796875,
-        "z": "8bd89607.6248d8",
+        "y": 5715.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "733c34ed.517f9c"
+                "450da1ad.43b1d"
             ]
         ]
     },
     {
-        "id": "88e52eb1.fc93f",
+        "id": "8f406878.70a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
         "x": 1904.199951171875,
-        "y": 5787.716796875,
-        "z": "8bd89607.6248d8",
+        "y": 5762.0025634765625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "733c34ed.517f9c",
+        "id": "450da1ad.43b1d",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 2221.8826904296875,
-        "y": 5734.6171875,
-        "z": "8bd89607.6248d8",
+        "y": 5708.9029541015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "51bb42c1.6468fc",
+        "id": "af8bca67.a28908",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 2196.0994873046875,
-        "y": 5692.4169921875,
-        "z": "8bd89607.6248d8",
+        "y": 5666.7027587890625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "66475002.0efde8",
+        "id": "31cd7353.b764a4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7578,502 +7580,503 @@
         "comments": "",
         "outputs": 1,
         "x": 1230.916748046875,
-        "y": 6043.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6017.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a0a718de.f23a",
-                "e9e38848.54da1"
+                "a74b089b.225b08",
+                "ce915ff5.c8d31",
+                "73f93f1a.1715d8"
             ]
         ]
     },
     {
-        "id": "a0a718de.f23a",
+        "id": "a74b089b.225b08",
         "type": "for",
         "name": "for each relationship of middle-man-conn",
         "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1544.23291015625,
-        "y": 6037.816864013672,
-        "z": "8bd89607.6248d8",
+        "x": 1536.2328491210938,
+        "y": 5951.1025390625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "76936a5f.84bc84"
+                "1bf92ac3.705cd5"
             ]
         ]
     },
     {
-        "id": "76936a5f.84bc84",
+        "id": "1bf92ac3.705cd5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1844.566650390625,
-        "y": 6032.816802978516,
-        "z": "8bd89607.6248d8",
+        "y": 6007.102569580078,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "44a7328f.e8be34"
+                "adff6291.99a8f8"
             ]
         ]
     },
     {
-        "id": "44a7328f.e8be34",
+        "id": "adff6291.99a8f8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2024.2332763671875,
-        "y": 6032.81689453125,
-        "z": "8bd89607.6248d8",
+        "y": 6007.1026611328125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "208791a0.d9f786"
+                "b1717f1d.d23a28"
             ]
         ]
     },
     {
-        "id": "208791a0.d9f786",
+        "id": "b1717f1d.d23a28",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 2224.233154296875,
-        "y": 6032.816864013672,
-        "z": "8bd89607.6248d8",
+        "y": 6007.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "574a6228.5b1754",
-                "eafb76a9.ded53",
-                "327d9363.1aef4c"
+                "1b34e983.202196",
+                "d97ea61c.b38298",
+                "b46e47b0.7a7bf"
             ]
         ]
     },
     {
-        "id": "574a6228.5b1754",
+        "id": "1b34e983.202196",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2431.23291015625,
-        "y": 6082.816864013672,
-        "z": "8bd89607.6248d8",
+        "y": 6057.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "23760b0c.48685c"
+                "10e803bb.23c354"
             ]
         ]
     },
     {
-        "id": "460767d0.d2c1b8",
+        "id": "f69a3337.dd69",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 2408.466552734375,
-        "y": 6267.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6241.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "88082c33.393",
-                "e1f0fae1.b8f4d8",
-                "822aec8b.abd888"
+                "8e127971.6de7c",
+                "9a64470f.e555c",
+                "c5ecce15.749748"
             ]
         ]
     },
     {
-        "id": "6361e7ff.46b828",
+        "id": "1bd5cb93.6127c4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1607.466552734375,
-        "y": 6182.016571044922,
-        "z": "8bd89607.6248d8",
+        "x": 1577.4664916992188,
+        "y": 6284.30224609375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "75dfc93.82d2038"
+                "5280d91a.703f48"
             ]
         ]
     },
     {
-        "id": "75dfc93.82d2038",
+        "id": "5280d91a.703f48",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1804.466552734375,
-        "y": 6196.016571044922,
-        "z": "8bd89607.6248d8",
+        "x": 1774.4664916992188,
+        "y": 6298.30224609375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a28db7b9.a381c8",
-                "9f04b050.7c6fe8"
+                "4a3e493f.526ac",
+                "404c9cef.17796c"
             ]
         ]
     },
     {
-        "id": "a28db7b9.a381c8",
+        "id": "4a3e493f.526ac",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1972.466552734375,
-        "y": 6189.016571044922,
-        "z": "8bd89607.6248d8",
+        "x": 1978.466552734375,
+        "y": 6201.30224609375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "136ceea8.d9cdf9"
+                "e7cf2c0a.f8afd8"
             ]
         ]
     },
     {
-        "id": "136ceea8.d9cdf9",
+        "id": "e7cf2c0a.f8afd8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2135.466552734375,
-        "y": 6189.016571044922,
-        "z": "8bd89607.6248d8",
+        "x": 2159.466552734375,
+        "y": 6217.30224609375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "460767d0.d2c1b8"
+                "f69a3337.dd69"
             ]
         ]
     },
     {
-        "id": "9f04b050.7c6fe8",
+        "id": "404c9cef.17796c",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1988.466552734375,
-        "y": 6485.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6459.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5e0bc78d.ba716"
+                "55211637.c2f7e"
             ]
         ]
     },
     {
-        "id": "5e0bc78d.ba716",
+        "id": "55211637.c2f7e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2151.466552734375,
-        "y": 6485.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6459.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2848a471.d7d3ac"
+                "ad51c793.473678"
             ]
         ]
     },
     {
-        "id": "2848a471.d7d3ac",
+        "id": "ad51c793.473678",
         "type": "save",
         "name": "delete uni resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2394.466552734375,
-        "y": 6485.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6459.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "14cdbd34.9d5433",
+        "id": "76246a63.c65c94",
         "type": "save",
         "name": "delete connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1362.466552734375,
-        "y": 7251.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 7225.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "23760b0c.48685c",
+        "id": "10e803bb.23c354",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1433.466552734375,
-        "y": 6180.016571044922,
-        "z": "8bd89607.6248d8",
+        "x": 1403.4664916992188,
+        "y": 6282.30224609375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6361e7ff.46b828",
-                "14cdbd34.9d5433",
-                "468cb6c4.ffb168"
+                "1bd5cb93.6127c4",
+                "76246a63.c65c94",
+                "99412df0.04b4f8"
             ]
         ]
     },
     {
-        "id": "88082c33.393",
+        "id": "8e127971.6de7c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2619.466552734375,
-        "y": 6269.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6243.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "83017d89.d2d33"
+                "e6c2ee89.d3aff"
             ]
         ]
     },
     {
-        "id": "e1f0fae1.b8f4d8",
+        "id": "9a64470f.e555c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2619.95751953125,
-        "y": 6314.590606689453,
-        "z": "8bd89607.6248d8",
+        "y": 6288.876373291016,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ec259daf.cc4758"
+                "66f32499.9b808c"
             ]
         ]
     },
     {
-        "id": "822aec8b.abd888",
+        "id": "c5ecce15.749748",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2617.466552734375,
-        "y": 6358.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6332.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ba3c2552.11f0b"
+                "fc5f97c.17990e8"
             ]
         ]
     },
     {
-        "id": "327d9363.1aef4c",
+        "id": "b46e47b0.7a7bf",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2455.282958984375,
-        "y": 5983.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 5957.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "eafb76a9.ded53",
+        "id": "d97ea61c.b38298",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2452.7919921875,
-        "y": 6027.042633056641,
-        "z": "8bd89607.6248d8",
+        "y": 6001.328399658203,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e9e38848.54da1",
+        "id": "ce915ff5.c8d31",
         "type": "save",
         "name": "delete middle-man-conn resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1531.400146484375,
-        "y": 6112.416473388672,
-        "z": "8bd89607.6248d8",
+        "x": 1533.4000854492188,
+        "y": 6012.7021484375,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "83017d89.d2d33",
+        "id": "e6c2ee89.d3aff",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2785.466552734375,
-        "y": 6259.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6233.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c9d43f06.0d115",
-                "b37c19e0.f8f32",
-                "60da6725.d98bd8",
-                "be2af461.e005a",
-                "cbf01fd8.d058c"
+                "95de1448.b3be38",
+                "c13cc07f.32d48",
+                "89fea46.2857558",
+                "8c5b9c51.4573e8",
+                "a58a3e55.44161"
             ]
         ]
     },
     {
-        "id": "ba3c2552.11f0b",
+        "id": "fc5f97c.17990e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 2784.466552734375,
-        "y": 6357.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6331.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ec259daf.cc4758",
+        "id": "66f32499.9b808c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 2782.5289306640625,
-        "y": 6314.8763427734375,
-        "z": "8bd89607.6248d8",
+        "y": 6289.162109375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c9d43f06.0d115",
+        "id": "95de1448.b3be38",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
         "x": 3007.466552734375,
-        "y": 5977.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 5951.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b37c19e0.f8f32",
+        "id": "c13cc07f.32d48",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3033.466552734375,
-        "y": 6094.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6068.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "410583dd.d8121c",
-                "88eb934e.2f5b08",
-                "a865a4a5.d4df78"
+                "2f82e357.0b1ab4",
+                "be465fa4.6aba18",
+                "877ec4f6.c7b7a"
             ]
         ]
     },
     {
-        "id": "60da6725.d98bd8",
+        "id": "89fea46.2857558",
         "type": "execute",
         "name": "execute RestApiCallNode Delete OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
         "x": 3136.466552734375,
-        "y": 6361.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6335.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "72b47bea.9a0f24",
-                "66f0d6b4.eb7008"
+                "2931cfbe.d3d97",
+                "162b2290.6fc605"
             ]
         ]
     },
     {
-        "id": "be2af461.e005a",
+        "id": "8c5b9c51.4573e8",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3074.466552734375,
-        "y": 6496.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6470.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2f67e97f.141fd6",
-                "7b5fd505.3b0694"
+                "df16efa0.bafe28",
+                "bc60ff9d.7739e8"
             ]
         ]
     },
     {
-        "id": "cbf01fd8.d058c",
+        "id": "a58a3e55.44161",
         "type": "save",
         "name": "delete vpn-binding resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3055.466552734375,
-        "y": 6612.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6586.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "410583dd.d8121c",
+        "id": "2f82e357.0b1ab4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3228.9666748046875,
-        "y": 6046.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6020.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4a83ae1e.07b578"
+                "640fd481.180004"
             ]
         ]
     },
     {
-        "id": "88eb934e.2f5b08",
+        "id": "be465fa4.6aba18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3220.9666748046875,
-        "y": 6101.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6075.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "282085b8.0d4512"
+                "ecd8a620.92b268"
             ]
         ]
     },
     {
-        "id": "4a83ae1e.07b578",
+        "id": "640fd481.180004",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8081,176 +8084,176 @@
         "comments": "",
         "outputs": 1,
         "x": 3363.348876953125,
-        "y": 6040.672332763672,
-        "z": "8bd89607.6248d8",
+        "y": 6014.958099365234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "33baf8b0.f059c8"
+                "d1896cdb.8141"
             ]
         ]
     },
     {
-        "id": "a865a4a5.d4df78",
+        "id": "877ec4f6.c7b7a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3225.9666748046875,
-        "y": 6158.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6132.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "63323518.7bcbac"
+                "f05d5e82.949cd"
             ]
         ]
     },
     {
-        "id": "63323518.7bcbac",
+        "id": "f05d5e82.949cd",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 3377.9666748046875,
-        "y": 6159.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6133.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "282085b8.0d4512",
+        "id": "ecd8a620.92b268",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 3388.9666748046875,
-        "y": 6102.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6076.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7b5fd505.3b0694",
+        "id": "bc60ff9d.7739e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3327.466552734375,
-        "y": 6474.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6448.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "948366f4.fec95"
+                "7d696f2d.0f345"
             ]
         ]
     },
     {
-        "id": "2f67e97f.141fd6",
+        "id": "df16efa0.bafe28",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
         "x": 3327.466552734375,
-        "y": 6530.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6504.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "33baf8b0.f059c8",
+        "id": "d1896cdb.8141",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3550.466064453125,
-        "y": 6042.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6016.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e2cf1880.b9d7c"
+                "a3649162.b60c9"
             ]
         ]
     },
     {
-        "id": "e2cf1880.b9d7c",
+        "id": "a3649162.b60c9",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3791.466064453125,
-        "y": 6033.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6007.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bc484497.a79ff8"
+                "fd0af8f3.25299"
             ]
         ]
     },
     {
-        "id": "948366f4.fec95",
+        "id": "7d696f2d.0f345",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 3677.466064453125,
-        "y": 6464.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6438.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c37cd95d.368e7",
-                "92455633.bf0ee8"
+                "82ac773c.5adbc",
+                "f41b429.87576c"
             ]
         ]
     },
     {
-        "id": "72b47bea.9a0f24",
+        "id": "2931cfbe.d3d97",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3443.966064453125,
-        "y": 6386.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6360.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f1048a1f.996e4"
+                "41ca7b34.32b314"
             ]
         ]
     },
     {
-        "id": "66f0d6b4.eb7008",
+        "id": "162b2290.6fc605",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3444.966064453125,
-        "y": 6331.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6305.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "314550b5.0a064"
+                "6e74c50f.6753f4"
             ]
         ]
     },
     {
-        "id": "f1048a1f.996e4",
+        "id": "41ca7b34.32b314",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",
         "comments": "",
         "x": 3615.966064453125,
-        "y": 6384.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6358.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "314550b5.0a064",
+        "id": "6e74c50f.6753f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -8258,80 +8261,80 @@
         "comments": "",
         "outputs": 1,
         "x": 3612.466064453125,
-        "y": 6333.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6307.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "926cd0b8.871b1",
+        "id": "d394aeb8.1e7718",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4148.4658203125,
-        "y": 5982.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 5956.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e5e99dd1.35ed8",
-                "977d12a.f8bd9f",
-                "b449b2c0.535c38"
+                "5381b334.945d34",
+                "5cfd9c1e.9cd7fc",
+                "293f88.0669c878"
             ]
         ]
     },
     {
-        "id": "bc484497.a79ff8",
+        "id": "fd0af8f3.25299",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3997.466064453125,
-        "y": 6030.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6004.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "926cd0b8.871b1"
+                "d394aeb8.1e7718"
             ]
         ]
     },
     {
-        "id": "c37cd95d.368e7",
+        "id": "82ac773c.5adbc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4009.966064453125,
-        "y": 6438.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6412.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b162e50d.7cae58"
+                "ecb5b8cc.eeda88"
             ]
         ]
     },
     {
-        "id": "92455633.bf0ee8",
+        "id": "f41b429.87576c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4013.966064453125,
-        "y": 6478.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6452.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2199ad10.a55eda"
+                "308650c2.e2482"
             ]
         ]
     },
     {
-        "id": "2199ad10.a55eda",
+        "id": "308650c2.e2482",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -8339,135 +8342,135 @@
         "comments": "",
         "outputs": 1,
         "x": 4201.466064453125,
-        "y": 6482.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6456.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "b162e50d.7cae58",
+        "id": "ecb5b8cc.eeda88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 4197.966064453125,
-        "y": 6442.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6416.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "977d12a.f8bd9f",
+        "id": "5cfd9c1e.9cd7fc",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 4354.4658203125,
-        "y": 5995.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 5969.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7f661594.98b80c",
-                "b4244919.5b3fa8",
-                "fd8c4c61.cc25e8"
+                "c9280772.2e056",
+                "da69dce1.3d1cc8",
+                "c843a21f.72703"
             ]
         ]
     },
     {
-        "id": "e5e99dd1.35ed8",
+        "id": "5381b334.945d34",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 4384.4658203125,
-        "y": 5943.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 5917.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "7f661594.98b80c",
+        "id": "c9280772.2e056",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4564.4658203125,
-        "y": 5986.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 5960.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b64e3b3c.b2614"
+                "1c355cab.e00983"
             ]
         ]
     },
     {
-        "id": "b4244919.5b3fa8",
+        "id": "da69dce1.3d1cc8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4556.4658203125,
-        "y": 6041.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6015.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "13dd75f8.aa1f6a"
+                "e5e939f4.c8003"
             ]
         ]
     },
     {
-        "id": "fd8c4c61.cc25e8",
+        "id": "c843a21f.72703",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4561.4658203125,
-        "y": 6098.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6072.302337646484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "67c0a219.8d5f1c"
+                "29282b3d.cdea3c"
             ]
         ]
     },
     {
-        "id": "b449b2c0.535c38",
+        "id": "293f88.0669c878",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4304.4658203125,
-        "y": 6059.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6033.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "67c0a219.8d5f1c",
+        "id": "29282b3d.cdea3c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4713.4658203125,
-        "y": 6099.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6073.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "13dd75f8.aa1f6a",
+        "id": "e5e939f4.c8003",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4724.4658203125,
-        "y": 6044.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 6018.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b64e3b3c.b2614",
+        "id": "1c355cab.e00983",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8475,88 +8478,88 @@
         "comments": "",
         "outputs": 1,
         "x": 4708.84814453125,
-        "y": 5983.6722412109375,
-        "z": "8bd89607.6248d8",
+        "y": 5957.9580078125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a6322085.6bb328"
+                "31ead1aa.38700e"
             ]
         ]
     },
     {
-        "id": "a6322085.6bb328",
+        "id": "31ead1aa.38700e",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 4923.4658203125,
-        "y": 5980.016571044922,
-        "z": "8bd89607.6248d8",
+        "y": 5954.302337646484,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "90358f7a.3bc868",
+        "id": "6da29c89.3512ec",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
         "comments": "",
         "x": 1659.2332763671875,
-        "y": 6777.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6751.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a442da27.96a27",
+        "id": "23a2345e.db2bfc",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 1685.2332763671875,
-        "y": 6894.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6868.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5457374d.6393a8",
-                "c43cf1bd.3a9c48",
-                "aafe4c92.ab6148"
+                "287bda60.70f306",
+                "564bb39c.806684",
+                "f782c941.aa2bd8"
             ]
         ]
     },
     {
-        "id": "5457374d.6393a8",
+        "id": "287bda60.70f306",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1880.7333984375,
-        "y": 6846.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6820.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "53717e38.4ed96"
+                "5eea5356.2a418c"
             ]
         ]
     },
     {
-        "id": "c43cf1bd.3a9c48",
+        "id": "564bb39c.806684",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1872.7333984375,
-        "y": 6901.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6875.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f440d45f.e2c3b"
+                "918bf051.2e35e8"
             ]
         ]
     },
     {
-        "id": "53717e38.4ed96",
+        "id": "5eea5356.2a418c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8564,230 +8567,230 @@
         "comments": "",
         "outputs": 1,
         "x": 2015.1156005859375,
-        "y": 6841.272430419922,
-        "z": "8bd89607.6248d8",
+        "y": 6815.558197021484,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "237db843.e1a28"
+                "a66aff1d.02ebd"
             ]
         ]
     },
     {
-        "id": "aafe4c92.ab6148",
+        "id": "f782c941.aa2bd8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1877.7333984375,
-        "y": 6958.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6932.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f21c5384.45f0a8"
+                "ea358a06.2ba7c"
             ]
         ]
     },
     {
-        "id": "f21c5384.45f0a8",
+        "id": "ea358a06.2ba7c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2029.7333984375,
-        "y": 6959.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6933.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f440d45f.e2c3b",
+        "id": "918bf051.2e35e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 2040.7333984375,
-        "y": 6902.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6876.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "237db843.e1a28",
+        "id": "a66aff1d.02ebd",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 2202.2327880859375,
-        "y": 6842.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6816.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "df53e846.0627d8"
+                "dd540d27.8a572"
             ]
         ]
     },
     {
-        "id": "df53e846.0627d8",
+        "id": "dd540d27.8a572",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2443.2327880859375,
-        "y": 6833.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6807.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1dea4397.4ddefc"
+                "9d1b03ac.68f1d"
             ]
         ]
     },
     {
-        "id": "ddd8f461.6b9a28",
+        "id": "e61d9898.b700f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2800.2325439453125,
-        "y": 6782.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6756.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "da1d6ae3.19a4a",
-                "f17b263b.0b92b8",
-                "e6be1026.0fc218"
+                "1b4a271c.3007c1",
+                "a4a420aa.eed92",
+                "5a15942c.1c868c"
             ]
         ]
     },
     {
-        "id": "1dea4397.4ddefc",
+        "id": "9d1b03ac.68f1d",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2649.2327880859375,
-        "y": 6830.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6804.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ddd8f461.6b9a28"
+                "e61d9898.b700f8"
             ]
         ]
     },
     {
-        "id": "f17b263b.0b92b8",
+        "id": "a4a420aa.eed92",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 3006.2325439453125,
-        "y": 6795.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6769.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "93d3ae4.c48255",
-                "a8b7b61a.880ff",
-                "1b334b23.690f3d"
+                "e70e66a4.f92e28",
+                "3b5db284.72d976",
+                "a90d6b8f.8e3a5"
             ]
         ]
     },
     {
-        "id": "e6be1026.0fc218",
+        "id": "5a15942c.1c868c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2956.2325439453125,
-        "y": 6859.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6833.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "da1d6ae3.19a4a",
+        "id": "1b4a271c.3007c1",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 3036.2325439453125,
-        "y": 6743.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6717.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "93d3ae4.c48255",
+        "id": "e70e66a4.f92e28",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3216.2325439453125,
-        "y": 6786.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6760.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "38012aaa.4db4be"
+                "2205be3e.8c882a"
             ]
         ]
     },
     {
-        "id": "a8b7b61a.880ff",
+        "id": "3b5db284.72d976",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3208.2325439453125,
-        "y": 6841.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6815.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3b0a565e.7b9b52"
+                "d93cd156.9d02f8"
             ]
         ]
     },
     {
-        "id": "1b334b23.690f3d",
+        "id": "a90d6b8f.8e3a5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3213.2325439453125,
-        "y": 6898.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6872.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a42eaf3a.6fbc5"
+                "b772a1ff.e97338"
             ]
         ]
     },
     {
-        "id": "a42eaf3a.6fbc5",
+        "id": "b772a1ff.e97338",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 3365.2325439453125,
-        "y": 6899.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6873.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3b0a565e.7b9b52",
+        "id": "d93cd156.9d02f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 3376.2325439453125,
-        "y": 6844.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6818.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "38012aaa.4db4be",
+        "id": "2205be3e.8c882a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8795,141 +8798,141 @@
         "comments": "",
         "outputs": 1,
         "x": 3360.6148681640625,
-        "y": 6784.2723388671875,
-        "z": "8bd89607.6248d8",
+        "y": 6758.55810546875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2c7d526d.80fc76"
+                "9b8cbfdb.496af"
             ]
         ]
     },
     {
-        "id": "2c7d526d.80fc76",
+        "id": "9b8cbfdb.496af",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 3575.2325439453125,
-        "y": 6780.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6754.902435302734,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "468cb6c4.ffb168",
+        "id": "99412df0.04b4f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 1451.2332763671875,
-        "y": 6905.616668701172,
-        "z": "8bd89607.6248d8",
+        "y": 6879.902435302734,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "90358f7a.3bc868",
-                "a442da27.96a27",
-                "12fc611d.1c5a0f"
+                "6da29c89.3512ec",
+                "23a2345e.db2bfc",
+                "4ea496a3.5a8a68"
             ]
         ]
     },
     {
-        "id": "12fc611d.1c5a0f",
+        "id": "4ea496a3.5a8a68",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1733.433349609375,
-        "y": 7046.816864013672,
-        "z": "8bd89607.6248d8",
+        "y": 7021.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "fd3fa457.558cb8",
-                "5e9ee12a.d5b628"
+                "fd259c6c.134fa8",
+                "9bf814bd.aca8b8"
             ]
         ]
     },
     {
-        "id": "5e9ee12a.d5b628",
+        "id": "9bf814bd.aca8b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1986.433349609375,
-        "y": 7024.816864013672,
-        "z": "8bd89607.6248d8",
+        "y": 6999.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c43e864.6fdea78"
+                "10bd46c.7fcbe39"
             ]
         ]
     },
     {
-        "id": "fd3fa457.558cb8",
+        "id": "fd259c6c.134fa8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
         "x": 1986.433349609375,
-        "y": 7080.816864013672,
-        "z": "8bd89607.6248d8",
+        "y": 7055.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "c43e864.6fdea78",
+        "id": "10bd46c.7fcbe39",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 2336.432861328125,
-        "y": 7014.816864013672,
-        "z": "8bd89607.6248d8",
+        "y": 6989.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d8cf4668.e6bf58",
-                "fc9a7200.07e08"
+                "cc57d141.f3e88",
+                "6b29798.5078f08"
             ]
         ]
     },
     {
-        "id": "d8cf4668.e6bf58",
+        "id": "cc57d141.f3e88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2668.932861328125,
-        "y": 6988.816864013672,
-        "z": "8bd89607.6248d8",
+        "y": 6963.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "fa6e7b78.6ccd98"
+                "e4bf775a.d74c18"
             ]
         ]
     },
     {
-        "id": "fc9a7200.07e08",
+        "id": "6b29798.5078f08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2672.932861328125,
-        "y": 7028.816864013672,
-        "z": "8bd89607.6248d8",
+        "y": 7003.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f96cab06.f1bd18"
+                "9dbbe180.4c39c"
             ]
         ]
     },
     {
-        "id": "f96cab06.f1bd18",
+        "id": "9dbbe180.4c39c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -8937,85 +8940,85 @@
         "comments": "",
         "outputs": 1,
         "x": 2860.432861328125,
-        "y": 7032.816864013672,
-        "z": "8bd89607.6248d8",
+        "y": 7007.102630615234,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "fa6e7b78.6ccd98",
+        "id": "e4bf775a.d74c18",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 2856.932861328125,
-        "y": 6992.816864013672,
-        "z": "8bd89607.6248d8",
+        "y": 6967.102630615234,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "6504876a.65a0e",
+        "id": "78f62ea.0af84d",
         "type": "execute",
         "name": "execute RestApiCallNode Delete Underlay OTN tunnel from the LEAF ethernet Service",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1089.25,
-        "y": 4732.39990234375,
-        "z": "8bd89607.6248d8",
+        "y": 4706.6856689453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2f2c7d69.04a202",
-                "749e3757.254fd8"
+                "51c55595.1dd8cc",
+                "c498093d.59e4c8"
             ]
         ]
     },
     {
-        "id": "2f2c7d69.04a202",
+        "id": "51c55595.1dd8cc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1517.749755859375,
-        "y": 4720.39990234375,
-        "z": "8bd89607.6248d8",
+        "y": 4694.6856689453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e83630dc.e1ba"
+                "bc110a38.b317b"
             ]
         ]
     },
     {
-        "id": "749e3757.254fd8",
+        "id": "c498093d.59e4c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1521.749755859375,
-        "y": 4760.39990234375,
-        "z": "8bd89607.6248d8",
+        "y": 4734.6856689453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "28010736.1a772"
+                "5805f739.dc8f9"
             ]
         ]
     },
     {
-        "id": "e83630dc.e1ba",
+        "id": "bc110a38.b317b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 1675.749755859375,
-        "y": 4720.39990234375,
-        "z": "8bd89607.6248d8",
+        "y": 4694.6856689453125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "28010736.1a772",
+        "id": "5805f739.dc8f9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -9023,14 +9026,14 @@
         "comments": "",
         "outputs": 1,
         "x": 1679.249755859375,
-        "y": 4760.39990234375,
-        "z": "8bd89607.6248d8",
+        "y": 4734.6856689453125,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f2661a7.5dc1e6",
+        "id": "6f96293b.020fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -9038,184 +9041,184 @@
         "comments": "",
         "outputs": 1,
         "x": 5113,
-        "y": 5053,
-        "z": "8bd89607.6248d8",
+        "y": 5027.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ae15e960.f1e88",
-                "28b0c0f7.1a36d8",
-                "8a83aff9.8ddf38"
+                "aad45f58.fbf018",
+                "2530767d.abaa5a",
+                "b9bc9e8d.66a4b8"
             ]
         ]
     },
     {
-        "id": "8a83aff9.8ddf38",
+        "id": "b9bc9e8d.66a4b8",
         "type": "set",
         "name": "set vpnNameToSearch",
         "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
         "comments": "",
         "x": 5340,
-        "y": 4998,
-        "z": "8bd89607.6248d8",
+        "y": 4972.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ae15e960.f1e88",
+        "id": "aad45f58.fbf018",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5494,
-        "y": 5050,
-        "z": "8bd89607.6248d8",
+        "y": 5024.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "28b0c0f7.1a36d8",
+        "id": "2530767d.abaa5a",
         "type": "switchNode",
         "name": "switch $foundVpnName",
         "xml": "<switch test=\"`$foundVpnName`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5339,
-        "y": 5105,
-        "z": "8bd89607.6248d8",
+        "y": 5079.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "48fdd2f1.2b095c"
+                "5fd0edea.97a1fc"
             ]
         ]
     },
     {
-        "id": "48fdd2f1.2b095c",
+        "id": "5fd0edea.97a1fc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5518,
-        "y": 5104,
-        "z": "8bd89607.6248d8",
+        "y": 5078.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a26e073.3ca98f8"
+                "48fa24ff.a12f6c"
             ]
         ]
     },
     {
-        "id": "e3b4a4d3.b60598",
+        "id": "79dba259.2612cc",
         "type": "set",
         "name": "unset secondary related variables",
         "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
         "comments": "",
         "x": 3380.249969482422,
-        "y": 459,
-        "z": "8bd89607.6248d8",
+        "y": 433.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "22dcd918.a9e88e",
+        "id": "11c024cf.1cb7db",
         "type": "set",
         "name": "set network-route-three",
         "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
         "comments": "",
         "x": 3344.249969482422,
-        "y": 709,
-        "z": "8bd89607.6248d8",
+        "y": 683.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1743864d.d3d2f2",
+        "id": "8bfce836.dcd148",
         "type": "switchNode",
         "name": "switch secondary empty?",
         "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3347.666473388672,
-        "y": 751.2499694824219,
-        "z": "8bd89607.6248d8",
+        "y": 725.5357360839844,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a9f40bfb.e2369",
-                "3b2a9389.6292cc"
+                "2011ad7a.50e2d2",
+                "3e343af8.ce24be"
             ]
         ]
     },
     {
-        "id": "a9f40bfb.e2369",
+        "id": "2011ad7a.50e2d2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3586.6663513183594,
-        "y": 587.25,
-        "z": "8bd89607.6248d8",
+        "y": 561.5357666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "143a1a38.4be736"
+                "1f12a88c.b01c37"
             ]
         ]
     },
     {
-        "id": "3b2a9389.6292cc",
+        "id": "3e343af8.ce24be",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3595.6663513183594,
-        "y": 634.25,
-        "z": "8bd89607.6248d8",
+        "y": 608.5357666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "90836078.d811b"
+                "d6d1ae0e.a40e7"
             ]
         ]
     },
     {
-        "id": "90836078.d811b",
+        "id": "d6d1ae0e.a40e7",
         "type": "set",
         "name": "set hasSecondary true",
         "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
         "comments": "",
         "x": 3809.6663513183594,
-        "y": 628.25,
-        "z": "8bd89607.6248d8",
+        "y": 602.5357666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "143a1a38.4be736",
+        "id": "1f12a88c.b01c37",
         "type": "set",
         "name": "set hasSecondary false",
         "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
         "comments": "",
         "x": 3813.6663513183594,
-        "y": 584.25,
-        "z": "8bd89607.6248d8",
+        "y": 558.5357666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c2039341.ed7fe",
+        "id": "41d8ce05.5caae",
         "type": "outcome",
         "name": "SECONDARY-ROOT",
         "xml": "<outcome value='SECONDARY-ROOT'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4175.700408935547,
-        "y": 537.699951171875,
-        "z": "8bd89607.6248d8",
+        "y": 511.9857177734375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8f42381e.256918"
+                "57b53193.85d2e8"
             ]
         ]
     },
     {
-        "id": "8f42381e.256918",
+        "id": "57b53193.85d2e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -9223,55 +9226,55 @@
         "comments": "",
         "outputs": 1,
         "x": 4349.700408935547,
-        "y": 532.699951171875,
-        "z": "8bd89607.6248d8",
+        "y": 506.9857177734375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2dfbe8eb.6df208",
-                "ae5efca5.b13ee"
+                "2292f0ec.6f9e9",
+                "f8b394d0.6213f"
             ]
         ]
     },
     {
-        "id": "2dfbe8eb.6df208",
+        "id": "2292f0ec.6f9e9",
         "type": "set",
         "name": "set network-route-SECONDARY-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
         "x": 4593.700653076172,
-        "y": 524.699951171875,
-        "z": "8bd89607.6248d8",
+        "y": 498.9857177734375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ae5efca5.b13ee",
+        "id": "f8b394d0.6213f",
         "type": "set",
         "name": "set network-route-C",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
         "x": 4539.700653076172,
-        "y": 564.699951171875,
-        "z": "8bd89607.6248d8",
+        "y": 538.9857177734375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "49cd1e6.2c21e6",
+        "id": "4bc67983.47c6f",
         "type": "outcome",
         "name": "SECONDARY-ROOT",
         "xml": "<outcome value='SECONDARY-ROOT'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4144.700408935547,
-        "y": 767.0999755859375,
-        "z": "8bd89607.6248d8",
+        "y": 741.3857421875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "37d7c141.43238e"
+                "ca96ae7a.f7e118"
             ]
         ]
     },
     {
-        "id": "37d7c141.43238e",
+        "id": "ca96ae7a.f7e118",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -9279,167 +9282,167 @@
         "comments": "",
         "outputs": 1,
         "x": 4302.700164794922,
-        "y": 810.0997924804688,
-        "z": "8bd89607.6248d8",
+        "y": 784.3855590820312,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3e1881a7.808dae",
-                "e3ee5030.818c18"
+                "bdef3637.91db48",
+                "b84fc7dd.a088f8"
             ]
         ]
     },
     {
-        "id": "3e1881a7.808dae",
+        "id": "bdef3637.91db48",
         "type": "set",
         "name": "set network-route-SECONDARY-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4524.700164794922,
-        "y": 796.0999145507812,
-        "z": "8bd89607.6248d8",
+        "y": 770.3856811523438,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "e3ee5030.818c18",
+        "id": "b84fc7dd.a088f8",
         "type": "set",
         "name": "set network-route-C",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4470.700164794922,
-        "y": 836.0999145507812,
-        "z": "8bd89607.6248d8",
+        "y": 810.3856811523438,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "898efbe9.b7aab8",
+        "id": "ec6aad53.7d628",
         "type": "save",
         "name": "get network-route-three from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
         "comments": "",
         "outputs": 1,
         "x": 3356.133270263672,
-        "y": 1003.333251953125,
-        "z": "8bd89607.6248d8",
+        "y": 977.6190185546875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "648675ef.25d1f4",
-                "2e60c86e.fc1c08",
-                "80896ca0.c29cc8"
+                "60b6baf9.326c5c",
+                "fffcc6ce.01cc38",
+                "232b371a.13f76"
             ]
         ]
     },
     {
-        "id": "648675ef.25d1f4",
+        "id": "60b6baf9.326c5c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3596.133270263672,
-        "y": 986.333251953125,
-        "z": "8bd89607.6248d8",
+        "y": 960.6190185546875,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2e60c86e.fc1c08",
+        "id": "fffcc6ce.01cc38",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3591.642333984375,
-        "y": 1028.7593078613281,
-        "z": "8bd89607.6248d8",
+        "y": 1003.0450744628906,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "80896ca0.c29cc8",
+        "id": "232b371a.13f76",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3595.642303466797,
-        "y": 1076.75927734375,
-        "z": "8bd89607.6248d8",
+        "y": 1051.0450439453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1a4bd447.a95bf4"
+                "b996a975.9f4ee8"
             ]
         ]
     },
     {
-        "id": "1a4bd447.a95bf4",
+        "id": "b996a975.9f4ee8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3751.133270263672,
-        "y": 1046.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 1020.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "caee9e1d.8e2348"
+                "2df3eeae.ae260a"
             ]
         ]
     },
     {
-        "id": "caee9e1d.8e2348",
+        "id": "2df3eeae.ae260a",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3873.133270263672,
-        "y": 993.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 967.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "63dc4834.c55f2",
-                "861e97a1.4a94",
-                "50fdf697.5f0398"
+                "30af5545.05a802",
+                "294528ca.16e348",
+                "fdf4c0e0.5eff08"
             ]
         ]
     },
     {
-        "id": "63dc4834.c55f2",
+        "id": "30af5545.05a802",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4109.133270263672,
-        "y": 843.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 817.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "15fc5ae7.def135"
+                "58899b33.3d8864"
             ]
         ]
     },
     {
-        "id": "861e97a1.4a94",
+        "id": "294528ca.16e348",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4105.133270263672,
-        "y": 899.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 873.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "de3f550a.e65dd8"
+                "2016713.cf9120e"
             ]
         ]
     },
     {
-        "id": "15fc5ae7.def135",
+        "id": "58899b33.3d8864",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -9447,17 +9450,17 @@
         "comments": "",
         "outputs": 1,
         "x": 4235.133270263672,
-        "y": 851.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 825.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a2d4f205.05df18",
-                "97e552b.298d73"
+                "23e1076f.823948",
+                "e01e107b.4a322"
             ]
         ]
     },
     {
-        "id": "de3f550a.e65dd8",
+        "id": "2016713.cf9120e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -9465,33 +9468,33 @@
         "comments": "",
         "outputs": 1,
         "x": 4238.133270263672,
-        "y": 904.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 878.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "77158a83.3502bc",
-                "fb7ab28b.9d9ce8"
+                "42b53bab.59e5ec",
+                "9f9141a1.5b5a98"
             ]
         ]
     },
     {
-        "id": "50fdf697.5f0398",
+        "id": "fdf4c0e0.5eff08",
         "type": "outcome",
         "name": "SECONDARY-ROOT",
         "xml": "<outcome value='SECONDARY-ROOT'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4098.133270263672,
-        "y": 977.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 951.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4a03238e.72a4b4"
+                "7151cb9d.fcc3b4"
             ]
         ]
     },
     {
-        "id": "4a03238e.72a4b4",
+        "id": "7151cb9d.fcc3b4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -9499,406 +9502,406 @@
         "comments": "",
         "outputs": 1,
         "x": 4254.133270263672,
-        "y": 998.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 972.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8f9b7ac9.e6c508",
-                "4399bcd6.51e06c"
+                "16090c67.366d8c",
+                "877ec323.7c8b08"
             ]
         ]
     },
     {
-        "id": "a2d4f205.05df18",
+        "id": "23e1076f.823948",
         "type": "set",
         "name": "set network-route-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4482.133270263672,
-        "y": 881.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 855.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "97e552b.298d73",
+        "id": "e01e107b.4a322",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4474.133270263672,
-        "y": 923.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 897.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "77158a83.3502bc",
+        "id": "42b53bab.59e5ec",
         "type": "set",
         "name": "set network-route-LEAF",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4475.133270263672,
-        "y": 975.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 949.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "fb7ab28b.9d9ce8",
+        "id": "9f9141a1.5b5a98",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
         "x": 4462.133270263672,
-        "y": 1015.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 989.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "4399bcd6.51e06c",
+        "id": "877ec323.7c8b08",
         "type": "set",
         "name": "set network-route-C",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
         "comments": "",
         "x": 4436.133270263672,
-        "y": 1109.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 1083.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8f9b7ac9.e6c508",
+        "id": "16090c67.366d8c",
         "type": "set",
         "name": "set network-route-SECONDARY-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
         "comments": "",
         "x": 4498.133270263672,
-        "y": 1065.3331909179688,
-        "z": "8bd89607.6248d8",
+        "y": 1039.6189575195312,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "ac53fadb.549658",
+        "id": "2a307068.85126",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3700.13330078125,
-        "y": 2249,
-        "z": "8bd89607.6248d8",
+        "y": 2223.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a75c6a9f.cbf01",
-                "92c4a208.e0cb28"
+                "5e91bdef.ec251c",
+                "edfa6b23.11ec28"
             ]
         ]
     },
     {
-        "id": "c76e7c83.8acf1",
+        "id": "268e9ec4.4facea",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3527.466796875,
-        "y": 2250,
-        "z": "8bd89607.6248d8",
+        "y": 2224.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ac53fadb.549658"
+                "2a307068.85126"
             ]
         ]
     },
     {
-        "id": "ac317b44.b3b988",
+        "id": "15820d3a.1e0693",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3536.957763671875,
-        "y": 2292.5740356445312,
-        "z": "8bd89607.6248d8",
+        "y": 2266.8598022460938,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "a866b4cc.e0caa",
+        "id": "5a5c2368.a7e5dc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3525.466796875,
-        "y": 2339,
-        "z": "8bd89607.6248d8",
+        "y": 2313.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "a75c6a9f.cbf01",
+        "id": "5e91bdef.ec251c",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3990.466796875,
-        "y": 2265,
-        "z": "8bd89607.6248d8",
+        "y": 2239.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "af57ae08.dd681",
-                "e5cbeb5f.6e9468"
+                "fab0baab.63daf",
+                "4fbe9a1d.f89b1c"
             ]
         ]
     },
     {
-        "id": "e5cbeb5f.6e9468",
+        "id": "4fbe9a1d.f89b1c",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4213.466796875,
-        "y": 2220,
-        "z": "8bd89607.6248d8",
+        "y": 2194.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "5a256296.5bc59c"
+                "e7a6f67c.223ba8"
             ]
         ]
     },
     {
-        "id": "af57ae08.dd681",
+        "id": "fab0baab.63daf",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4215.466796875,
-        "y": 2284,
-        "z": "8bd89607.6248d8",
+        "y": 2258.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c3ad5792.8dfac"
+                "e4fc9765.fde21"
             ]
         ]
     },
     {
-        "id": "f7bdbced.e4e6e",
+        "id": "ad2e0fde.b44de8",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3321.466796875,
-        "y": 2271,
-        "z": "8bd89607.6248d8",
+        "y": 2245.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c76e7c83.8acf1",
-                "ac317b44.b3b988",
-                "a866b4cc.e0caa"
+                "268e9ec4.4facea",
+                "15820d3a.1e0693",
+                "5a5c2368.a7e5dc"
             ]
         ]
     },
     {
-        "id": "4d6bf9fc.2af3d8",
+        "id": "8876fe3a.88e278",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
         "x": 3260.466796875,
-        "y": 2229,
-        "z": "8bd89607.6248d8",
+        "y": 2203.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3ddfa25a.4bc3f6",
+        "id": "c02bc34.16c814",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3341.466796875,
-        "y": 2119,
-        "z": "8bd89607.6248d8",
+        "y": 2093.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1f8f213c.23a987",
-                "723c86fe.b2129"
+                "85d9fc70.3a0b8",
+                "63a7add0.8255ec"
             ]
         ]
     },
     {
-        "id": "723c86fe.b2129",
+        "id": "63a7add0.8255ec",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3564.466796875,
-        "y": 2105,
-        "z": "8bd89607.6248d8",
+        "y": 2079.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2b76ade7.37f3aa"
+                "39d5594f.5d224e"
             ]
         ]
     },
     {
-        "id": "1f8f213c.23a987",
+        "id": "85d9fc70.3a0b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3566.466796875,
-        "y": 2138,
-        "z": "8bd89607.6248d8",
+        "y": 2112.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "2b76ade7.37f3aa",
+        "id": "39d5594f.5d224e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 3712.466796875,
-        "y": 2098,
-        "z": "8bd89607.6248d8",
+        "y": 2072.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a96a9fab.149bd",
-                "6bae074d.4cc69"
+                "cf9e5f0.1f2092",
+                "6b6736af.eb70a"
             ]
         ]
     },
     {
-        "id": "a96a9fab.149bd",
+        "id": "cf9e5f0.1f2092",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
         "comments": "",
         "x": 3904.4666748046875,
-        "y": 2035,
-        "z": "8bd89607.6248d8",
+        "y": 2009.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "92c4a208.e0cb28",
+        "id": "edfa6b23.11ec28",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3971.466796875,
-        "y": 2396,
-        "z": "8bd89607.6248d8",
+        "y": 2370.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "fb667e00.cdee38"
+                "c80278c9.710488"
             ]
         ]
     },
     {
-        "id": "fb667e00.cdee38",
+        "id": "c80278c9.710488",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4177.466796875,
-        "y": 2396,
-        "z": "8bd89607.6248d8",
+        "y": 2370.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7f231a25.219aec"
+                "7e2cf131.a58a08"
             ]
         ]
     },
     {
-        "id": "6bae074d.4cc69",
+        "id": "6b6736af.eb70a",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3926.4666748046875,
-        "y": 2103,
-        "z": "8bd89607.6248d8",
+        "y": 2077.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6f9fafbd.595338",
-                "5fece99f.57a078",
-                "53c7941c.fd6f84"
+                "9d1ec1c.6f0f9c",
+                "f4e7e55c.530698",
+                "d7c76719.0fc4b"
             ]
         ]
     },
     {
-        "id": "6f9fafbd.595338",
+        "id": "9d1ec1c.6f0f9c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4121.966796875,
-        "y": 2055,
-        "z": "8bd89607.6248d8",
+        "y": 2029.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1ef2a52f.ce58c3"
+                "13bd6284.e3089d"
             ]
         ]
     },
     {
-        "id": "5fece99f.57a078",
+        "id": "f4e7e55c.530698",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4113.966796875,
-        "y": 2110,
-        "z": "8bd89607.6248d8",
+        "y": 2084.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d353a27e.170a88"
+                "56e4b2a7.59d05c"
             ]
         ]
     },
     {
-        "id": "53c7941c.fd6f84",
+        "id": "d7c76719.0fc4b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4118.966796875,
-        "y": 2167,
-        "z": "8bd89607.6248d8",
+        "y": 2141.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "815f83cf.c9ecf"
+                "67615599.b73f0c"
             ]
         ]
     },
     {
-        "id": "815f83cf.c9ecf",
+        "id": "67615599.b73f0c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4270.966796875,
-        "y": 2168,
-        "z": "8bd89607.6248d8",
+        "y": 2142.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1ef2a52f.ce58c3",
+        "id": "13bd6284.e3089d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -9906,433 +9909,433 @@
         "comments": "",
         "outputs": 1,
         "x": 4266.34912109375,
-        "y": 2052.6556701660156,
-        "z": "8bd89607.6248d8",
+        "y": 2026.9414367675781,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "df579443.2dfaa"
+                "3bd0a776.cdf68"
             ]
         ]
     },
     {
-        "id": "b2f7d29a.c36bc8",
+        "id": "d87e7a94.9bda08",
         "type": "set",
         "name": "set SECONDARY-ROOT stuff",
         "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
         "comments": "",
         "x": 3322.13330078125,
-        "y": 2364,
-        "z": "8bd89607.6248d8",
+        "y": 2338.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "29a75985.a4b2ae",
+        "id": "3b2ac73.1b40638",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
         "x": 4001.133270263672,
-        "y": 2339.9998474121094,
-        "z": "8bd89607.6248d8",
+        "y": 2314.285614013672,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "c3ad5792.8dfac",
+        "id": "e4fc9765.fde21",
         "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": 4374.466796875,
-        "y": 2303,
-        "z": "8bd89607.6248d8",
+        "y": 2277.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "5a256296.5bc59c",
+        "id": "e7a6f67c.223ba8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4378.466796875,
-        "y": 2217,
-        "z": "8bd89607.6248d8",
+        "y": 2191.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a0a57c60.9feaa",
-                "8f9217bc.ce51e"
+                "ab9c8c2d.c18e8",
+                "2a323f5f.e64b7"
             ]
         ]
     },
     {
-        "id": "7f231a25.219aec",
+        "id": "7e2cf131.a58a08",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4394.75244140625,
-        "y": 2394.82177734375,
-        "z": "8bd89607.6248d8",
+        "y": 2369.1075439453125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "f1964530.52cb1"
+                "cefe725b.0f41e8"
             ]
         ]
     },
     {
-        "id": "d353a27e.170a88",
+        "id": "56e4b2a7.59d05c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 4281.966796875,
-        "y": 2113,
-        "z": "8bd89607.6248d8",
+        "y": 2087.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "a0a57c60.9feaa",
+        "id": "ab9c8c2d.c18e8",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
         "comments": "",
         "x": 4548.466796875,
-        "y": 2178,
-        "z": "8bd89607.6248d8",
+        "y": 2152.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8f9217bc.ce51e",
+        "id": "2a323f5f.e64b7",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
         "comments": "",
         "x": 4549.466796875,
-        "y": 2283,
-        "z": "8bd89607.6248d8",
+        "y": 2257.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "1ea5e7d3.f23f9",
+        "id": "89cd5649.143b88",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
         "x": 4544.466796875,
-        "y": 2232,
-        "z": "8bd89607.6248d8",
+        "y": 2206.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "f1964530.52cb1",
+        "id": "cefe725b.0f41e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4601.583984375,
-        "y": 2384.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 2358.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cbbeb825.19f92",
-                "b0c2600a.46c7c",
-                "511030eb.63bcc8"
+                "a03cf587.06cef8",
+                "a11cf500.909288",
+                "7b4cfab6.8e3e3c"
             ]
         ]
     },
     {
-        "id": "cbbeb825.19f92",
+        "id": "a03cf587.06cef8",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 4816.583984375,
-        "y": 2346.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 2320.626220703125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b0c2600a.46c7c",
+        "id": "a11cf500.909288",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4813.583984375,
-        "y": 2385.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 2359.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ce425175.45de18"
+                "1d4bbcf2.4e364b"
             ]
         ]
     },
     {
-        "id": "511030eb.63bcc8",
+        "id": "7b4cfab6.8e3e3c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4769.083984375,
-        "y": 2427.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 2401.626220703125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b757d82d.12f65",
+        "id": "5a11b9ac.0be8e",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4850.466796875,
-        "y": 2137.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2111.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "8ab896d8.87229"
+                "9451ac43.685578"
             ]
         ]
     },
     {
-        "id": "df579443.2dfaa",
+        "id": "3bd0a776.cdf68",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 4450.4666748046875,
-        "y": 2067,
-        "z": "8bd89607.6248d8",
+        "y": 2041.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "51046da7.24d494"
+                "baa608db.a0fe08"
             ]
         ]
     },
     {
-        "id": "51046da7.24d494",
+        "id": "baa608db.a0fe08",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4647.466796875,
-        "y": 2133.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2107.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b757d82d.12f65",
-                "4ad69efc.b2bd68"
+                "5a11b9ac.0be8e",
+                "41776d15.aa3ae4"
             ]
         ]
     },
     {
-        "id": "4ad69efc.b2bd68",
+        "id": "41776d15.aa3ae4",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
         "x": 4852.466796875,
-        "y": 2210.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2184.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a0ad2556.3951b8"
+                "e63bdf76.82117"
             ]
         ]
     },
     {
-        "id": "ce425175.45de18",
+        "id": "1d4bbcf2.4e364b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4994.083984375,
-        "y": 2384.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 2358.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "822b3c7.3a67ac"
+                "65012ff0.bac99"
             ]
         ]
     },
     {
-        "id": "822b3c7.3a67ac",
+        "id": "65012ff0.bac99",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5152.083984375,
-        "y": 2384.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 2358.626220703125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "71be1479.f150cc"
+                "8f16bdf7.24b18"
             ]
         ]
     },
     {
-        "id": "71be1479.f150cc",
+        "id": "8f16bdf7.24b18",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
         "x": 5359.083984375,
-        "y": 2384.3404541015625,
-        "z": "8bd89607.6248d8",
+        "y": 2358.626220703125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "8ab896d8.87229",
+        "id": "9451ac43.685578",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5027.466796875,
-        "y": 2129.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2103.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d7fa69fb.085438",
-                "ce745876.37fbb"
+                "801b98ce.90edc",
+                "5fb93bf0.4b325c"
             ]
         ]
     },
     {
-        "id": "ce745876.37fbb",
+        "id": "5fb93bf0.4b325c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 5235.466796875,
-        "y": 2136.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2110.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "10a5091f.ce791f",
-                "70c5216d.20762",
-                "eee03948.c8ee08"
+                "44bfb2a0.4cab3c",
+                "f1164e18.e0f19",
+                "7ca3e4f2.88fb4c"
             ]
         ]
     },
     {
-        "id": "a0ad2556.3951b8",
+        "id": "e63bdf76.82117",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5029.466796875,
-        "y": 2202.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2176.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "dba8eb8b.b7ea7"
+                "de27c7f7.c9276"
             ]
         ]
     },
     {
-        "id": "d7fa69fb.085438",
+        "id": "801b98ce.90edc",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainC id",
         "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5265.466796875,
-        "y": 2084.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2058.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "dba8eb8b.b7ea7",
+        "id": "de27c7f7.c9276",
         "type": "set",
         "name": "set domainC ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5264.466796875,
-        "y": 2326.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2300.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "10a5091f.ce791f",
+        "id": "44bfb2a0.4cab3c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5445.466796875,
-        "y": 2127.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2101.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d091f788.e8c778"
+                "e82fded9.073898"
             ]
         ]
     },
     {
-        "id": "70c5216d.20762",
+        "id": "f1164e18.e0f19",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5437.466796875,
-        "y": 2182.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2156.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "52797bd8.2181a4"
+                "85250ba4.806898"
             ]
         ]
     },
     {
-        "id": "eee03948.c8ee08",
+        "id": "7ca3e4f2.88fb4c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5442.466796875,
-        "y": 2239.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2213.285888671875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a5f87747.8903"
+                "7d5613c0.f5f4cc"
             ]
         ]
     },
     {
-        "id": "a5f87747.8903",
+        "id": "7d5613c0.f5f4cc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 5594.466796875,
-        "y": 2240.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2214.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "52797bd8.2181a4",
+        "id": "85250ba4.806898",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
         "x": 5605.466796875,
-        "y": 2185.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2159.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "d091f788.e8c778",
+        "id": "e82fded9.073898",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -10340,59 +10343,59 @@
         "comments": "",
         "outputs": 1,
         "x": 5589.84912109375,
-        "y": 2124.655792236328,
-        "z": "8bd89607.6248d8",
+        "y": 2098.9415588378906,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4f5aa4ec.a9ba44"
+                "7c8249af.5ed848"
             ]
         ]
     },
     {
-        "id": "4f5aa4ec.a9ba44",
+        "id": "7c8249af.5ed848",
         "type": "set",
         "name": "set controller domainC data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\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=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 5804.466796875,
-        "y": 2121.0001220703125,
-        "z": "8bd89607.6248d8",
+        "y": 2095.285888671875,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "b98aea07.4499",
+        "id": "1e88543b.84a814",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3836.13330078125,
-        "y": 2733,
-        "z": "8bd89607.6248d8",
+        "y": 2707.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7d724c43.dd872c"
+                "4bbf44dd.c34104"
             ]
         ]
     },
     {
-        "id": "7d724c43.dd872c",
+        "id": "4bbf44dd.c34104",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4027.13330078125,
-        "y": 2737,
-        "z": "8bd89607.6248d8",
+        "y": 2711.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "c26943ed.871ed8"
+                "ca18cabf.134c3"
             ]
         ]
     },
     {
-        "id": "c26943ed.871ed8",
+        "id": "ca18cabf.134c3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -10400,210 +10403,210 @@
         "comments": "",
         "outputs": 1,
         "x": 4154.13330078125,
-        "y": 2736,
-        "z": "8bd89607.6248d8",
+        "y": 2710.2857666015625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a43135d6.d32b28"
+                "ef98dd66.570548"
             ]
         ]
     },
     {
-        "id": "a43135d6.d32b28",
+        "id": "ef98dd66.570548",
         "type": "save",
         "name": "get secondary root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 4380.467041015625,
-        "y": 2729.3336181640625,
-        "z": "8bd89607.6248d8",
+        "y": 2703.619384765625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "a8ebbe95.3f6e4",
-                "38e80218.b5d4ce",
-                "b6cd2169.c74bc8"
+                "c3cc04e3.9995e8",
+                "96ef8840.c20b2",
+                "50ef7648.d143f"
             ]
         ]
     },
     {
-        "id": "a8ebbe95.3f6e4",
+        "id": "c3cc04e3.9995e8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4747.466796875,
-        "y": 2623.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 2597.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "e22da322.d0127"
+                "625acc3d.d4dd04"
             ]
         ]
     },
     {
-        "id": "38e80218.b5d4ce",
+        "id": "96ef8840.c20b2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4742.975830078125,
-        "y": 2667.7594604492188,
-        "z": "8bd89607.6248d8",
+        "y": 2642.0452270507812,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "cc355488.cae9f"
+                "b87c29ed.e7a1d8"
             ]
         ]
     },
     {
-        "id": "b6cd2169.c74bc8",
+        "id": "50ef7648.d143f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4738.975830078125,
-        "y": 2717.759521484375,
-        "z": "8bd89607.6248d8",
+        "y": 2692.0452880859375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "78c42cb1.03bbb4"
+                "2796810b.682956"
             ]
         ]
     },
     {
-        "id": "61178516.955b94",
+        "id": "96d93656.6958b8",
         "type": "save",
         "name": "update SECONDARY-ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5186.976318359375,
-        "y": 2712.7596435546875,
-        "z": "8bd89607.6248d8",
+        "y": 2687.04541015625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "e22da322.d0127",
+        "id": "625acc3d.d4dd04",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
         "x": 4910.038330078125,
-        "y": 2622.6192016601562,
-        "z": "8bd89607.6248d8",
+        "y": 2596.9049682617188,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "cc355488.cae9f",
+        "id": "b87c29ed.e7a1d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4910.975830078125,
-        "y": 2667.7594604492188,
-        "z": "8bd89607.6248d8",
+        "y": 2642.0452270507812,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "78c42cb1.03bbb4",
+        "id": "2796810b.682956",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4907.975830078125,
-        "y": 2717.759521484375,
-        "z": "8bd89607.6248d8",
+        "y": 2692.0452880859375,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "67900f7a.aee708",
-                "61178516.955b94"
+                "5a769bdf.551e9c",
+                "96d93656.6958b8"
             ]
         ]
     },
     {
-        "id": "67900f7a.aee708",
+        "id": "5a769bdf.551e9c",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
         "x": 5089.9765625,
-        "y": 2659.759521484375,
-        "z": "8bd89607.6248d8",
+        "y": 2634.0452880859375,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "28b93260.26eace",
+        "id": "b7814ecb.1580d",
         "type": "switchNode",
         "name": "switch tmp.mmUNI-id-long != SECONDARY-ROOT UNI",
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.SECONDARY-ROOT.uni-p-interface-long`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4624.467041015625,
-        "y": 3573.333251953125,
-        "z": "8bd89607.6248d8",
+        "y": 3547.6190185546875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "462ac15.49ec0c"
+                "cf2467a.3e0e698"
             ]
         ]
     },
     {
-        "id": "462ac15.49ec0c",
+        "id": "cf2467a.3e0e698",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4914.467041015625,
-        "y": 3575.333251953125,
-        "z": "8bd89607.6248d8",
+        "y": 3549.6190185546875,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "db4c40a7.875698"
+                "774ecc4a.3ad124"
             ]
         ]
     },
     {
-        "id": "abf74f44.8bd74",
+        "id": "fc616200.2baf58",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4277,
-        "y": 5803.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5777.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b3e521a4.a97f4"
+                "b0c64a0a.29dee8"
             ]
         ]
     },
     {
-        "id": "b3e521a4.a97f4",
+        "id": "b0c64a0a.29dee8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4468,
-        "y": 5807.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5781.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "aa154017.d63388"
+                "b39a4675.08bbf"
             ]
         ]
     },
     {
-        "id": "aa154017.d63388",
+        "id": "b39a4675.08bbf",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -10611,65 +10614,65 @@
         "comments": "",
         "outputs": 1,
         "x": 4595,
-        "y": 5806.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5780.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "ea396a9e.94917"
+                "6b59d25.075b22c"
             ]
         ]
     },
     {
-        "id": "ea396a9e.94917",
+        "id": "6b59d25.075b22c",
         "type": "switchNode",
         "name": "switch 2-ROOTS in same domain?",
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4820.3330078125,
-        "y": 5808.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5782.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4aa7a407.8eccb4",
-                "90951777.87e61"
+                "84c8a22.08a86e",
+                "8ae9054d.68fd08"
             ]
         ]
     },
     {
-        "id": "4aa7a407.8eccb4",
+        "id": "84c8a22.08a86e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5030.3330078125,
-        "y": 5785.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5759.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "6131b803.ead228"
+                "93a0772f.9be09"
             ]
         ]
     },
     {
-        "id": "90951777.87e61",
+        "id": "8ae9054d.68fd08",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5035.3330078125,
-        "y": 5834.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5808.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "9203f8f4.976da"
+                "2db83bd3.7a132c"
             ]
         ]
     },
     {
-        "id": "6131b803.ead228",
+        "id": "93a0772f.9be09",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -10677,14 +10680,14 @@
         "comments": "",
         "outputs": 1,
         "x": 5156.3330078125,
-        "y": 5785.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5759.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "9203f8f4.976da",
+        "id": "2db83bd3.7a132c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -10692,88 +10695,88 @@
         "comments": "",
         "outputs": 1,
         "x": 5153.3330078125,
-        "y": 5841.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5815.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "252aad6f.949002",
-                "2be015ab.396d82"
+                "81928378.5f469",
+                "9b2406e3.5e7a08"
             ]
         ]
     },
     {
-        "id": "252aad6f.949002",
+        "id": "81928378.5f469",
         "type": "save",
         "name": "update SECONDARY-ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5467.3330078125,
-        "y": 5900.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5874.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1524ee99.1e1cd1",
+        "id": "6888e6dc.67e04",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 5399.550048828125,
-        "y": 5852.13330078125,
-        "z": "8bd89607.6248d8",
+        "y": 5826.4190673828125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2be015ab.396d82",
+        "id": "9b2406e3.5e7a08",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5598,
-        "y": 5810.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5784.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "d39caf18.6babe",
+        "id": "d07ac0db.fa9818",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 868,
-        "y": 5000.3330078125,
-        "z": "8bd89607.6248d8",
+        "y": 4974.6187744140625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "bb5f541b.ab1a88"
+                "a4f6e106.afc2d"
             ]
         ]
     },
     {
-        "id": "bb5f541b.ab1a88",
+        "id": "a4f6e106.afc2d",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1059,
-        "y": 5004.3330078125,
-        "z": "8bd89607.6248d8",
+        "y": 4978.6187744140625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "d475fb98.0c79f"
+                "617b198c.79c0a"
             ]
         ]
     },
     {
-        "id": "d475fb98.0c79f",
+        "id": "617b198c.79c0a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -10781,65 +10784,65 @@
         "comments": "",
         "outputs": 1,
         "x": 1186,
-        "y": 5003.3330078125,
-        "z": "8bd89607.6248d8",
+        "y": 4977.6187744140625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "4975d2d3.1f477c"
+                "f89a9d64.adeb98"
             ]
         ]
     },
     {
-        "id": "4975d2d3.1f477c",
+        "id": "f89a9d64.adeb98",
         "type": "switchNode",
         "name": "switch 2-ROOTS in same domain?",
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1411.3330078125,
-        "y": 5005.3330078125,
-        "z": "8bd89607.6248d8",
+        "y": 4979.6187744140625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "78d676eb.347948",
-                "b9cebfbe.3a16d8"
+                "6035813d.1e7338",
+                "b4705906.43572"
             ]
         ]
     },
     {
-        "id": "78d676eb.347948",
+        "id": "6035813d.1e7338",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1621.3330078125,
-        "y": 4982.3330078125,
-        "z": "8bd89607.6248d8",
+        "y": 4956.6187744140625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "be0beff9.053b6"
+                "b1155932.92831"
             ]
         ]
     },
     {
-        "id": "b9cebfbe.3a16d8",
+        "id": "b4705906.43572",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1626.3330078125,
-        "y": 5031.3330078125,
-        "z": "8bd89607.6248d8",
+        "y": 5005.6187744140625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "1ec18968.883e37"
+                "62407b64.a07c9c"
             ]
         ]
     },
     {
-        "id": "be0beff9.053b6",
+        "id": "b1155932.92831",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -10847,14 +10850,14 @@
         "comments": "",
         "outputs": 1,
         "x": 1747.3330078125,
-        "y": 4982.3330078125,
-        "z": "8bd89607.6248d8",
+        "y": 4956.6187744140625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1ec18968.883e37",
+        "id": "62407b64.a07c9c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -10862,88 +10865,88 @@
         "comments": "",
         "outputs": 1,
         "x": 1744.3330078125,
-        "y": 5038.3330078125,
-        "z": "8bd89607.6248d8",
+        "y": 5012.6187744140625,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "3f1c1ffb.4cacd8",
-                "643240ac.3a15a"
+                "d0271ecc.53e168",
+                "83be22a.f7cdb6"
             ]
         ]
     },
     {
-        "id": "643240ac.3a15a",
+        "id": "83be22a.f7cdb6",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 2189,
-        "y": 5007.3330078125,
-        "z": "8bd89607.6248d8",
+        "y": 4981.6187744140625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "16675ac.2ba7ba5",
+        "id": "d29b17e9.2cbf8",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 1990.550048828125,
-        "y": 5049.1328125,
-        "z": "8bd89607.6248d8",
+        "y": 5023.4185791015625,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "3f1c1ffb.4cacd8",
+        "id": "d0271ecc.53e168",
         "type": "save",
         "name": "update SECONDARY-ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 2058.3330078125,
-        "y": 5097.3330078125,
-        "z": "8bd89607.6248d8",
+        "y": 5071.6187744140625,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "68e0d31a.2e51f4",
+        "id": "e88fc760.9f3988",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1470.3333740234375,
-        "y": 5841.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5815.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2c8509f2.c5786e"
+                "c0695dac.6b173"
             ]
         ]
     },
     {
-        "id": "2c8509f2.c5786e",
+        "id": "c0695dac.6b173",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1661.3333740234375,
-        "y": 5845.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5819.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "30f6f14a.076056"
+                "a704fbb5.caa0b"
             ]
         ]
     },
     {
-        "id": "30f6f14a.076056",
+        "id": "a704fbb5.caa0b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -10951,65 +10954,65 @@
         "comments": "",
         "outputs": 1,
         "x": 1788.3333740234375,
-        "y": 5844.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5818.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "b9a2493.fce2438"
+                "bc272657.983128"
             ]
         ]
     },
     {
-        "id": "b9a2493.fce2438",
+        "id": "bc272657.983128",
         "type": "switchNode",
         "name": "switch 2-ROOTS in same domain?",
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2013.6663818359375,
-        "y": 5846.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5820.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7c5427a0.bfcb2",
-                "2b71ce9a.05df6a"
+                "31bdfa25.d18a2e",
+                "c242900c.77afd8"
             ]
         ]
     },
     {
-        "id": "7c5427a0.bfcb2",
+        "id": "31bdfa25.d18a2e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2223.6663818359375,
-        "y": 5823.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5797.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "7c8ca33d.b99804"
+                "9d78f5ef.5cf228"
             ]
         ]
     },
     {
-        "id": "2b71ce9a.05df6a",
+        "id": "c242900c.77afd8",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2228.6663818359375,
-        "y": 5872.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5846.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "af2e72.47de599"
+                "d542d85e.71ea7"
             ]
         ]
     },
     {
-        "id": "7c8ca33d.b99804",
+        "id": "9d78f5ef.5cf228",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -11017,14 +11020,14 @@
         "comments": "",
         "outputs": 1,
         "x": 2349.6663818359375,
-        "y": 5823.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5797.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "af2e72.47de599",
+        "id": "d542d85e.71ea7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -11032,50 +11035,89 @@
         "comments": "",
         "outputs": 1,
         "x": 2346.6663818359375,
-        "y": 5879.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5853.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             [
-                "2f308234.b92f6e",
-                "e716a684.8ec94"
+                "d23f59ed.73bc4",
+                "2e5ee108.277b9e"
             ]
         ]
     },
     {
-        "id": "e716a684.8ec94",
+        "id": "2e5ee108.277b9e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 2791.3333740234375,
-        "y": 5848.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5822.6192626953125,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
     },
     {
-        "id": "1f18634c.d886cd",
+        "id": "868b21d1.a7652",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 2592.8834228515625,
-        "y": 5890.13330078125,
-        "z": "8bd89607.6248d8",
+        "y": 5864.4190673828125,
+        "z": "1806503a.76a7a",
         "wires": []
     },
     {
-        "id": "2f308234.b92f6e",
+        "id": "d23f59ed.73bc4",
         "type": "save",
         "name": "update SECONDARY-ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 2660.6663818359375,
-        "y": 5938.33349609375,
-        "z": "8bd89607.6248d8",
+        "y": 5912.6192626953125,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "73f93f1a.1715d8",
+        "type": "execute",
+        "name": "execute Terminate SSE Connection",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1520.7666625976562,
+        "y": 6121,
+        "z": "1806503a.76a7a",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5f7e37aa.0d2258",
+        "type": "set",
+        "name": "set parameters",
+        "xml": "<set>\n<parameter name='subscriptionId' value='`$rcvd-bandwidth-value`' />\n",
+        "comments": "",
+        "x": 1452.800048828125,
+        "y": 6062.39990234375,
+        "z": "1806503a.76a7a",
+        "wires": []
+    },
+    {
+        "id": "29311664.f24592",
+        "type": "execute",
+        "name": "execute Terminate SSE Connection",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2069.433349609375,
+        "y": 5569.2333984375,
+        "z": "1806503a.76a7a",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index fec2db13..12bb2602 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -302,3 +302,4 @@ GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-delete ${project.version} sy
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-modify ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-delete-VPNBs ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-searchVpnName ${project.version} sync
+GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-callbackdg-notification ${project.version} sync
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml
index 97b72469..4f20a3fd 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml
@@ -799,6 +799,64 @@
                                                                                 <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
                                                                                 <parameter name='operational-status' value='Activated' />
                                                                             </update>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                <parameter name="format" value="json"/>
+                                                                                <parameter name="httpMethod" value="post"/>
+                                                                                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                            </execute>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >
+                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                <!--<parameter name="deviceIp" value="192.168.198.6" />-->
+                                                                                <!--<parameter name="devicePort" value="18181" />-->
+                                                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                                <parameter name="format" value="json" />
+                                                                                <parameter name="httpMethod" value="post" />
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
+                                                                                <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
+                                                                                <parameter name="version" value="`$project.version`" />
+                                                                                <parameter name="mode" value="sync" />
+                                                                                <parameter name="responsePrefix" value="restapi-result"/>
+                                                                            </execute>
+                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >
+                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                                                <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                <parameter name="format" value="json" />
+                                                                                <parameter name="httpMethod" value="get" />
+                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
+                                                                                <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
+                                                                                <parameter name="version" value="`$project.version`" />
+                                                                                <parameter name="mode" value="sync" />
+                                                                                <parameter name="responsePrefix" value="notification-get-result"/>
+                                                                            </execute>
                                                                         </block>
                                                                     </outcome>
                                                                 </execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
index 662c46a9..142ea566 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
@@ -549,34 +549,25 @@
                                                                         </get-resource>
                                                                         <switch test="`$tmp.aai.uni.type`">
                                                                             <outcome value='leaf'>
-                                                                                <set>
-                                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
-                                                                                    <parameter name='`epidx`' value='0' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />
-                                                                                </set>
+                                                                                <block>
+                                                                                    <set>
+                                                                                        <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />
+                                                                                    </set>
+                                                                                </block>
                                                                             </outcome>
                                                                             <outcome value='root'>
-                                                                                <set>
-                                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
-                                                                                    <parameter name='`epidx`' value='0' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />
-                                                                                </set>
+                                                                                <block>
+                                                                                    <set>
+                                                                                        <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />
+                                                                                    </set>
+                                                                                </block>
                                                                             </outcome>
                                                                             <outcome value='root-secondary'>
-                                                                                <set>
-                                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
-                                                                                    <parameter name='`epidx`' value='0' />
-                                                                                </set>
-                                                                                <set>
-                                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />
-                                                                                </set>
+                                                                                <block>
+                                                                                    <set>
+                                                                                        <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />
+                                                                                    </set>
+                                                                                </block>
                                                                             </outcome>
                                                                             <outcome value='Other'>
                                                                                 <block></block>
@@ -770,6 +761,7 @@
                                                             <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
                                                             <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
                                                             <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
+                                                            <parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />
                                                             <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
                                                             <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
                                                             <!--<parameter name='index-number' value='0' />-->
@@ -801,6 +793,64 @@
                                                                         <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
                                                                         <parameter name='operational-status' value='Activated' />
                                                                     </update>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data'`" />
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                        <parameter name="format" value="json"/>
+                                                                        <parameter name="httpMethod" value="post"/>
+                                                                        <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                        <parameter name="responsePrefix" value="vpn-result"/>
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >
+                                                                        <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                        <!--<parameter name="deviceIp" value="192.168.198.6" />-->
+                                                                        <!--<parameter name="devicePort" value="18181" />-->
+                                                                        <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                        <parameter name="format" value="json" />
+                                                                        <parameter name="httpMethod" value="post" />
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                        <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
+                                                                        <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                        <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
+                                                                        <parameter name="version" value="`$project.version`" />
+                                                                        <parameter name="mode" value="sync" />
+                                                                        <parameter name="responsePrefix" value="restapi-result"/>
+                                                                    </execute>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >
+                                                                        <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`" />
+                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`" />
+                                                                        <parameter name="sseConnectURL" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`" />
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                        <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                        <parameter name="format" value="json" />
+                                                                        <parameter name="httpMethod" value="get" />
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                        <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
+                                                                        <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                        <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
+                                                                        <parameter name="version" value="`$project.version`" />
+                                                                        <parameter name="mode" value="sync" />
+                                                                        <parameter name="responsePrefix" value="notification-get-result"/>
+                                                                    </execute>
                                                                 </block>
                                                             </outcome>
                                                         </execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
new file mode 100644
index 00000000..c71b7aa3
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-callbackdg-notification.xml
@@ -0,0 +1,62 @@
+<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='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>
+        <block atomic="true">
+            <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                <parameter name="logger" value="message-log" />
+                <parameter name="level" value="info" />
+                <parameter name="field1" value="CallBack DG For SSE CONNECTION is called"/>
+                <!--<parameter name="field2" value="`$rcvdNotif`"/>-->
+            </record>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <set>
+                <!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->
+                <parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />
+                <parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />
+                <parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />
+                <parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />
+            </set>
+            <!--<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"-->
+            <!-- key="service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id  -->
+            <!--	AND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->
+            <!--	  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->
+            <!--	  AND service-instance.service-instance-id =  $rcvd-service-instance-id"  force="true" pfx="tmp.AnAI-data">-->
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"
+                  key="service-instance.service-instance-id =  $rcvd-service-instance-id"  force="true" pfx="tmp.AnAI-data">
+                <parameter name="metadata.metadatum[0].metaname" value="`$rcvd-etht-svc-end-point`" />
+                <parameter name="metadata.metadatum[0].metaval" value="`$rcvd-bandwidth-value`" />
+            </save>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="eventId-uuid"/>
+            </execute>
+            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                <parameter name="ctx-destination" value="eventName-uuid"/>
+            </execute>
+            <set>
+                <parameter name='eventIdUuid' value="`'BandwidthChanged_' + $eventId-uuid`" />
+                <parameter name='eventNameUuid' value='`$eventName-uuid`' />
+                <parameter name='cclId' value='`$rcvd-service-instance-id`' />
+                <parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />
+                <parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`" />
+                <parameter name="restapiUrl" value="`$prop.dcaeAddrAndPort + '/eventListener/v7'`" />
+                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />-->
+                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />-->
+                <parameter name="format" value="json"/>
+                <parameter name="httpMethod" value="post"/>
+                <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                <parameter name="responsePrefix" value="ves-result"/>
+                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                <parameter name="trustStorePassword" value="adminadmin"/>
+                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                <parameter name="keyStorePassword" value="adminadmin"/>
+            </execute>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
index 1fee37b1..259691f9 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
@@ -1782,7 +1782,28 @@
                                                                                                                                                             </return>
                                                                                                                                                         </outcome>
                                                                                                                                                         <outcome value='success'>
-                                                                                                                                                            <block atomic="true"></block>
+                                                                                                                                                            <block atomic="true">
+                                                                                                                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >
+                                                                                                                                                                    <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url`" />
+                                                                                                                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`" />
+                                                                                                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`" />
+                                                                                                                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                                                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                                                                                                    <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                                                                                                    <parameter name="format" value="json" />
+                                                                                                                                                                    <parameter name="httpMethod" value="post" />
+                                                                                                                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                                                                                    <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
+                                                                                                                                                                    <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                                                                                                    <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
+                                                                                                                                                                    <parameter name="version" value="`$project.version`" />
+                                                                                                                                                                    <parameter name="mode" value="sync" />
+                                                                                                                                                                    <parameter name="responsePrefix" value="restapi-result"/>
+                                                                                                                                                                </execute>
+                                                                                                                                                            </block>
                                                                                                                                                         </outcome>
                                                                                                                                                     </execute>
                                                                                                                                                 </block>
@@ -2146,6 +2167,26 @@
                                                                                                                                                             </for>
                                                                                                                                                             <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                                                                                                                     key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'></delete>
+                                                                                                                                                            <execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >
+                                                                                                                                                                <parameter name="subscriberId" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url`" />
+                                                                                                                                                                <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`" />
+                                                                                                                                                                <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`" />
+                                                                                                                                                                <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                                                                                                                <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                                                                                                                <parameter name="dirPath" value="/opt/sdnc/restconfapi/yang/notification" />
+                                                                                                                                                                <parameter name="format" value="json" />
+                                                                                                                                                                <parameter name="httpMethod" value="post" />
+                                                                                                                                                                <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                                                                                                <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                                                                                                <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                                                                                                <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                                                                                                <parameter name='customHttpHeaders' value="X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9" />
+                                                                                                                                                                <parameter name="module" value="GENERIC-RESOURCE-API" />
+                                                                                                                                                                <parameter name="rpc" value="cll-vnf-topology-operation-cll-callbackdg-notification" />
+                                                                                                                                                                <parameter name="version" value="`$project.version`" />
+                                                                                                                                                                <parameter name="mode" value="sync" />
+                                                                                                                                                                <parameter name="responsePrefix" value="restapi-result"/>
+                                                                                                                                                            </execute>
                                                                                                                                                         </block>
                                                                                                                                                     </outcome>
                                                                                                                                                 </switch>
diff --git a/platform-logic/restapi-templates/src/main/json/cll-call-ves.json b/platform-logic/restapi-templates/src/main/json/cll-call-ves.json
new file mode 100644
index 00000000..0074c34c
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cll-call-ves.json
@@ -0,0 +1,34 @@
+{
+  "event": {
+    "commonEventHeader": {
+      "version": "4.0.1",
+      "vesEventListenerVersion": "7.0.1",
+      "domain": "ccvpnNotification",
+      "eventName": "ccvpnNotification_CloudLeaseLine_BandwidthChanged",
+      "eventId": ${eventIdUuid},
+      "lastEpochMicrosec": 8745745764578,
+      "priority": "Normal",
+      "reportingEntityName": "onap-sdnc",
+      "sequence": 0,
+      "sourceName": "onap-sdnc",
+      "startEpochMicrosec": 8745745764578,
+      "timeZoneOffset": "UTC-05.00"
+    },
+    "ccvpnNotificationFields": {
+      "changeIdentifier": "PM_BW_UPDATE",
+      "changeType": "BandwidthChanged",
+      "ccvpnNotificationFieldsVersion": "2.0",
+      "arrayOfNamedHashMap": [
+        {
+          "name": ${eventNameUuid},
+          "hashMap": {
+            "cllId": ${cclId},
+            "uniId": ${uniId},
+            "bandwidthValue": ${bandwidthValue},
+            "time": "2022-02-08T11:13:34.781-05:00"
+          }
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/cll-create-pm-data.json b/platform-logic/restapi-templates/src/main/json/cll-create-pm-data.json
new file mode 100644
index 00000000..101e9b9d
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cll-create-pm-data.json
@@ -0,0 +1,17 @@
+{
+  "ietf-service-pm:performance-monitoring": {
+    "service-pm": [
+      {
+        "service-name": ${eth-service-name},
+        "task-pm-enable": true,
+        "granularity": "ietf-service-pm:granularity-1min",
+        "performance-data-config": [
+          {
+            "parameter-name": "ietf-service-pm:ingress-bandwidth",
+            "measure-method": "ietf-service-pm:measure-at-ingress"
+          }
+        ]
+      }
+    ]
+  }
+}
diff --git a/platform-logic/restapi-templates/src/main/json/cll-ethernet-service-loop.json b/platform-logic/restapi-templates/src/main/json/cll-ethernet-service-loop.json
index b058169d..24968f71 100644
--- a/platform-logic/restapi-templates/src/main/json/cll-ethernet-service-loop.json
+++ b/platform-logic/restapi-templates/src/main/json/cll-ethernet-service-loop.json
@@ -1,6 +1,6 @@
 {
     "ietf-eth-tran-service:etht-svc":{
-        "etht-svc-instances":[
+        "etht-svc-instances":  [
             {
                 "etht-svc-name": ${eth-service-name},
                 "ietf-optical-slice:slice-id": ${slice-id},
@@ -34,6 +34,7 @@
                     ${repeat:ethernet-srv-end-points-list_length:
                         {
                             "etht-svc-end-point-name": ${ethernet-srv-end-points-list[${1}].ethernet-end-point-name},
+                            "etht-svc-end-point-descr": ${service-instance-id-or-cll-id},
                             "etht-svc-access-points":[
                                 {
                                     "access-point-id": ${ethernet-srv-end-points-list[${1}].index-number},
diff --git a/platform-logic/restapi-templates/src/main/json/cll-subscribe-notification.json b/platform-logic/restapi-templates/src/main/json/cll-subscribe-notification.json
new file mode 100644
index 00000000..02fd8a54
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cll-subscribe-notification.json
@@ -0,0 +1 @@
+{ "ietf-subscribed-notifications:input": { "encoding": "encode-json" } }
\ No newline at end of file
diff --git a/platform-logic/restapi-templates/src/main/json/cll-terminate-notification.json b/platform-logic/restapi-templates/src/main/json/cll-terminate-notification.json
new file mode 100644
index 00000000..1b407a3d
--- /dev/null
+++ b/platform-logic/restapi-templates/src/main/json/cll-terminate-notification.json
@@ -0,0 +1 @@
+{ "ietf-subscribed-notifications:input": { "identifier": ${subscriptionId} } }
\ No newline at end of file
-- 
2.16.6