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

diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index 74c515f..10b6d67 100644 (file)
--- 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 2fdcec4..42f3ac6 100644 (file)
--- 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 @@
 [\r
   {\r
-    "id": "61751fea.5e29c",\r
+    "id": "2c2eaaa6.595c6e",\r
     "type": "save",\r
     "name": "get all-vpn-bindings from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 309,\r
-    "y": 328,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 533.3333129882812,\r
+    "y": 388.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "9390d80.e27dda8",\r
-        "a2edd3b5.431178",\r
-        "d95bcddf.5304c8"\r
+        "b93bc255.06d818",\r
+        "e7d58f90.50f7a",\r
+        "d44dcc0c.074358"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9390d80.e27dda8",\r
+    "id": "b93bc255.06d818",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 497,\r
-    "y": 341,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 721.3333129882812,\r
+    "y": 401.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "122deece.249539"\r
+        "351735cd.d4c382"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a2edd3b5.431178",\r
+    "id": "e7d58f90.50f7a",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 504.4909362792969,\r
-    "y": 383.57403564453125,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 728.8242492675781,\r
+    "y": 443.5740432739258,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "d95bcddf.5304c8",\r
+    "id": "d44dcc0c.074358",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 495,\r
-    "y": 430,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 719.3333129882812,\r
+    "y": 490.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "c3fd03f5.ced1a"\r
+        "9f7438aa.cfa3f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "122deece.249539",\r
+    "id": "351735cd.d4c382",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 670,\r
-    "y": 339,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 894.3333129882812,\r
+    "y": 399.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "26858e32.576aa2"\r
+        "6797a33f.6e9ecc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "26858e32.576aa2",\r
+    "id": "6797a33f.6e9ecc",\r
     "type": "for",\r
     "name": "for vpnidx in all-vpn-bindings",\r
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 899,\r
-    "y": 340,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1123.3333129882812,\r
+    "y": 400.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "b9b3eee1.451228"\r
+        "181a770b.23d341"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b9b3eee1.451228",\r
+    "id": "181a770b.23d341",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1114,\r
-    "y": 341,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1338.3333129882812,\r
+    "y": 401.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "1ab82d5c.a19413"\r
+        "96414042.e1f2c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7e7f1310.5e5bcc",\r
+    "id": "e5c5abf.467ec58",\r
     "type": "switchNode",\r
     "name": "switch vpnuuid is for this slice",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1368,\r
-    "y": 263,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1592.3333129882812,\r
+    "y": 323.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "55ca13fd.72ee7c",\r
-        "6e8bc799.ce2fa8"\r
+        "71905208.3f5ca4",\r
+        "3be6bf3.b82124"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "55ca13fd.72ee7c",\r
+    "id": "71905208.3f5ca4",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1585,\r
-    "y": 242,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1809.3333129882812,\r
+    "y": 302.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "1ab82d5c.a19413"\r
+        "96414042.e1f2c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6e8bc799.ce2fa8",\r
+    "id": "3be6bf3.b82124",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1585,\r
-    "y": 291,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1809.3333129882812,\r
+    "y": 351.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1ab82d5c.a19413",\r
+    "id": "96414042.e1f2c8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic='true'>",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1769,\r
-    "y": 328,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1993.3333129882812,\r
+    "y": 388.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "554ac9a2.79f95",\r
-        "2ade390a.34dac6",\r
-        "c0e6872b.6bc578"\r
+        "95dd5e61.027198",\r
+        "877d8b16.d3994",\r
+        "b3333886.2341"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c3307b8c.0344e",\r
+    "id": "884050d1.040518",\r
     "type": "dgstart",\r
     "name": "DGSTART",\r
     "outputs": 1,\r
-    "x": 128,\r
-    "y": 69,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 352.33331298828125,\r
+    "y": 129.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "7e5b3842.1b2ff"\r
+        "d4acd14e.d29f88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7e5b3842.1b2ff",\r
+    "id": "d4acd14e.d29f88",\r
     "type": "service-logic",\r
     "name": "GENERIC-RESOURCE-API ${project.version}",\r
     "module": "GENERIC-RESOURCE-API",\r
@@ -201,3650 +201,3695 @@
     "comments": "",\r
     "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}'>",\r
     "outputs": 1,\r
-    "x": 412.2856903076172,\r
-    "y": 130.23810863494873,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 636.6190032958984,\r
+    "y": 190.23811626434326,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "ff8ac0a6.a31ac8"\r
+        "659111a0.43dcc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ff8ac0a6.a31ac8",\r
+    "id": "659111a0.43dcc",\r
     "type": "method",\r
     "name": "method cll-vnf-topology-operation-cll-F1-Activate-w-Protection",\r
     "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate-w-Protection' mode='sync'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 418.42860412597656,\r
-    "y": 215.00003051757812,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 642.7619171142578,\r
+    "y": 275.00003814697266,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "610b4dde.c4293c"\r
+        "27f31a3d.0f29d6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "610b4dde.c4293c",\r
+    "id": "27f31a3d.0f29d6",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 728.238037109375,\r
-    "y": 206.66668701171875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 952.5713500976562,\r
+    "y": 266.6666946411133,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "61751fea.5e29c",\r
-        "fda13949.60eb78",\r
-        "47d2cfff.4a0e4",\r
-        "8845442c.1d5de8",\r
-        "72564454.b964f4"\r
+        "2c2eaaa6.595c6e",\r
+        "cef7b9ce.1b3ba8",\r
+        "306cc859.5059d",\r
+        "5f84eccb.714dcc",\r
+        "3014f91f.87a3fe"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "554ac9a2.79f95",\r
+    "id": "95dd5e61.027198",\r
     "type": "set",\r
     "name": "set tmp.aai.vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
     "comments": "",\r
-    "x": 1986,\r
-    "y": 266,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2210.3333129882812,\r
+    "y": 326.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e1c41eb3.6dc5b8",\r
+    "id": "e5ef1dc.853e7e",\r
     "type": "set",\r
     "name": "set attachment_param for OTN A",\r
     "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",\r
     "comments": "",\r
-    "x": 4155,\r
-    "y": 152,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4379.333312988281,\r
+    "y": 212.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7981558d.d1f29c",\r
+    "id": "28eb1f3b.b8157",\r
     "type": "execute",\r
     "name": "execute RestApiCallNode Create OTN tunnel with token",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4236,\r
-    "y": 467,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4460.333312988281,\r
+    "y": 527.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "4cd7b5eb.5f75fc",\r
-        "8c7597f3.3a32c"\r
+        "1f9f84d9.8d553b",\r
+        "99de3b6c.89af8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4cd7b5eb.5f75fc",\r
+    "id": "1f9f84d9.8d553b",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4545.5,\r
-    "y": 436,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4769.833312988281,\r
+    "y": 496.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "6a15735b.8f38bc"\r
+        "d7492135.ad5fc8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8c7597f3.3a32c",\r
+    "id": "99de3b6c.89af8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4550.5,\r
-    "y": 501,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4774.833312988281,\r
+    "y": 561.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "531c74ae.aa6424"\r
+        "76880ad0.6601a4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6a15735b.8f38bc",\r
+    "id": "d7492135.ad5fc8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4721.5,\r
-    "y": 436,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4945.833312988281,\r
+    "y": 496.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "531c74ae.aa6424",\r
+    "id": "76880ad0.6601a4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4717,\r
-    "y": 501,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4941.333312988281,\r
+    "y": 561.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "43cf60a0.0fca68",\r
+    "id": "faa33d4e.9e9608",\r
     "type": "set",\r
     "name": "set sotn_value",\r
     "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",\r
     "comments": "",\r
-    "x": 4100.5,\r
-    "y": 721,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4324.833312988281,\r
+    "y": 781.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1699b103.56f9ff",\r
+    "id": "2bce125e.cf653e",\r
     "type": "execute",\r
     "name": "execute RestApiCallNode Create ethernet Service without token",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4254.5,\r
-    "y": 769,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4478.833312988281,\r
+    "y": 829.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "430829b5.022a48",\r
-        "ab60153e.89b358"\r
+        "ca07acfa.a5fa68",\r
+        "90e419cc.31d64"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "430829b5.022a48",\r
+    "id": "ca07acfa.a5fa68",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4600,\r
-    "y": 750,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4824.333312988281,\r
+    "y": 810.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "af17e669.a567c"\r
+        "4bb3503a.663a88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ab60153e.89b358",\r
+    "id": "90e419cc.31d64",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4604,\r
-    "y": 790,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4828.333312988281,\r
+    "y": 850.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "879a181e.1e28f"\r
+        "d3e50925.f867c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "af17e669.a567c",\r
+    "id": "4bb3503a.663a88",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4758,\r
-    "y": 750,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4982.333312988281,\r
+    "y": 810.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "879a181e.1e28f",\r
+    "id": "d3e50925.f867c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4761.5,\r
-    "y": 790,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4985.833312988281,\r
+    "y": 850.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "c2dfb11c.b0c48",\r
-        "18154ac9.e63ffd"\r
+        "a6019d0e.791c3",\r
+        "1200fd09.b183c3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c2dfb11c.b0c48",\r
+    "id": "a6019d0e.791c3",\r
     "type": "save",\r
     "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5092,\r
-    "y": 755,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5316.333312988281,\r
+    "y": 815.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "4bfe8ff3.b5155",\r
+    "id": "409f8a00.232b48",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
     "comments": "",\r
-    "x": 4956,\r
-    "y": 714,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5180.333312988281,\r
+    "y": 774.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "18154ac9.e63ffd",\r
+    "id": "1200fd09.b183c3",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5019,\r
-    "y": 801,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5243.333312988281,\r
+    "y": 861.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "be8a4aef.c70ad",\r
+    "id": "d18efeb6.7196c8",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "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",\r
     "comments": "",\r
-    "x": 4093,\r
-    "y": 200,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4317.333312988281,\r
+    "y": 260.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c13323e9.9191e8",\r
+    "id": "3a9d4ff0.831a9",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4119,\r
-    "y": 317,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4343.333312988281,\r
+    "y": 377.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "fa844cfe.7b9158",\r
-        "40f7f2e0.45e324",\r
-        "9ec0d41c.764348"\r
+        "9519eb20.e7bb98",\r
+        "5232e91a.5e69a",\r
+        "d4898e73.a749e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fa844cfe.7b9158",\r
+    "id": "9519eb20.e7bb98",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4314.5001220703125,\r
-    "y": 269,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4538.833435058594,\r
+    "y": 329.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "c5cba661.1feb9"\r
+        "4b08f17b.aadf2"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "40f7f2e0.45e324",\r
+    "id": "5232e91a.5e69a",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4306.5001220703125,\r
-    "y": 324,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4530.833435058594,\r
+    "y": 384.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "fa86521c.e230b8"\r
+        "b87b6903.ae28e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c5cba661.1feb9",\r
+    "id": "4b08f17b.aadf2",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4458.8824462890625,\r
-    "y": 268.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4683.215759277344,\r
+    "y": 328.65567779541016,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "fff76825.ceb828"\r
+        "797a34c3.7e821c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "12d83cc7.207cc3",\r
+    "id": "85c5906d.e6a79",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5041,\r
-    "y": 271,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5265.333312988281,\r
+    "y": 331.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "f3a906e6.516618"\r
+        "937745a8.a82728"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fff76825.ceb828",\r
+    "id": "797a34c3.7e821c",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4643,\r
-    "y": 267,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4867.333312988281,\r
+    "y": 327.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "8f09ed7e.8205c8"\r
+        "bb125276.4bcb68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8f09ed7e.8205c8",\r
+    "id": "bb125276.4bcb68",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4838,\r
-    "y": 267,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5062.333312988281,\r
+    "y": 327.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "12d83cc7.207cc3"\r
+        "85c5906d.e6a79"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9ec0d41c.764348",\r
+    "id": "d4898e73.a749e8",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4311.5001220703125,\r
-    "y": 381,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4535.833435058594,\r
+    "y": 441.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "4cb38d5a.2cd9fc"\r
+        "54ed711f.a7d8c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4cb38d5a.2cd9fc",\r
+    "id": "54ed711f.a7d8c8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4463.5001220703125,\r
-    "y": 382,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4687.833435058594,\r
+    "y": 442.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fa86521c.e230b8",\r
+    "id": "b87b6903.ae28e",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4474.5001220703125,\r
-    "y": 325,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4698.833435058594,\r
+    "y": 385.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fd5c650b.7ed3f8",\r
+    "id": "d6320d33.cae9b",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "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' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5426,\r
-    "y": 284,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5650.333312988281,\r
+    "y": 344.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "11189fd0.36c55",\r
-        "2f53389c.6ed7",\r
-        "160dc233.835476"\r
+        "bdc01a41.5b11d",\r
+        "19bd6ca2.3b24bb",\r
+        "3d79a005.c3b89"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f3a906e6.516618",\r
+    "id": "937745a8.a82728",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5220,\r
-    "y": 271,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5444.333312988281,\r
+    "y": 331.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "8e3bb227.50f04",\r
-        "fd5c650b.7ed3f8"\r
+        "624c597d.18779",\r
+        "d6320d33.cae9b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8e3bb227.50f04",\r
+    "id": "624c597d.18779",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainA id",\r
     "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",\r
     "comments": "",\r
-    "x": 5456,\r
-    "y": 232,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5680.333312988281,\r
+    "y": 292.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "11189fd0.36c55",\r
+    "id": "bdc01a41.5b11d",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5636,\r
-    "y": 275,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5860.333312988281,\r
+    "y": 335.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "aadf27e6.e781b8"\r
+        "c6702adf.a8a4e8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2f53389c.6ed7",\r
+    "id": "19bd6ca2.3b24bb",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5628,\r
-    "y": 330,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5852.333312988281,\r
+    "y": 390.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "fd2ad840.4523f"\r
+        "14b63752.13b4e1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "160dc233.835476",\r
+    "id": "3d79a005.c3b89",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5633,\r
-    "y": 387,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5857.333312988281,\r
+    "y": 447.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "2a94704d.0d4"\r
+        "52bfc859.8923c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2a94704d.0d4",\r
+    "id": "52bfc859.8923c8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5785,\r
-    "y": 388,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6009.333312988281,\r
+    "y": 448.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fd2ad840.4523f",\r
+    "id": "14b63752.13b4e1",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5796,\r
-    "y": 333,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6020.333312988281,\r
+    "y": 393.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "aadf27e6.e781b8",\r
+    "id": "c6702adf.a8a4e8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5780.38232421875,\r
-    "y": 272.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6004.715637207031,\r
+    "y": 332.65567779541016,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "cdb54fc1.4aeb5"\r
+        "d92f12f8.15c348"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cdb54fc1.4aeb5",\r
+    "id": "d92f12f8.15c348",\r
     "type": "set",\r
     "name": "set controller domainA data",\r
     "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",\r
     "comments": "",\r
-    "x": 5995,\r
-    "y": 269,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6219.333312988281,\r
+    "y": 329.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "33053457.2cf334",\r
+    "id": "60926b96.be818c",\r
     "type": "set",\r
     "name": "set attachment_param for OTN B",\r
     "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",\r
     "comments": "",\r
-    "x": 3562,\r
-    "y": 1609,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3786.3333129882812,\r
+    "y": 1669.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4445f35f.408fdc",\r
+    "id": "c947459e.872f3",\r
     "type": "execute",\r
     "name": "execute RestApiCallNode Create OTN tunnel with token",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3625,\r
-    "y": 1938,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3849.3333129882812,\r
+    "y": 1998.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "862258db.691038",\r
-        "af408a0a.92301"\r
+        "a1124e38.08b2b8",\r
+        "626f4392.b77cf4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "862258db.691038",\r
+    "id": "a1124e38.08b2b8",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3920.5,\r
-    "y": 1905,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4144.833312988281,\r
+    "y": 1965.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "95d8110a.825b98"\r
+        "9662ab69.840d68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "af408a0a.92301",\r
+    "id": "626f4392.b77cf4",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3925.5,\r
-    "y": 1970,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4149.833312988281,\r
+    "y": 2030.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "ef7aa326.5032b8"\r
+        "dc33d36b.4bb068"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "95d8110a.825b98",\r
+    "id": "9662ab69.840d68",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4088.5,\r
-    "y": 1905,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4312.833312988281,\r
+    "y": 1965.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ef7aa326.5032b8",\r
+    "id": "dc33d36b.4bb068",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4099,\r
-    "y": 1970,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4323.333312988281,\r
+    "y": 2030.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "f246db35.fbb0b8",\r
+    "id": "785f8bef.d4b92c",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "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",\r
     "comments": "",\r
-    "x": 3501,\r
-    "y": 1666,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3725.3333129882812,\r
+    "y": 1726.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2f733fde.bfa8d8",\r
+    "id": "d7561682.896a3",\r
     "type": "get-resource",\r
     "name": "get-resource dst pnf",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3521,\r
-    "y": 1763,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3745.3333129882812,\r
+    "y": 1823.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "d82ed114.d26fe",\r
-        "9b6a74e2.82fcf",\r
-        "105e680c.d4fe88"\r
+        "585f4a29.5a089c",\r
+        "beb39570.8572c",\r
+        "251a4de6.33c8aa"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d82ed114.d26fe",\r
+    "id": "585f4a29.5a089c",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3723.5001220703125,\r
-    "y": 1716,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3947.8334350585938,\r
+    "y": 1776.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "3d1669ca.d8e9be"\r
+        "52dfa280.06ea3c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9b6a74e2.82fcf",\r
+    "id": "beb39570.8572c",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3715.5001220703125,\r
-    "y": 1771,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3939.8334350585938,\r
+    "y": 1831.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "28df2cef.da0a5c"\r
+        "d9bfad39.7bd668"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3d1669ca.d8e9be",\r
+    "id": "52dfa280.06ea3c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3867.8824462890625,\r
-    "y": 1713.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4092.2157592773438,\r
+    "y": 1773.6556777954102,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "b0c477a0.14b6b8"\r
+        "3ad5a325.5b1584"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b0c477a0.14b6b8",\r
+    "id": "3ad5a325.5b1584",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4052,\r
-    "y": 1728,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4276.333312988281,\r
+    "y": 1788.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "e68df009.7524f"\r
+        "66e3a12c.e2e618"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "105e680c.d4fe88",\r
+    "id": "251a4de6.33c8aa",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3720.5001220703125,\r
-    "y": 1828,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3944.8334350585938,\r
+    "y": 1888.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "3376d063.6334f8"\r
+        "56e3abe.0b3e154"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3376d063.6334f8",\r
+    "id": "56e3abe.0b3e154",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 3872.5001220703125,\r
-    "y": 1829,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4096.833435058594,\r
+    "y": 1889.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "28df2cef.da0a5c",\r
+    "id": "d9bfad39.7bd668",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 3883.5001220703125,\r
-    "y": 1774,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4107.833435058594,\r
+    "y": 1834.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "86c78b55.020ad8",\r
+    "id": "b422b9dc.94e76",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4450,\r
-    "y": 1732,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4674.333312988281,\r
+    "y": 1792.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "de4526ed.169098"\r
+        "79873b94.5791e4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e68df009.7524f",\r
+    "id": "66e3a12c.e2e618",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4247,\r
-    "y": 1728,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4471.333312988281,\r
+    "y": 1788.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "86c78b55.020ad8"\r
+        "b422b9dc.94e76"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bd56a946.09bfc8",\r
+    "id": "8c738542.45973",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "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' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4835,\r
-    "y": 1731,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5059.333312988281,\r
+    "y": 1791.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "e62cd9e9.79901",\r
-        "3835956c.352dfa",\r
-        "ef4cce16.af464"\r
+        "bed842bc.70d158",\r
+        "9fccfde7.5bd058",\r
+        "42496faf.cc3318"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "de4526ed.169098",\r
+    "id": "79873b94.5791e4",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 4627,\r
-    "y": 1724,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4851.333312988281,\r
+    "y": 1784.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "84662003.28e938",\r
-        "bd56a946.09bfc8"\r
+        "4d8f65c6.26fcac",\r
+        "8c738542.45973"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "84662003.28e938",\r
+    "id": "4d8f65c6.26fcac",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainB id",\r
     "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",\r
     "comments": "",\r
-    "x": 4865,\r
-    "y": 1679,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5089.333312988281,\r
+    "y": 1739.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2e3a7484.41bcbc",\r
+    "id": "8a854ad6.1d148",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5194,\r
-    "y": 1835,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5418.333312988281,\r
+    "y": 1895.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "acb63215.67cbc8",\r
+    "id": "9b1912ba.26a3f8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5205,\r
-    "y": 1780,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5429.333312988281,\r
+    "y": 1840.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "bb7e5ab5.c4089",\r
+    "id": "e79aefeb.ae2d8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5189.38232421875,\r
-    "y": 1719.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5413.715637207031,\r
+    "y": 1779.6556777954102,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "7c187be.7c53484"\r
+        "9fa1b8fd.2344f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7c187be.7c53484",\r
+    "id": "9fa1b8fd.2344f",\r
     "type": "set",\r
     "name": "set controller domainB data",\r
     "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",\r
     "comments": "",\r
-    "x": 5404,\r
-    "y": 1716,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5628.333312988281,\r
+    "y": 1776.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "e62cd9e9.79901",\r
+    "id": "bed842bc.70d158",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5045,\r
-    "y": 1722,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5269.333312988281,\r
+    "y": 1782.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "bb7e5ab5.c4089"\r
+        "e79aefeb.ae2d8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3835956c.352dfa",\r
+    "id": "9fccfde7.5bd058",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5037,\r
-    "y": 1777,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5261.333312988281,\r
+    "y": 1837.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "acb63215.67cbc8"\r
+        "9b1912ba.26a3f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ef4cce16.af464",\r
+    "id": "42496faf.cc3318",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5042,\r
-    "y": 1834,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5266.333312988281,\r
+    "y": 1894.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "2e3a7484.41bcbc"\r
+        "8a854ad6.1d148"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1dc25027.0c33f8",\r
+    "id": "afc78578.3291",\r
     "type": "switchNode",\r
     "name": "switch vpn-binding has dst-access-ltp",\r
     "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3076,\r
-    "y": 680,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3300.3333129882812,\r
+    "y": 740.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "22e86b98.d5cd94",\r
-        "18519633.e9ee92"\r
+        "44cf1bd6.cdf99c",\r
+        "619a5ca0.cdbc04"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "22e86b98.d5cd94",\r
+    "id": "44cf1bd6.cdf99c",\r
     "type": "outcome",\r
     "name": "Null",\r
     "xml": "<outcome value=''>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3290,\r
-    "y": 717,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3514.3333129882812,\r
+    "y": 777.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "d8801466.520d4"\r
+        "357cc1f0.bc9fae"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "18519633.e9ee92",\r
+    "id": "619a5ca0.cdbc04",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3292,\r
-    "y": 655,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3516.3333129882812,\r
+    "y": 715.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "6bc727fb.e5e2c8"\r
+        "582aaedf.79cf78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d8801466.520d4",\r
+    "id": "357cc1f0.bc9fae",\r
     "type": "switchNode",\r
     "name": "switch vpn-binding has src-access-ltp",\r
     "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2870,\r
-    "y": 1960,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3094.3333129882812,\r
+    "y": 2020.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "57adf29e.03275c",\r
-        "3c463d1c.a1e9ca"\r
+        "234b26f6.c2476a",\r
+        "5654d12.c509b3"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "57adf29e.03275c",\r
+    "id": "234b26f6.c2476a",\r
     "type": "outcome",\r
     "name": "Null",\r
     "xml": "<outcome value=''>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3123,\r
-    "y": 1994,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3347.3333129882812,\r
+    "y": 2054.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "163451dc.e800ce"\r
+        "77779b01.5bda2c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3c463d1c.a1e9ca",\r
+    "id": "5654d12.c509b3",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3123,\r
-    "y": 1938,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3347.3333129882812,\r
+    "y": 1998.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "72b99bc1.9d63c4"\r
+        "49e07205.df1904"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "163451dc.e800ce",\r
+    "id": "77779b01.5bda2c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 3274,\r
-    "y": 1994,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3498.3333129882812,\r
+    "y": 2054.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2a6d840b.d2c9ec",\r
+    "id": "fc88d512.b039f8",\r
     "type": "set",\r
     "name": "set vpn-bindingA and connectivityA",\r
     "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",\r
     "comments": "",\r
-    "x": 4150,\r
-    "y": 92,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4374.333312988281,\r
+    "y": 152.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "24792ed6.12e172",\r
+    "id": "6082a62.95d37d8",\r
     "type": "set",\r
     "name": "set vpn-bindingB and connectivityB",\r
     "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",\r
     "comments": "",\r
-    "x": 3558,\r
-    "y": 1551,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3782.3333129882812,\r
+    "y": 1611.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fe0662dd.a80948",\r
+    "id": "7f468ae0.55d61c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3841,\r
-    "y": 349,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4065.3333129882812,\r
+    "y": 409.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "2a6d840b.d2c9ec",\r
-        "e1c41eb3.6dc5b8",\r
-        "be8a4aef.c70ad",\r
-        "c13323e9.9191e8",\r
-        "7981558d.d1f29c",\r
-        "1721d523.151643",\r
-        "9094f518.043e98",\r
-        "f54721e.ec69de"\r
+        "fc88d512.b039f8",\r
+        "e5ef1dc.853e7e",\r
+        "d18efeb6.7196c8",\r
+        "3a9d4ff0.831a9",\r
+        "28eb1f3b.b8157",\r
+        "20794036.3e0d98",\r
+        "5a5b3fd3.939fa",\r
+        "eb39e6d9.695df8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "72b99bc1.9d63c4",\r
+    "id": "49e07205.df1904",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3274,\r
-    "y": 1937,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3498.3333129882812,\r
+    "y": 1997.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "24792ed6.12e172",\r
-        "33053457.2cf334",\r
-        "f246db35.fbb0b8",\r
-        "2f733fde.bfa8d8",\r
-        "4445f35f.408fdc",\r
-        "7c2a5c1b.45951c",\r
-        "db1559a9.21dcb8",\r
-        "64935ddb.b635b4"\r
+        "6082a62.95d37d8",\r
+        "60926b96.be818c",\r
+        "785f8bef.d4b92c",\r
+        "d7561682.896a3",\r
+        "c947459e.872f3",\r
+        "33be6bd8.7ec864",\r
+        "7832f278.b4880c",\r
+        "cc8c0809.c4ad6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1ddc6cc6.41baa3",\r
+    "id": "3bec7c9e.0c31a4",\r
     "type": "set",\r
     "name": "set sotn_value",\r
     "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",\r
     "comments": "",\r
-    "x": 3512,\r
-    "y": 2236,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3736.3333129882812,\r
+    "y": 2296.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "88e2026c.753db8",\r
+    "id": "66e73857.3d0e78",\r
     "type": "execute",\r
     "name": "execute RestApiCallNode Create ethernet Service without token",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3666,\r
-    "y": 2284,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3890.3333129882812,\r
+    "y": 2344.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "e41adb3.0072828",\r
-        "6a4db145.9abb38"\r
+        "9ba2be1f.f4daf",\r
+        "1b19ccdb.027f4b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e41adb3.0072828",\r
+    "id": "9ba2be1f.f4daf",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4011.5,\r
-    "y": 2265,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4235.833312988281,\r
+    "y": 2325.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "b46428d7.0cf41"\r
+        "9032db4e.fba99"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6a4db145.9abb38",\r
+    "id": "1b19ccdb.027f4b",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4015.5,\r
-    "y": 2305,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4239.833312988281,\r
+    "y": 2365.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "1616e093.24d98f"\r
+        "2bcc0072.d2bc6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b46428d7.0cf41",\r
+    "id": "9032db4e.fba99",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4169.5,\r
-    "y": 2265,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4393.833312988281,\r
+    "y": 2325.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1616e093.24d98f",\r
+    "id": "2bcc0072.d2bc6",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4173,\r
-    "y": 2305,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4397.333312988281,\r
+    "y": 2365.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "f5ad5aa7.4c2ca",\r
-        "f30a934b.4a146"\r
+        "45d30eee.bf1db8",\r
+        "a53e3184.87caf8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f5ad5aa7.4c2ca",\r
+    "id": "45d30eee.bf1db8",\r
     "type": "save",\r
     "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4513,\r
-    "y": 2304,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4737.333312988281,\r
+    "y": 2364.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "14882444.425ec4",\r
+    "id": "63d5aebc.7e418",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
     "comments": "",\r
-    "x": 4371,\r
-    "y": 2262,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4595.333312988281,\r
+    "y": 2322.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f30a934b.4a146",\r
+    "id": "a53e3184.87caf8",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4442,\r
-    "y": 2353,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4666.333312988281,\r
+    "y": 2413.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "35b5f42.3d7048c",\r
+    "id": "27db8b21.23f75c",\r
     "type": "set",\r
     "name": "set attachment_param (gfp-n) for OTN",\r
     "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
     "comments": "",\r
-    "x": 3067,\r
-    "y": 620,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3291.3333129882812,\r
+    "y": 680.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "672937f1.5c86c",\r
+    "id": "c22368e1.6b1058",\r
     "type": "comment",\r
     "name": "only dst ttp exists. No src",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3662,\r
-    "y": 306,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3886.3333129882812,\r
+    "y": 366.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cf6d8000.914ec",\r
+    "id": "87e2c89e.c92dc",\r
     "type": "comment",\r
     "name": "only src ttp exists. No dst",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3219,\r
-    "y": 1884,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3443.3333129882812,\r
+    "y": 1944.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6bc727fb.e5e2c8",\r
+    "id": "582aaedf.79cf78",\r
     "type": "switchNode",\r
     "name": "switch vpn-binding has src-access-ltp",\r
     "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3398,\r
-    "y": 468,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3622.3333129882812,\r
+    "y": 528.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "16d04d16.35cc13",\r
-        "81d801a9.0be79"\r
+        "16dc47d9.553a58",\r
+        "e13eb694.152348"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "81d801a9.0be79",\r
+    "id": "e13eb694.152348",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3640,\r
-    "y": 1057,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3864.3333129882812,\r
+    "y": 1117.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "87bd1b21.78447"\r
+        "7db46487.9eca7c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "16d04d16.35cc13",\r
+    "id": "16dc47d9.553a58",\r
     "type": "outcome",\r
     "name": "Null",\r
     "xml": "<outcome value=''>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3634,\r
-    "y": 348,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3858.3333129882812,\r
+    "y": 408.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "fe0662dd.a80948"\r
+        "7f468ae0.55d61c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "87bd1b21.78447",\r
+    "id": "7db46487.9eca7c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 3798,\r
-    "y": 1056,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4022.3333129882812,\r
+    "y": 1116.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "6a4fd43b.29d0a4",\r
-        "bb732000.b077a",\r
-        "14bb373f.07c761",\r
-        "ee3130b2.515378",\r
-        "25e58429.ad4ee4",\r
-        "13fd978.b0ce7e9"\r
+        "27bc6cfd.f882bc",\r
+        "798042fa.f28ecc",\r
+        "44029581.1e0294",\r
+        "2e2e336b.2a2684",\r
+        "c0302985.1bc5d8",\r
+        "3bfb4fd1.bca51"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bb732000.b077a",\r
+    "id": "798042fa.f28ecc",\r
     "type": "set",\r
     "name": "set attachment_param for OTN G",\r
     "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",\r
     "comments": "",\r
-    "x": 4062,\r
-    "y": 939,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4286.333312988281,\r
+    "y": 999.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "25e58429.ad4ee4",\r
+    "id": "c0302985.1bc5d8",\r
     "type": "execute",\r
     "name": "execute RestApiCallNode Create OTN tunnel with token",\r
     "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`\" />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4143,\r
-    "y": 1254,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4367.333312988281,\r
+    "y": 1314.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "69f73464.0e3e8c",\r
-        "5f37ff67.4bb2f"\r
+        "cb1eb04b.0a8a5",\r
+        "c9a4895f.79f59"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "69f73464.0e3e8c",\r
+    "id": "cb1eb04b.0a8a5",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4452.5,\r
-    "y": 1223,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4676.833312988281,\r
+    "y": 1283.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "43cec921.9d623"\r
+        "5c0ad877.d4666"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "5f37ff67.4bb2f",\r
+    "id": "c9a4895f.79f59",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4457.5,\r
-    "y": 1288,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4681.833312988281,\r
+    "y": 1348.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "a900d0fc.b4f8e"\r
+        "647a8c60.745274"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "43cec921.9d623",\r
+    "id": "5c0ad877.d4666",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4628.5,\r
-    "y": 1223,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4852.833312988281,\r
+    "y": 1283.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a900d0fc.b4f8e",\r
+    "id": "647a8c60.745274",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4624,\r
-    "y": 1288,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4848.333312988281,\r
+    "y": 1348.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "14bb373f.07c761",\r
+    "id": "44029581.1e0294",\r
     "type": "set",\r
     "name": "set pnf-name",\r
     "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",\r
     "comments": "",\r
-    "x": 4000,\r
-    "y": 987,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4224.333312988281,\r
+    "y": 1047.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ee3130b2.515378",\r
+    "id": "2e2e336b.2a2684",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4026,\r
-    "y": 1104,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4250.333312988281,\r
+    "y": 1164.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "7994d48a.ca38a4",\r
-        "46376621.e31dd8",\r
-        "662f2070.bc1d4"\r
+        "aa3dc68a.e420e",\r
+        "2fd5a39c.e4d124",\r
+        "be0fb969.9df28"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7994d48a.ca38a4",\r
+    "id": "aa3dc68a.e420e",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4221.5001220703125,\r
-    "y": 1056,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4445.833435058594,\r
+    "y": 1116.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "28f98c5.d17c774"\r
+        "bee191ec.52168"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "46376621.e31dd8",\r
+    "id": "2fd5a39c.e4d124",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4213.5001220703125,\r
-    "y": 1111,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4437.833435058594,\r
+    "y": 1171.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "b6666e55.258c4"\r
+        "53b0c593.b44354"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "28f98c5.d17c774",\r
+    "id": "bee191ec.52168",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4365.8824462890625,\r
-    "y": 1055.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4590.215759277344,\r
+    "y": 1115.6556777954102,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "abee57b5.2a2df"\r
+        "41b89aec.8f3b84"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "abee57b5.2a2df",\r
+    "id": "41b89aec.8f3b84",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4550,\r
-    "y": 1054,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4774.333312988281,\r
+    "y": 1114.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "4e7ce11e.d4486"\r
+        "860e8326.494828"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4e7ce11e.d4486",\r
+    "id": "860e8326.494828",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4745,\r
-    "y": 1054,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4969.333312988281,\r
+    "y": 1114.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "cd73aa8e.57927"\r
+        "95d294a2.519858"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "662f2070.bc1d4",\r
+    "id": "be0fb969.9df28",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4218.5001220703125,\r
-    "y": 1168,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4442.833435058594,\r
+    "y": 1228.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "65647ec7.0c6e5"\r
+        "a6d3daf4.4de778"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "65647ec7.0c6e5",\r
+    "id": "a6d3daf4.4de778",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4370.5001220703125,\r
-    "y": 1169,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4594.833435058594,\r
+    "y": 1229.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "b6666e55.258c4",\r
+    "id": "53b0c593.b44354",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 4381.5001220703125,\r
-    "y": 1112,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4605.833435058594,\r
+    "y": 1172.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6a4fd43b.29d0a4",\r
+    "id": "27bc6cfd.f882bc",\r
     "type": "set",\r
     "name": "set vpn-bindingG and connectivityG",\r
     "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",\r
     "comments": "",\r
-    "x": 4057,\r
-    "y": 879,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4281.333312988281,\r
+    "y": 939.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "cd73aa8e.57927",\r
+    "id": "95d294a2.519858",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4948,\r
-    "y": 1058,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5172.333312988281,\r
+    "y": 1118.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "d2b1d416.053a58"\r
+        "280af449.de2e3c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "66918eb9.ab92e8",\r
+    "id": "ef3f04cf.8bb518",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "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' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5333,\r
-    "y": 1071,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5557.333312988281,\r
+    "y": 1131.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "f8b9a196.010a1",\r
-        "fd17d420.f985",\r
-        "40d42743.f42fd8"\r
+        "31456949.0bd6c6",\r
+        "ae6ce682.b30c68",\r
+        "e0e5a782.5ecb88"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d2b1d416.053a58",\r
+    "id": "280af449.de2e3c",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 5127,\r
-    "y": 1058,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5351.333312988281,\r
+    "y": 1118.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "c71b3067.5066e8",\r
-        "66918eb9.ab92e8"\r
+        "7f6c4201.ca3284",\r
+        "ef3f04cf.8bb518"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c71b3067.5066e8",\r
+    "id": "7f6c4201.ca3284",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainG id",\r
     "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",\r
     "comments": "",\r
-    "x": 5363,\r
-    "y": 1019,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5587.333312988281,\r
+    "y": 1079.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f8b9a196.010a1",\r
+    "id": "31456949.0bd6c6",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5543,\r
-    "y": 1062,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5767.333312988281,\r
+    "y": 1122.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "27038b3e.3bcfc4"\r
+        "37e04a2.a327336"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fd17d420.f985",\r
+    "id": "ae6ce682.b30c68",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5535,\r
-    "y": 1117,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5759.333312988281,\r
+    "y": 1177.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "967c6c86.0bbb78"\r
+        "536ede72.dab3b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "40d42743.f42fd8",\r
+    "id": "e0e5a782.5ecb88",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5540,\r
-    "y": 1174,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5764.333312988281,\r
+    "y": 1234.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "35455e8c.6afe9a"\r
+        "f46537ce.c9aaa8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "35455e8c.6afe9a",\r
+    "id": "f46537ce.c9aaa8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5692,\r
-    "y": 1175,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5916.333312988281,\r
+    "y": 1235.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "967c6c86.0bbb78",\r
+    "id": "536ede72.dab3b",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 5703,\r
-    "y": 1120,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5927.333312988281,\r
+    "y": 1180.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "27038b3e.3bcfc4",\r
+    "id": "37e04a2.a327336",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 5687.38232421875,\r
-    "y": 1059.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 5911.715637207031,\r
+    "y": 1119.6556777954102,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "501ec52c.0a5be4"\r
+        "77189bba.da3f4c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "501ec52c.0a5be4",\r
+    "id": "77189bba.da3f4c",\r
     "type": "set",\r
     "name": "set controller domainG data",\r
     "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",\r
     "comments": "",\r
-    "x": 5902,\r
-    "y": 1056,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 6126.333312988281,\r
+    "y": 1116.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ce5771d5.1db118",\r
+    "id": "217a8eaf.b5afda",\r
     "type": "comment",\r
     "name": "both src and dst exist",\r
     "info": "",\r
     "comments": "",\r
-    "x": 3676,\r
-    "y": 997,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3900.3333129882812,\r
+    "y": 1057.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2ade390a.34dac6",\r
+    "id": "877d8b16.d3994",\r
     "type": "switchNode",\r
     "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
     "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2238,\r
-    "y": 724,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2462.3333129882812,\r
+    "y": 784.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "faa20144.28683",\r
-        "a3241eaf.e05748"\r
+        "df6e125e.14274",\r
+        "fd236e9d.746de"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "a3241eaf.e05748",\r
+    "id": "fd236e9d.746de",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2645,\r
-    "y": 742,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2869.3333129882812,\r
+    "y": 802.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "73c18a9e.ba438c"\r
+        "a1b579c2.6ca69"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "faa20144.28683",\r
+    "id": "df6e125e.14274",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2645,\r
-    "y": 687,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2869.3333129882812,\r
+    "y": 747.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "d5f3133.6f4a0f"\r
+        "51a6a8ff.40f098"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d5f3133.6f4a0f",\r
+    "id": "51a6a8ff.40f098",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 2801,\r
-    "y": 685,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3025.3333129882812,\r
+    "y": 745.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "35b5f42.3d7048c",\r
-        "1dc25027.0c33f8"\r
+        "27db8b21.23f75c",\r
+        "afc78578.3291"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "73c18a9e.ba438c",\r
+    "id": "a1b579c2.6ca69",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2778,\r
-    "y": 743,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3002.3333129882812,\r
+    "y": 803.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fda13949.60eb78",\r
+    "id": "cef7b9ce.1b3ba8",\r
     "type": "set",\r
     "name": "unset tmp.aai.all-vpn-bindings",\r
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",\r
     "comments": "",\r
-    "x": 955,\r
-    "y": 159,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1179.3333129882812,\r
+    "y": 219.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "38085312.8a965c",\r
+    "id": "bdafe4d.0bce798",\r
     "type": "comment",\r
     "name": "CLL new",\r
     "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}",\r
     "comments": "",\r
-    "x": 4072,\r
-    "y": 577,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4296.333312988281,\r
+    "y": 637.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1721d523.151643",\r
+    "id": "20794036.3e0d98",\r
     "type": "set",\r
     "name": "set leaf-otn-tunnels-list array",\r
     "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",\r
     "comments": "",\r
-    "x": 4132,\r
-    "y": 616,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4356.333312988281,\r
+    "y": 676.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "47d2cfff.4a0e4",\r
+    "id": "306cc859.5059d",\r
     "type": "set",\r
     "name": "unset leaf-otn-tunnels-list array",\r
     "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",\r
     "comments": "",\r
-    "x": 948,\r
-    "y": 67,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1172.3333129882812,\r
+    "y": 127.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "be7a05aa.4b83b",\r
+    "id": "3258d8ff.e890f",\r
     "type": "comment",\r
     "name": "CLL new",\r
     "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}",\r
     "comments": "",\r
-    "x": 3484,\r
-    "y": 2093,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3708.3333129882812,\r
+    "y": 2153.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7c2a5c1b.45951c",\r
+    "id": "33be6bd8.7ec864",\r
     "type": "set",\r
     "name": "set root-otn-tunnels-list array",\r
     "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",\r
     "comments": "",\r
-    "x": 3540,\r
-    "y": 2142,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3764.3333129882812,\r
+    "y": 2202.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f179b432.4e819",\r
+    "id": "7f9af85d.c9b1a",\r
     "type": "set",\r
     "name": "unset root-otn-tunnels-list array",\r
     "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",\r
     "comments": "",\r
-    "x": 948,\r
-    "y": 106,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1172.3333129882812,\r
+    "y": 166.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "8845442c.1d5de8",\r
+    "id": "5f84eccb.714dcc",\r
     "type": "execute",\r
     "name": "execute properties",\r
     "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' />",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 979,\r
-    "y": 207,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1203.3333129882812,\r
+    "y": 267.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "72564454.b964f4",\r
+    "id": "3014f91f.87a3fe",\r
     "type": "save",\r
     "name": "get service-instance from aai",\r
     "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-->",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 189,\r
-    "y": 682,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 413.33331298828125,\r
+    "y": 742.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "130c8849.c68768",\r
-        "9607da93.a7cfb8",\r
-        "675a11bf.37e84"\r
+        "ad3a20d5.f6589",\r
+        "e51813a.1cc197",\r
+        "ca637d1.24786"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "130c8849.c68768",\r
+    "id": "ad3a20d5.f6589",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 408,\r
-    "y": 620,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 632.3333129882812,\r
+    "y": 680.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "19b84d16.53d643"\r
+        "5ade52fc.bbf09c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9607da93.a7cfb8",\r
+    "id": "e51813a.1cc197",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 417.490966796875,\r
-    "y": 662.5740356445312,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 641.8242797851562,\r
+    "y": 722.5740432739258,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "675a11bf.37e84",\r
+    "id": "ca637d1.24786",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 406,\r
-    "y": 709,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 630.3333129882812,\r
+    "y": 769.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "13e02ffd.705ef8"\r
+        "67b4863e.f31f1"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "19b84d16.53d643",\r
+    "id": "5ade52fc.bbf09c",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 605,\r
-    "y": 616,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 829.3333129882812,\r
+    "y": 676.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "95aa58da.ce0078"\r
+        "805608ab.1113d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "13e02ffd.705ef8",\r
+    "id": "67b4863e.f31f1",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 575,\r
-    "y": 710,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 799.3333129882812,\r
+    "y": 770.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "95aa58da.ce0078",\r
+    "id": "805608ab.1113d",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 828.33349609375,\r
-    "y": 615.9999389648438,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1052.6668090820312,\r
+    "y": 675.9999465942383,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "82937c17.5a3278"\r
+        "fce88b79.ad9ea"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "82937c17.5a3278",\r
+    "id": "fce88b79.ad9ea",\r
     "type": "outcome",\r
     "name": "connectivity",\r
     "xml": "<outcome value='connectivity'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1029.0001335144043,\r
-    "y": 617.000020980835,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1253.3334465026855,\r
+    "y": 677.0000286102295,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "7d4de732.7e236"\r
+        "324a4f4a.beb9"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7d4de732.7e236",\r
+    "id": "324a4f4a.beb9",\r
     "type": "save",\r
     "name": "get connectivity from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 159,\r
-    "y": 879,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 383.33331298828125,\r
+    "y": 939.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "f6447d51.51534",\r
-        "d2723085.ef21f",\r
-        "14bf719a.197f76"\r
+        "5a7cd799.dd504",\r
+        "c46ba437.0993",\r
+        "3526445b.eeea9c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f6447d51.51534",\r
+    "id": "5a7cd799.dd504",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 367,\r
-    "y": 843,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 591.3333129882812,\r
+    "y": 903.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "93da3cfa.70c248"\r
+        "63b8bbd2.15c994"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "d2723085.ef21f",\r
+    "id": "c46ba437.0993",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 367.490966796875,\r
-    "y": 888.5740356445312,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 591.8242797851562,\r
+    "y": 948.5740432739258,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "14bf719a.197f76",\r
+    "id": "3526445b.eeea9c",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 365,\r
-    "y": 932,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 589.3333129882812,\r
+    "y": 992.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "836041f9.6829f8"\r
+        "c4b232cc.80b998"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "836041f9.6829f8",\r
+    "id": "c4b232cc.80b998",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 534,\r
-    "y": 933,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 758.3333129882812,\r
+    "y": 993.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "a94aa53a.b107d8",\r
+    "id": "bd0ad7c2.1f4f3",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 506,\r
-    "y": 1427,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 730.3333129882812,\r
+    "y": 1487.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "21c47827.df1568"\r
+        "fb10f5a.4414808"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "21c47827.df1568",\r
+    "id": "fb10f5a.4414808",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 709,\r
-    "y": 1439,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 933.3333129882812,\r
+    "y": 1499.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "18be783b.f07278"\r
+        "31b4d2c5.66c72e"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "18be783b.f07278",\r
+    "id": "31b4d2c5.66c72e",\r
     "type": "outcome",\r
     "name": "UNI",\r
     "xml": "<outcome value='uni'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 875,\r
-    "y": 1436,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1099.3333129882812,\r
+    "y": 1496.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "11fb7f76.b02469"\r
+        "d62a4bb8.975ae8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "11fb7f76.b02469",\r
+    "id": "d62a4bb8.975ae8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 1036,\r
-    "y": 1433,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1260.3333129882812,\r
+    "y": 1493.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "47d6d37a.9fb43c",\r
-        "1c027792.461348",\r
-        "ea05bf35.5069",\r
-        "9d31ed5b.d2c91",\r
-        "23eb7cf4.f6cfdc",\r
-        "99b18acf.7ec528"\r
+        "46f537c9.1c8be8",\r
+        "f8fe77e2.d43ff8",\r
+        "6a183fad.35ec3",\r
+        "f7155528.92cd7",\r
+        "65c7779e.8d1a88",\r
+        "cccd2695.c600b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "1c027792.461348",\r
+    "id": "f8fe77e2.d43ff8",\r
     "type": "set",\r
     "name": "unset tmp.aai.uni",\r
     "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
     "comments": "",\r
-    "x": 1242,\r
-    "y": 1032.9999389648438,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1466.3333129882812,\r
+    "y": 1092.9999465942383,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "47d6d37a.9fb43c",\r
+    "id": "46f537c9.1c8be8",\r
     "type": "save",\r
     "name": "get uni from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1239,\r
-    "y": 1077.9999389648438,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1463.3333129882812,\r
+    "y": 1137.9999465942383,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "2a120b9c.2b340c",\r
-        "41aafa7d.002584",\r
-        "b80f04fd.7f4018"\r
+        "4e769c0f.1938ec",\r
+        "3dc6fc35.d186bc",\r
+        "90b11589.d4f84"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "41aafa7d.002584",\r
+    "id": "3dc6fc35.d186bc",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1434.490966796875,\r
-    "y": 1051.5739135742188,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1658.8242797851562,\r
+    "y": 1111.5739212036133,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "b752ad58.1bdf1"\r
+        "6d117931.940098"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b80f04fd.7f4018",\r
+    "id": "90b11589.d4f84",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1430,\r
-    "y": 1095.9998779296875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1654.3333129882812,\r
+    "y": 1155.999885559082,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "81604b65.13211"\r
+        "f48b55b8.ea1ca8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b752ad58.1bdf1",\r
+    "id": "6d117931.940098",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 1597.0625,\r
-    "y": 1050.859619140625,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1821.3958129882812,\r
+    "y": 1110.8596267700195,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "81604b65.13211",\r
+    "id": "f48b55b8.ea1ca8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 1598,\r
-    "y": 1095.9998779296875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1822.3333129882812,\r
+    "y": 1155.999885559082,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1b5d0889.20238f",\r
+    "id": "e35ee523.d065b8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 1600,\r
-    "y": 1142.9998779296875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1824.3333129882812,\r
+    "y": 1202.999885559082,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "2a120b9c.2b340c",\r
+    "id": "4e769c0f.1938ec",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1431,\r
-    "y": 1142.9998779296875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1655.3333129882812,\r
+    "y": 1202.999885559082,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "1b5d0889.20238f"\r
+        "e35ee523.d065b8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "450a13df.b4e0a4",\r
+    "id": "bf815f65.ee4c28",\r
     "type": "comment",\r
     "name": "CLL new",\r
     "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}",\r
     "comments": "",\r
-    "x": 1213,\r
-    "y": 1664,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1437.3333129882812,\r
+    "y": 1724.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ea05bf35.5069",\r
+    "id": "6a183fad.35ec3",\r
     "type": "set",\r
     "name": "set ethernet-srv-end-points-list array",\r
     "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",\r
     "comments": "",\r
-    "x": 1304,\r
-    "y": 1718,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1528.3333129882812,\r
+    "y": 1778.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "93a880c5.cd0b3",\r
+    "id": "1ef1fe95.45b2b9",\r
     "type": "set",\r
     "name": "unset ethernet-srv-end-points-list",\r
     "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' />",\r
     "comments": "",\r
-    "x": 1980.5,\r
-    "y": 1131,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2204.8333129882812,\r
+    "y": 1191.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "481f95ef.87ef1c",\r
+    "id": "dbeb188c.810cc",\r
     "type": "set",\r
     "name": "unset ethernet-srv-end-points-list",\r
     "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' />",\r
     "comments": "",\r
-    "x": 1985.5,\r
-    "y": 1233,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2209.8333129882812,\r
+    "y": 1293.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c1ad05eb.c84b48",\r
+    "id": "f8c77435.00d858",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 469,\r
-    "y": 1683,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 693.3333129882812,\r
+    "y": 1743.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "7f234491.70b134"\r
+        "e5d4675a.166ce"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7f234491.70b134",\r
+    "id": "e5d4675a.166ce",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 701,\r
-    "y": 1682,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 925.3333129882812,\r
+    "y": 1742.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "c6ba5a66.793238"\r
+        "a4b4e62.0b9bb18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "c6ba5a66.793238",\r
+    "id": "a4b4e62.0b9bb18",\r
     "type": "outcome",\r
     "name": "vpn-binding",\r
     "xml": "<outcome value='vpn-binding'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 913,\r
-    "y": 1683,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1137.3333129882812,\r
+    "y": 1743.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "6ed8d899.fdc1a"\r
+        "79b56211.8303fc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6ed8d899.fdc1a",\r
+    "id": "79b56211.8303fc",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 169,\r
-    "y": 1839,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 393.33331298828125,\r
+    "y": 1899.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "d9421c0f.7a0898",\r
-        "953702c4.2d79b"\r
+        "5e413ae2.fc139c",\r
+        "a0eb6cf6.129b98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "953702c4.2d79b",\r
+    "id": "a0eb6cf6.129b98",\r
     "type": "set",\r
     "name": "unset tmp.aai.vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
     "comments": "",\r
-    "x": 404,\r
-    "y": 1826,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 628.3333129882812,\r
+    "y": 1886.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d9421c0f.7a0898",\r
+    "id": "5e413ae2.fc139c",\r
     "type": "save",\r
     "name": "get vpn-binding from aai",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 394,\r
-    "y": 1887,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 618.3333129882812,\r
+    "y": 1947.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "329ab1cc.22fb9e",\r
-        "864547d3.a6077",\r
-        "b2aa6219.f09508"\r
+        "5d519b04.edc364",\r
+        "44e78fc4.a8de9",\r
+        "77b9ca42.e1131c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "864547d3.a6077",\r
+    "id": "44e78fc4.a8de9",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 607.490966796875,\r
-    "y": 1871.5740356445312,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 831.8242797851562,\r
+    "y": 1931.5740432739258,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "6b83b223.ee9d94"\r
+        "93fe98b.5489068"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "b2aa6219.f09508",\r
+    "id": "77b9ca42.e1131c",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 603,\r
-    "y": 1916,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 827.3333129882812,\r
+    "y": 1976.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "4ac70bf0.89675c"\r
+        "376a9d2f.bd1f52"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "329ab1cc.22fb9e",\r
+    "id": "5d519b04.edc364",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 605,\r
-    "y": 1976,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 829.3333129882812,\r
+    "y": 2036.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "f02a177d.26c7"\r
+        "fa4146f3.54f198"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6b83b223.ee9d94",\r
+    "id": "93fe98b.5489068",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 770.0625,\r
-    "y": 1870.8597412109375,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 994.3958129882812,\r
+    "y": 1930.859748840332,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "4ac70bf0.89675c",\r
+    "id": "376a9d2f.bd1f52",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 771,\r
-    "y": 1916,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 995.3333129882812,\r
+    "y": 1976.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f02a177d.26c7",\r
+    "id": "fa4146f3.54f198",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 774,\r
-    "y": 1975,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 998.3333129882812,\r
+    "y": 2035.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "fc6eb753.cc314",\r
-        "6f8a0144.f9e8e8"\r
+        "ef75e4e3.1f8138",\r
+        "e2966b29.fc5b38"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "ace8d395.16f8f8",\r
+    "id": "572a8f36.0443a",\r
     "type": "set",\r
     "name": "set sotn_value",\r
     "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",\r
     "comments": "",\r
-    "x": 173,\r
-    "y": 2474,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 397.33331298828125,\r
+    "y": 2534.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "fa159141.96876",\r
+    "id": "944da194.59bcd",\r
     "type": "execute",\r
     "name": "execute RestApiCallNode Create ethernet Service without token",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 316,\r
-    "y": 2534,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 540.3333129882812,\r
+    "y": 2594.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "192fb1d6.9d578e",\r
-        "7d0ee5a8.eae4dc"\r
+        "d840ad4b.1282a",\r
+        "89a7b87.1e553c8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "192fb1d6.9d578e",\r
+    "id": "d840ad4b.1282a",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 628.5,\r
-    "y": 2511,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 852.8333129882812,\r
+    "y": 2571.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "7d0ee5a8.eae4dc",\r
+    "id": "89a7b87.1e553c8",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 632.5,\r
-    "y": 2551,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 856.8333129882812,\r
+    "y": 2611.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "31d10b34.3ac65c"\r
+        "5d5378bf.137d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7a578c61.6716c4",\r
+    "id": "9a01795a.7ab4e",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 808.5,\r
-    "y": 2515,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1032.8333129882812,\r
+    "y": 2575.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "31d10b34.3ac65c",\r
+    "id": "5d5378bf.137d",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 824,\r
-    "y": 2569,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1048.3333129882812,\r
+    "y": 2629.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "34d0fee.5345782"\r
+        "6dbe844a.8a9554",\r
+        "63370d02.a0670c",\r
+        "1ca90fe2.261db8",\r
+        "2ecfa879.64974"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "e5aa9a1b.90043",\r
+    "id": "ef77bece.8a7928",\r
     "type": "save",\r
     "name": "update vpn-binding resource (aka. OTN ) in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1119.5,\r
-    "y": 2538,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1343.8333129882812,\r
+    "y": 2598.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "dceb8020.64dda",\r
+    "id": "33e96132.6ee886",\r
     "type": "comment",\r
     "name": "TODO: FIXME",\r
     "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
     "comments": "",\r
-    "x": 2586.5,\r
-    "y": 1889,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2810.8333129882812,\r
+    "y": 1949.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "34d0fee.5345782",\r
+    "id": "6dbe844a.8a9554",\r
     "type": "save",\r
     "name": "update connectivity resource in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1081.5,\r
-    "y": 2580,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1305.8333129882812,\r
+    "y": 2640.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "1840e683.b61c39",\r
+    "id": "c08ad06c.488d4",\r
     "type": "set",\r
     "name": "set leafOrRootAccess",\r
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",\r
     "comments": "",\r
-    "x": 1946.5,\r
-    "y": 1169,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2170.8333129882812,\r
+    "y": 1229.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ebd04ab8.6f009",\r
+    "id": "2ee2b867.995c6",\r
     "type": "set",\r
     "name": "set leafOrRootAccess",\r
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",\r
     "comments": "",\r
-    "x": 1947.5,\r
-    "y": 1273,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2171.8333129882812,\r
+    "y": 1333.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9094f518.043e98",\r
+    "id": "5a5b3fd3.939fa",\r
     "type": "save",\r
     "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4241,\r
-    "y": 530,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4465.333312988281,\r
+    "y": 590.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "13fd978.b0ce7e9",\r
+    "id": "3bfb4fd1.bca51",\r
     "type": "save",\r
     "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 4144,\r
-    "y": 1349,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4368.333312988281,\r
+    "y": 1409.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "db1559a9.21dcb8",\r
+    "id": "7832f278.b4880c",\r
     "type": "save",\r
     "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 3638,\r
-    "y": 2021,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3862.3333129882812,\r
+    "y": 2081.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "93da3cfa.70c248",\r
+    "id": "63b8bbd2.15c994",\r
     "type": "switchNode",\r
     "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",\r
     "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 739,\r
-    "y": 829,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 963.3333129882812,\r
+    "y": 889.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "2c44355c.6d9982",\r
-        "16b41754.18b639"\r
+        "a66053fc.e972e8",\r
+        "286bc10d.0b75fe"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "2c44355c.6d9982",\r
+    "id": "a66053fc.e972e8",\r
     "type": "outcomeTrue",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1102,\r
-    "y": 852,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1326.3333129882812,\r
+    "y": 912.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "58ecddbb.063a6c"\r
+        "6f304f3b.74dcb"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "16b41754.18b639",\r
+    "id": "286bc10d.0b75fe",\r
     "type": "outcomeFalse",\r
     "name": "false",\r
     "xml": "<outcome value='false'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1102,\r
-    "y": 801,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1326.3333129882812,\r
+    "y": 861.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "255e639c.d2ebb4"\r
+        "bf68aa32.2da6d"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "58ecddbb.063a6c",\r
+    "id": "6f304f3b.74dcb",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 1258,\r
-    "y": 850,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1482.3333129882812,\r
+    "y": 910.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "9a61b358.c738d8"\r
+        "9b8bc380.4fea78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "255e639c.d2ebb4",\r
+    "id": "bf68aa32.2da6d",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1235,\r
-    "y": 802,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1459.3333129882812,\r
+    "y": 862.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "c0e6872b.6bc578",\r
+    "id": "b3333886.2341",\r
     "type": "set",\r
     "name": "unset tmp.aai.vpn-binding",\r
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",\r
     "comments": "",\r
-    "x": 1995,\r
-    "y": 200,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2219.3333129882812,\r
+    "y": 260.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "64935ddb.b635b4",\r
+    "id": "cc8c0809.c4ad6",\r
     "type": "set",\r
     "name": "set root-otn-tunnels-list array",\r
     "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",\r
     "comments": "",\r
-    "x": 3537,\r
-    "y": 2181,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 3761.3333129882812,\r
+    "y": 2241.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "f54721e.ec69de",\r
+    "id": "eb39e6d9.695df8",\r
     "type": "set",\r
     "name": "set leaf-otn-tunnels-list array",\r
     "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",\r
     "comments": "",\r
-    "x": 4127,\r
-    "y": 654,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 4351.333312988281,\r
+    "y": 714.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "9d31ed5b.d2c91",\r
+    "id": "f7155528.92cd7",\r
     "type": "set",\r
     "name": "set ethernet-srv-end-points-list array",\r
     "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",\r
     "comments": "",\r
-    "x": 1301,\r
-    "y": 1760,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1525.3333129882812,\r
+    "y": 1820.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7af36070.5c1af",\r
+    "id": "7ad9431e.95fd94",\r
     "type": "set",\r
     "name": "set filename",\r
     "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",\r
     "comments": "",\r
-    "x": 480,\r
-    "y": 1494,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 704.3333129882812,\r
+    "y": 1554.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2d8e3cc1.bb010c",\r
+    "id": "da906021.6570a8",\r
     "type": "execute",\r
     "name": "execute printContext",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 511,\r
-    "y": 1534,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 735.3333129882812,\r
+    "y": 1594.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "fc6eb753.cc314",\r
+    "id": "ef75e4e3.1f8138",\r
     "type": "set",\r
     "name": "set otn-tunnels-name-list array",\r
     "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",\r
     "comments": "",\r
-    "x": 1059,\r
-    "y": 1942,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1283.3333129882812,\r
+    "y": 2002.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "6f8a0144.f9e8e8",\r
+    "id": "e2966b29.fc5b38",\r
     "type": "set",\r
     "name": "set otn-tunnels-name-list array",\r
     "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",\r
     "comments": "",\r
-    "x": 1062,\r
-    "y": 1984,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1286.3333129882812,\r
+    "y": 2044.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1e5bd700.d21b81",\r
+    "id": "64010c53.9fe67c",\r
     "type": "set",\r
     "name": "unset otn-tunnels-name-list array",\r
     "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",\r
     "comments": "",\r
-    "x": 505,\r
-    "y": 1624,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 729.3333129882812,\r
+    "y": 1684.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "144b407f.200e78",\r
+    "id": "d5a25879.5481b8",\r
     "type": "set",\r
     "name": "set filename",\r
     "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
     "comments": "",\r
-    "x": 260,\r
-    "y": 2003,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 484.33331298828125,\r
+    "y": 2063.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "76785af4.e022ac",\r
+    "id": "7aac81ec.ba7cc8",\r
     "type": "execute",\r
     "name": "execute printContext",\r
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 268,\r
-    "y": 2060,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 492.33331298828125,\r
+    "y": 2120.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "23eb7cf4.f6cfdc",\r
+    "id": "65c7779e.8d1a88",\r
     "type": "execute",\r
     "name": "execute split tp-id to get pnf-name",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1279,\r
-    "y": 1609,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1503.3333129882812,\r
+    "y": 1669.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "779a259e.64832c",\r
-        "277a0a61.75069e"\r
+        "2c5e4010.43e508",\r
+        "e3644437.55d698"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "277a0a61.75069e",\r
+    "id": "e3644437.55d698",\r
     "type": "failure",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1502,\r
-    "y": 1564,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1726.3333129882812,\r
+    "y": 1624.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "21f0cc68.0dd77c"\r
+        "63f336a7.fff6b"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "779a259e.64832c",\r
+    "id": "2c5e4010.43e508",\r
     "type": "failure",\r
     "name": "failure",\r
     "xml": "<outcome value='failure'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1504,\r
-    "y": 1628,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1728.3333129882812,\r
+    "y": 1688.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "db13af98.99768"\r
+        "2fd3ce09.17bf12"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "21f0cc68.0dd77c",\r
+    "id": "63f336a7.fff6b",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 1667,\r
-    "y": 1561,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1891.3333129882812,\r
+    "y": 1621.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "ec997076.0ceb28"\r
+        "185277bc.64228"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "db13af98.99768",\r
+    "id": "2fd3ce09.17bf12",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
     "comments": "",\r
-    "x": 1666,\r
-    "y": 1624,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1890.3333129882812,\r
+    "y": 1684.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "ec997076.0ceb28",\r
+    "id": "185277bc.64228",\r
     "type": "set",\r
     "name": "set tmp.uni-node-id-short",\r
     "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
     "comments": "",\r
-    "x": 1887,\r
-    "y": 1575,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2111.3333129882812,\r
+    "y": 1635.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2341ba90.ed99d6",\r
+    "id": "f4fd995d.61939",\r
     "type": "outcome",\r
     "name": "esr-thirdparty-sdnc",\r
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1432,\r
-    "y": 2300,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1656.3333129882812,\r
+    "y": 2360.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "35e4a68.098365a"\r
+        "3bd70d03.1cae1a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "701770f6.4dd0f8",\r
+    "id": "fea4d7d8.17bf48",\r
     "type": "execute",\r
     "name": "get esr-thirdparty-sdnc",\r
     "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' >",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1817,\r
-    "y": 2313,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2041.3333129882812,\r
+    "y": 2373.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "d75e7467.a58a4",\r
-        "74ab773b.95bd78",\r
-        "df0b8ca4.cd7bb8"\r
+        "753e6379.2f2664",\r
+        "3a690bb3.5501f4",\r
+        "105362f3.9957cd"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "35e4a68.098365a",\r
+    "id": "3bd70d03.1cae1a",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "outputs": 1,\r
-    "x": 1611,\r
-    "y": 2300,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1835.3333129882812,\r
+    "y": 2360.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "fa1aec8.0f5319",\r
-        "701770f6.4dd0f8"\r
+        "3086e43a.76dc2c",\r
+        "fea4d7d8.17bf48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "fa1aec8.0f5319",\r
+    "id": "3086e43a.76dc2c",\r
     "type": "set",\r
     "name": "set esr-thirdparty-sdnc domainConn id",\r
     "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",\r
     "comments": "",\r
-    "x": 1847,\r
-    "y": 2261,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2071.3333129882812,\r
+    "y": 2321.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d75e7467.a58a4",\r
+    "id": "753e6379.2f2664",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2027,\r
-    "y": 2304,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2251.3333129882812,\r
+    "y": 2364.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "1ccfad18.1b3fa3"\r
+        "57e3082b.ec85c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "74ab773b.95bd78",\r
+    "id": "3a690bb3.5501f4",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2019,\r
-    "y": 2359,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2243.3333129882812,\r
+    "y": 2419.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "2692af0.8253f52"\r
+        "e1967348.adb6a"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "df0b8ca4.cd7bb8",\r
+    "id": "105362f3.9957cd",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2024,\r
-    "y": 2416,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2248.3333129882812,\r
+    "y": 2476.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "f048da7.b1469a8"\r
+        "9b464363.d7abc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f048da7.b1469a8",\r
+    "id": "9b464363.d7abc",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 2176,\r
-    "y": 2417,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2400.3333129882812,\r
+    "y": 2477.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "2692af0.8253f52",\r
+    "id": "e1967348.adb6a",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 2187,\r
-    "y": 2362,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2411.3333129882812,\r
+    "y": 2422.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "1ccfad18.1b3fa3",\r
+    "id": "57e3082b.ec85c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 2171.38232421875,\r
-    "y": 2301.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2395.7156372070312,\r
+    "y": 2361.65567779541,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "64610343.e61854"\r
+        "a2d4cc4c.5835f"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "64610343.e61854",\r
+    "id": "a2d4cc4c.5835f",\r
     "type": "set",\r
     "name": "set controller domainConn data",\r
     "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",\r
     "comments": "",\r
-    "x": 2386,\r
-    "y": 2298,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2610.3333129882812,\r
+    "y": 2358.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "d3c52589.f54e9",\r
+    "id": "77651854.67a228",\r
     "type": "get-resource",\r
     "name": "get-resource src pnf",\r
     "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",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 510,\r
-    "y": 2346,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 734.3333129882812,\r
+    "y": 2406.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "f189c3f1.d69a28",\r
-        "4452e7a9.eaf9c8",\r
-        "77af657c.107d34"\r
+        "8b371429.94e21",\r
+        "ddb97aef.ff9618",\r
+        "6bdf8533.ac0744"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "f189c3f1.d69a28",\r
+    "id": "8b371429.94e21",\r
     "type": "success",\r
     "name": "success",\r
     "xml": "<outcome value='success'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 705.5001220703125,\r
-    "y": 2298,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 929.8334350585938,\r
+    "y": 2358.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "47b3661c.a1e7d8"\r
+        "86408567.50b5f8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4452e7a9.eaf9c8",\r
+    "id": "ddb97aef.ff9618",\r
     "type": "not-found",\r
     "name": "not-found",\r
     "xml": "<outcome value='not-found'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 697.5001220703125,\r
-    "y": 2353,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 921.8334350585938,\r
+    "y": 2413.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "34198ba3.49ea3c"\r
+        "83d0fe92.92a8c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "47b3661c.a1e7d8",\r
+    "id": "86408567.50b5f8",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>\n",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 849.8824462890625,\r
-    "y": 2297.6556701660156,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1074.2157592773438,\r
+    "y": 2357.65567779541,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "cd5c4879.eeeaf"\r
+        "206c1f26.03baa8"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "cd5c4879.eeeaf",\r
+    "id": "206c1f26.03baa8",\r
     "type": "for",\r
     "name": "for each relationship",\r
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1034,\r
-    "y": 2296,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1258.3333129882812,\r
+    "y": 2356.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "7bf74b1f.d5837c"\r
+        "604358eb.cf3bc"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "7bf74b1f.d5837c",\r
+    "id": "604358eb.cf3bc",\r
     "type": "switchNode",\r
     "name": "switch related-to",\r
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1229,\r
-    "y": 2296,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1453.3333129882812,\r
+    "y": 2356.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "2341ba90.ed99d6"\r
+        "f4fd995d.61939"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "77af657c.107d34",\r
+    "id": "6bdf8533.ac0744",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 702.5001220703125,\r
-    "y": 2410,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 926.8334350585938,\r
+    "y": 2470.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "6c7ae4ee.17c334"\r
+        "843f6d1c.7ee9c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "6c7ae4ee.17c334",\r
+    "id": "843f6d1c.7ee9c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 854.5001220703125,\r
-    "y": 2411,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1078.8334350585938,\r
+    "y": 2471.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "34198ba3.49ea3c",\r
+    "id": "83d0fe92.92a8c",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "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",\r
     "comments": "",\r
-    "x": 865.5001220703125,\r
-    "y": 2354,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1089.8334350585938,\r
+    "y": 2414.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "303a4e11.243e7a",\r
+    "id": "7e37f686.4b31c8",\r
     "type": "set",\r
     "name": "set tmp.pnf-name-forUrl",\r
     "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",\r
     "comments": "",\r
-    "x": 500,\r
-    "y": 2258,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 724.3333129882812,\r
+    "y": 2318.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c718737.8cca71",\r
+    "id": "c0f06a3d.8ad7f8",\r
     "type": "block",\r
     "name": "block : atomic",\r
     "xml": "<block atomic=\"true\">",\r
     "atomic": "true",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 245,\r
-    "y": 2389,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 469.33331298828125,\r
+    "y": 2449.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "303a4e11.243e7a",\r
-        "d3c52589.f54e9"\r
+        "7e37f686.4b31c8",\r
+        "77651854.67a228"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "72622933.417d18",\r
+    "id": "7e8f5942.82fe9",\r
     "type": "comment",\r
     "name": "Temporary skipping this check - to support multiple instances in one slice",\r
     "info": "",\r
     "comments": "",\r
-    "x": 1459.9666748046875,\r
-    "y": 206.88333129882812,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1684.2999877929688,\r
+    "y": 266.88333892822266,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c3fd03f5.ced1a",\r
+    "id": "9f7438aa.cfa3f8",\r
     "type": "returnFailure",\r
     "name": "return failure",\r
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
     "comments": "",\r
-    "x": 662,\r
-    "y": 429,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 886.3333129882812,\r
+    "y": 489.00000762939453,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "c72dabdd.dd1b58",\r
+    "id": "4162fe05.2b911",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 221.5,\r
-    "y": 1398,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 445.83331298828125,\r
+    "y": 1458.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "a94aa53a.b107d8",\r
-        "c1ad05eb.c84b48",\r
-        "7af36070.5c1af",\r
-        "2d8e3cc1.bb010c",\r
-        "ace8d395.16f8f8",\r
-        "fa159141.96876",\r
-        "1e5bd700.d21b81",\r
-        "144b407f.200e78",\r
-        "76785af4.e022ac",\r
-        "c718737.8cca71",\r
-        "eca312ef.b3f488"\r
+        "bd0ad7c2.1f4f3",\r
+        "f8c77435.00d858",\r
+        "7ad9431e.95fd94",\r
+        "da906021.6570a8",\r
+        "572a8f36.0443a",\r
+        "944da194.59bcd",\r
+        "64010c53.9fe67c",\r
+        "d5a25879.5481b8",\r
+        "7aac81ec.ba7cc8",\r
+        "c0f06a3d.8ad7f8",\r
+        "ad8e54c3.d3fe18"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "99b18acf.7ec528",\r
+    "id": "cccd2695.c600b",\r
     "type": "switchNode",\r
     "name": "switch uni type",\r
     "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1252,\r
-    "y": 1236,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1476.3333129882812,\r
+    "y": 1296.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "bfa56f6a.14e168",\r
-        "3c1ef869.c0abd8",\r
-        "3b2dd259.d313d6",\r
-        "42d627cc.4d9d98"\r
+        "8f7bce65.961b18",\r
+        "17cc18e5.7d037f",\r
+        "302ecb9b.5a47dc",\r
+        "c6b9b74d.1c7d78"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bfa56f6a.14e168",\r
+    "id": "8f7bce65.961b18",\r
     "type": "outcome",\r
     "name": "leaf",\r
     "xml": "<outcome value='leaf'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1417,\r
-    "y": 1218,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1641.3333129882812,\r
+    "y": 1278.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "327e25a1.149b82"\r
+        "3943aa6e.c88a36"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3c1ef869.c0abd8",\r
+    "id": "17cc18e5.7d037f",\r
     "type": "outcome",\r
     "name": "root",\r
     "xml": "<outcome value='root'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1420,\r
-    "y": 1257,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1644.3333129882812,\r
+    "y": 1317.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "bb94632d.8744e"\r
+        "47637f28.c69c6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "42d627cc.4d9d98",\r
+    "id": "c6b9b74d.1c7d78",\r
     "type": "other",\r
     "name": "other",\r
     "xml": "<outcome value='Other'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1414,\r
-    "y": 1335,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1638.3333129882812,\r
+    "y": 1395.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "aa99ff1e.001ee"\r
+        "656a466a.445c98"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3b2dd259.d313d6",\r
+    "id": "302ecb9b.5a47dc",\r
     "type": "outcome",\r
     "name": "secondary-root",\r
     "xml": "<outcome value='secondary-root'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1437,\r
-    "y": 1298,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1661.3333129882812,\r
+    "y": 1358.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "3c1ff952.ce0566"\r
+        "6a61eaa3.28143c"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "8b34828e.2e2fe8",\r
+    "id": "a2fb1650.227e28",\r
     "type": "set",\r
     "name": "unset ethernet-srv-end-points-list",\r
     "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' />",\r
     "comments": "",\r
-    "x": 1983,\r
-    "y": 1331,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2207.3333129882812,\r
+    "y": 1391.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "7c827d8b.b5207c",\r
+    "id": "e35c4fb2.169e68",\r
     "type": "set",\r
     "name": "set leafOrRootAccess",\r
     "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-backup' />\n",\r
     "comments": "",\r
-    "x": 1945,\r
-    "y": 1371,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 2169.3333129882812,\r
+    "y": 1431.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
   },\r
   {\r
-    "id": "aa99ff1e.001ee",\r
+    "id": "656a466a.445c98",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1582,\r
-    "y": 1335,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1806.3333129882812,\r
+    "y": 1395.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       []\r
     ]\r
   },\r
   {\r
-    "id": "327e25a1.149b82",\r
+    "id": "3943aa6e.c88a36",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1578,\r
-    "y": 1214,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1802.3333129882812,\r
+    "y": 1274.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "1840e683.b61c39"\r
+        "c08ad06c.488d4"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "bb94632d.8744e",\r
+    "id": "47637f28.c69c6",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1585,\r
-    "y": 1259,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1809.3333129882812,\r
+    "y": 1319.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "ebd04ab8.6f009"\r
+        "2ee2b867.995c6"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "3c1ff952.ce0566",\r
+    "id": "6a61eaa3.28143c",\r
     "type": "block",\r
     "name": "block",\r
     "xml": "<block>",\r
     "atomic": "false",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 1584,\r
-    "y": 1299,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 1808.3333129882812,\r
+    "y": 1359.0000076293945,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "7c827d8b.b5207c"\r
+        "e35c4fb2.169e68"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "9a61b358.c738d8",\r
+    "id": "9b8bc380.4fea78",\r
     "type": "switchNode",\r
     "name": "switch conn type != mdsc",\r
     "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type != 'mdsc' `\">\n\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 218.56666564941406,\r
-    "y": 1158.933349609375,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 442.8999786376953,\r
+    "y": 1218.9333572387695,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "4c9cf74b.527528"\r
+        "77dc380.c063d48"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "4c9cf74b.527528",\r
+    "id": "77dc380.c063d48",\r
     "type": "outcome",\r
     "name": "true",\r
     "xml": "<outcome value='true'>\n",\r
     "comments": "",\r
     "outputs": 1,\r
-    "x": 400.566650390625,\r
-    "y": 1159.933349609375,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 624.8999633789062,\r
+    "y": 1219.9333572387695,\r
+    "z": "88b99be5.091bf8",\r
     "wires": [\r
       [\r
-        "c72dabdd.dd1b58"\r
+        "4162fe05.2b911"\r
       ]\r
     ]\r
   },\r
   {\r
-    "id": "eca312ef.b3f488",\r
+    "id": "ad8e54c3.d3fe18",\r
     "type": "set",\r
     "name": "unset ethernet-srv-end-points-list",\r
     "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' />",\r
     "comments": "",\r
-    "x": 536.566650390625,\r
-    "y": 1336.9666748046875,\r
-    "z": "b60623c5.e2d9e8",\r
+    "x": 760.8999633789062,\r
+    "y": 1396.966682434082,\r
+    "z": "88b99be5.091bf8",\r
     "wires": []\r
+  },\r
+  {\r
+    "id": "63370d02.a0670c",\r
+    "type": "execute",\r
+    "name": "execute RestApiCallNode Create Performance Monitoring Data",\r
+    "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",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 1386.3333740234375,\r
+    "y": 2738.33349609375,\r
+    "z": "88b99be5.091bf8",\r
+    "wires": [\r
+      []\r
+    ]\r
+  },\r
+  {\r
+    "id": "1ca90fe2.261db8",\r
+    "type": "execute",\r
+    "name": "execute RestconfDiscoveryNode establishSubscription",\r
+    "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",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 1354.3333740234375,\r
+    "y": 2810.3333740234375,\r
+    "z": "88b99be5.091bf8",\r
+    "wires": [\r
+      []\r
+    ]\r
+  },\r
+  {\r
+    "id": "2ecfa879.64974",\r
+    "type": "execute",\r
+    "name": "execute RestconfDiscoveryNode establishPersistentConnection",\r
+    "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",\r
+    "comments": "",\r
+    "outputs": 1,\r
+    "x": 1384.3333740234375,\r
+    "y": 2872.3333740234375,\r
+    "z": "88b99be5.091bf8",\r
+    "wires": [\r
+      []\r
+    ]\r
   }\r
 ]
\ 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 d58ad7b..035df45 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "d35e2da9.70a7e",\r
+        "id": "b052f7e.a3d5288",\r
         "type": "save",\r
         "name": "get all-vpn-bindings from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 372,\r
-        "y": 306,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 356.75,\r
+        "y": 462,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "88d19ab1.10b18",\r
-                "8fd12759.af6e18",\r
-                "50405d21.7eae84"\r
+                "e207ef26.f8a29",\r
+                "15b30bbc.e66fc4",\r
+                "c73b1c6f.dfba4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88d19ab1.10b18",\r
+        "id": "e207ef26.f8a29",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 560,\r
-        "y": 319,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 544.75,\r
+        "y": 475,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d472199a.beff9"\r
+                "53374de6.fbbc9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8fd12759.af6e18",\r
+        "id": "15b30bbc.e66fc4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 567.4909362792969,\r
-        "y": 361.57403564453125,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 552.2409362792969,\r
+        "y": 517.5740356445312,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "50405d21.7eae84",\r
+        "id": "c73b1c6f.dfba4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 558,\r
-        "y": 408,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 542.75,\r
+        "y": 564,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "6b1a691d.f6617"\r
+                "1d9a3789.c423c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d472199a.beff9",\r
+        "id": "53374de6.fbbc9c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 733,\r
-        "y": 317,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 717.75,\r
+        "y": 473,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "f306805a.38d6f8"\r
+                "74134804.4c5ab"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f306805a.38d6f8",\r
+        "id": "74134804.4c5ab",\r
         "type": "for",\r
         "name": "for vpnidx in all-vpn-bindings",\r
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 962,\r
-        "y": 318,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 946.75,\r
+        "y": 474,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "4a920666.d84d68"\r
+                "88398d04.70bb08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a920666.d84d68",\r
+        "id": "88398d04.70bb08",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1177,\r
-        "y": 319,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1161.75,\r
+        "y": 475,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "fc848cba.fc33d8"\r
+                "60755719.5aec98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "841ae1dd.49d178",\r
+        "id": "23c1dec0.4bd442",\r
         "type": "switchNode",\r
         "name": "switch vpnuuid is for this slice",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1431,\r
-        "y": 241,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1415.75,\r
+        "y": 397,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "98ef6cc.4725e9",\r
-                "ab42fe03.c49e3"\r
+                "14654146.223b47",\r
+                "d151f4bf.d5f298"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "98ef6cc.4725e9",\r
+        "id": "14654146.223b47",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1648,\r
-        "y": 220,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1632.75,\r
+        "y": 376,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "fc848cba.fc33d8"\r
+                "60755719.5aec98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ab42fe03.c49e3",\r
+        "id": "d151f4bf.d5f298",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1648,\r
-        "y": 269,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1632.75,\r
+        "y": 425,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fc848cba.fc33d8",\r
+        "id": "60755719.5aec98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1832,\r
-        "y": 306,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1816.75,\r
+        "y": 462,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "53692e4a.48cde",\r
-                "957d0d12.f7d338",\r
-                "1f9b767f.d670b2"\r
+                "e58078ca.32c2b8",\r
+                "db55a5db.cc9e2",\r
+                "d1721022.90ae5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "524dbe59.8ef8f",\r
+        "id": "ebc2ede2.3e82f8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 191,\r
-        "y": 47,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 175.75,\r
+        "y": 203,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "320667fa.12a2c"\r
+                "19d2750a.7ada53"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "320667fa.12a2c",\r
+        "id": "19d2750a.7ada53",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -201,3556 +201,3649 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 475.2856903076172,\r
-        "y": 108.23810863494873,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 460.0356903076172,\r
+        "y": 264.23810863494873,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "aa006c98.f12b58"\r
+                "32b35910.0922e6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa006c98.f12b58",\r
+        "id": "32b35910.0922e6",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-F1-Activate",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 481.42860412597656,\r
-        "y": 193.00003051757812,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 466.17860412597656,\r
+        "y": 349.0000305175781,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "72fe4a66.39584c"\r
+                "9f4c6f10.a708b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72fe4a66.39584c",\r
+        "id": "9f4c6f10.a708b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 791.238037109375,\r
-        "y": 184.66668701171875,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 775.988037109375,\r
+        "y": 340.66668701171875,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d35e2da9.70a7e",\r
-                "cce8745e.b515b8",\r
-                "706cb78c.da92b",\r
-                "88772a4.9b58658",\r
-                "4ace150.4554dec"\r
+                "b052f7e.a3d5288",\r
+                "14b40144.c74357",\r
+                "8371652a.c1422",\r
+                "ab74b4be.cbc48",\r
+                "77984a30.f32474"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53692e4a.48cde",\r
+        "id": "e58078ca.32c2b8",\r
         "type": "set",\r
         "name": "set tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
         "comments": "",\r
-        "x": 2049,\r
-        "y": 244,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2033.75,\r
+        "y": 400,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "123fcc82.b79ae3",\r
+        "id": "bd448e7d.80d888",\r
         "type": "set",\r
         "name": "set attachment_param for OTN A",\r
         "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",\r
         "comments": "",\r
-        "x": 4218,\r
-        "y": 130,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4202.75,\r
+        "y": 286,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e308a3a2.af826",\r
+        "id": "13f5ead.1dca895",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4299,\r
-        "y": 445,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4283.75,\r
+        "y": 601,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "fedd6b9.d7f3318",\r
-                "39581c20.edb614"\r
+                "322b352.ceea84a",\r
+                "b686bcae.ff7c7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fedd6b9.d7f3318",\r
+        "id": "322b352.ceea84a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4608.5,\r
-        "y": 414,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4593.25,\r
+        "y": 570,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "c49081cf.377c78"\r
+                "1e1970be.0764a7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39581c20.edb614",\r
+        "id": "b686bcae.ff7c7",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4613.5,\r
-        "y": 479,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4598.25,\r
+        "y": 635,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "9c0572a4.3a997"\r
+                "bd24692b.5a8508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c49081cf.377c78",\r
+        "id": "1e1970be.0764a7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4784.5,\r
-        "y": 414,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4769.25,\r
+        "y": 570,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9c0572a4.3a997",\r
+        "id": "bd24692b.5a8508",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4780,\r
-        "y": 479,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4764.75,\r
+        "y": 635,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2d297001.689a7",\r
+        "id": "bdfec131.c9a298",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "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",\r
         "comments": "",\r
-        "x": 4163.5,\r
-        "y": 699,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4148.25,\r
+        "y": 855,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "54d9bbcc.0d0bac",\r
+        "id": "68cdfef7.64c51",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4317.5,\r
-        "y": 747,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4302.25,\r
+        "y": 903,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "2ade786d.c09b28",\r
-                "f17ad5b3.0ef818"\r
+                "534fa647.cdf3",\r
+                "626cbb12.a73134"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ade786d.c09b28",\r
+        "id": "534fa647.cdf3",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4663,\r
-        "y": 728,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4647.75,\r
+        "y": 884,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "72718fb4.e15e78"\r
+                "2db65967.f1a87e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f17ad5b3.0ef818",\r
+        "id": "626cbb12.a73134",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4667,\r
-        "y": 768,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4651.75,\r
+        "y": 924,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "98b1fdb0.a42648"\r
+                "54fc5ed8.18991"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72718fb4.e15e78",\r
+        "id": "2db65967.f1a87e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4821,\r
-        "y": 728,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4805.75,\r
+        "y": 884,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "98b1fdb0.a42648",\r
+        "id": "54fc5ed8.18991",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4824.5,\r
-        "y": 768,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4809.25,\r
+        "y": 924,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "fe12ce9.6a53ab",\r
-                "4eba4c2.fda54b4"\r
+                "5bbebd3d.56e454",\r
+                "7821e9b0.59a868"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe12ce9.6a53ab",\r
+        "id": "5bbebd3d.56e454",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5155,\r
-        "y": 733,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5139.75,\r
+        "y": 889,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9e233ee4.5c90e",\r
+        "id": "72ed7974.8997",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 5019,\r
-        "y": 692,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5003.75,\r
+        "y": 848,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4eba4c2.fda54b4",\r
+        "id": "7821e9b0.59a868",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5082,\r
-        "y": 779,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5066.75,\r
+        "y": 935,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fbd17573.b91cd8",\r
+        "id": "47a40348.350864",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 4156,\r
-        "y": 178,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4140.75,\r
+        "y": 334,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "985dbb20.1c3b78",\r
+        "id": "e86c4698.44de68",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4182,\r
-        "y": 295,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4166.75,\r
+        "y": 451,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "544c4f89.eba52",\r
-                "eb873b5e.d10b8",\r
-                "d8377d86.76164"\r
+                "3bef2a94.7a3c56",\r
+                "8e5e548f.b7d088",\r
+                "9e92c765.4c36e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "544c4f89.eba52",\r
+        "id": "3bef2a94.7a3c56",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4377.5001220703125,\r
-        "y": 247,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4362.2501220703125,\r
+        "y": 403,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "cd232c91.ed7d5"\r
+                "8ae11b21.8072d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb873b5e.d10b8",\r
+        "id": "8e5e548f.b7d088",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4369.5001220703125,\r
-        "y": 302,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4354.2501220703125,\r
+        "y": 458,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "7e7e18a4.ea2a98"\r
+                "85930301.e40178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd232c91.ed7d5",\r
+        "id": "8ae11b21.8072d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4521.8824462890625,\r
-        "y": 246.65567016601562,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4506.6324462890625,\r
+        "y": 402.6556701660156,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d5d46c3b.524dc8"\r
+                "2b001bb5.f3beac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4c85ec99.26bac4",\r
+        "id": "44cbb5eb.fe11fc",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5104,\r
-        "y": 249,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5088.75,\r
+        "y": 405,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "490c8cc0.c71134"\r
+                "8828c3a6.4773b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5d46c3b.524dc8",\r
+        "id": "2b001bb5.f3beac",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4706,\r
-        "y": 245,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4690.75,\r
+        "y": 401,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "cc43f2ea.19847"\r
+                "e234651a.d8201"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc43f2ea.19847",\r
+        "id": "e234651a.d8201",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4901,\r
-        "y": 245,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4885.75,\r
+        "y": 401,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "4c85ec99.26bac4"\r
+                "44cbb5eb.fe11fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8377d86.76164",\r
+        "id": "9e92c765.4c36e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4374.5001220703125,\r
-        "y": 359,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4359.2501220703125,\r
+        "y": 515,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "9cf617d3.aee3a8"\r
+                "2e1c6b8c.8fd4dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9cf617d3.aee3a8",\r
+        "id": "2e1c6b8c.8fd4dc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4526.5001220703125,\r
-        "y": 360,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4511.2501220703125,\r
+        "y": 516,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7e7e18a4.ea2a98",\r
+        "id": "85930301.e40178",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4537.5001220703125,\r
-        "y": 303,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4522.2501220703125,\r
+        "y": 459,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f42e9c90.ae58f",\r
+        "id": "90e4153e.8023d8",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5489,\r
-        "y": 262,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5473.75,\r
+        "y": 418,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "f404a9ca.fbce2",\r
-                "3fd1ebaf.c62a54",\r
-                "66a3972e.71bfa8"\r
+                "bac51d99.85cdd8",\r
+                "432bf875.253be8",\r
+                "32be30ae.8624b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "490c8cc0.c71134",\r
+        "id": "8828c3a6.4773b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5283,\r
-        "y": 249,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5267.75,\r
+        "y": 405,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "9ce5b4b0.4bb188",\r
-                "f42e9c90.ae58f"\r
+                "580b4f3c.2239f",\r
+                "90e4153e.8023d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ce5b4b0.4bb188",\r
+        "id": "580b4f3c.2239f",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainA id",\r
         "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",\r
         "comments": "",\r
-        "x": 5519,\r
-        "y": 210,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5503.75,\r
+        "y": 366,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f404a9ca.fbce2",\r
+        "id": "bac51d99.85cdd8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5699,\r
-        "y": 253,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5683.75,\r
+        "y": 409,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "3597c274.50637e"\r
+                "7a8928ea.c03e88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3fd1ebaf.c62a54",\r
+        "id": "432bf875.253be8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5691,\r
-        "y": 308,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5675.75,\r
+        "y": 464,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "ff90e84e.43d4b8"\r
+                "609d607b.1ff68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66a3972e.71bfa8",\r
+        "id": "32be30ae.8624b",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5696,\r
-        "y": 365,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5680.75,\r
+        "y": 521,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "ff823793.36814"\r
+                "e7f093f9.7ecc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff823793.36814",\r
+        "id": "e7f093f9.7ecc4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5848,\r
-        "y": 366,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5832.75,\r
+        "y": 522,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ff90e84e.43d4b8",\r
+        "id": "609d607b.1ff68",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5859,\r
-        "y": 311,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5843.75,\r
+        "y": 467,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3597c274.50637e",\r
+        "id": "7a8928ea.c03e88",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5843.38232421875,\r
-        "y": 250.65567016601562,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5828.13232421875,\r
+        "y": 406.6556701660156,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d39e28b5.1aec5"\r
+                "d93996e8.177a9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d39e28b5.1aec5",\r
+        "id": "d93996e8.177a9",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "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",\r
         "comments": "",\r
-        "x": 6058,\r
-        "y": 247,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 6042.75,\r
+        "y": 403,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "139f2f1e.8fa159",\r
+        "id": "a51ca3ec.fcbd9",\r
         "type": "set",\r
         "name": "set attachment_param for OTN B",\r
         "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",\r
         "comments": "",\r
-        "x": 3625,\r
-        "y": 1587,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3609.75,\r
+        "y": 1743,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "18d2c2bc.05fd85",\r
+        "id": "75a3839f.237ba4",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3688,\r
-        "y": 1916,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3672.75,\r
+        "y": 2072,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "8895fa29.bf8e3",\r
-                "23c7c635.fd4722"\r
+                "dce36923.840728",\r
+                "157f1852.8f7de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8895fa29.bf8e3",\r
+        "id": "dce36923.840728",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3983.5,\r
-        "y": 1883,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3968.25,\r
+        "y": 2039,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "500b5538.e88684"\r
+                "c9eb5c3d.58ade8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23c7c635.fd4722",\r
+        "id": "157f1852.8f7de8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3988.5,\r
-        "y": 1948,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3973.25,\r
+        "y": 2104,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "909dfd67.2300d8"\r
+                "ee455d7a.4369c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "500b5538.e88684",\r
+        "id": "c9eb5c3d.58ade8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4151.5,\r
-        "y": 1883,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4136.25,\r
+        "y": 2039,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "909dfd67.2300d8",\r
+        "id": "ee455d7a.4369c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4162,\r
-        "y": 1948,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4146.75,\r
+        "y": 2104,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a49aeabe.b5ff8",\r
+        "id": "93204f2.1b4a73",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 3564,\r
-        "y": 1644,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3548.75,\r
+        "y": 1800,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "642d00da.b53c68",\r
+        "id": "4ba3f303.c0a41c",\r
         "type": "get-resource",\r
         "name": "get-resource dst pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3584,\r
-        "y": 1741,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3568.75,\r
+        "y": 1897,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "1e5d6803.78b7d8",\r
-                "84307ec5.09a8d",\r
-                "b468d4fc.bc9c8"\r
+                "cb100a9c.e2d048",\r
+                "ffd6b507.6159d",\r
+                "7158557b.4eb374"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e5d6803.78b7d8",\r
+        "id": "cb100a9c.e2d048",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3786.5001220703125,\r
-        "y": 1694,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3771.2501220703125,\r
+        "y": 1850,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "683b34d0.c1df64"\r
+                "e6720bf0.83c908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84307ec5.09a8d",\r
+        "id": "ffd6b507.6159d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3778.5001220703125,\r
-        "y": 1749,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3763.2501220703125,\r
+        "y": 1905,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "72cad52e.cb1d74"\r
+                "80e1f285.9bd438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "683b34d0.c1df64",\r
+        "id": "e6720bf0.83c908",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3930.8824462890625,\r
-        "y": 1691.6556701660156,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3915.6324462890625,\r
+        "y": 1847.6556701660156,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "8511cae6.cbf588"\r
+                "62828788.5424"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8511cae6.cbf588",\r
+        "id": "62828788.5424",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4115,\r
-        "y": 1706,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4099.75,\r
+        "y": 1862,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "82496ff9.234ee"\r
+                "151698eb.d8b1bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b468d4fc.bc9c8",\r
+        "id": "7158557b.4eb374",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3783.5001220703125,\r
-        "y": 1806,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3768.2501220703125,\r
+        "y": 1962,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "a6137ce1.b3b5c"\r
+                "4f499dcc.5ccf54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6137ce1.b3b5c",\r
+        "id": "4f499dcc.5ccf54",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3935.5001220703125,\r
-        "y": 1807,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3920.2501220703125,\r
+        "y": 1963,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "72cad52e.cb1d74",\r
+        "id": "80e1f285.9bd438",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 3946.5001220703125,\r
-        "y": 1752,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3931.2501220703125,\r
+        "y": 1908,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7b4a137a.364fcc",\r
+        "id": "48500cb6.0a5974",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4513,\r
-        "y": 1710,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4497.75,\r
+        "y": 1866,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "37fe69a9.07064e"\r
+                "9253635.59581a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82496ff9.234ee",\r
+        "id": "151698eb.d8b1bf",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4310,\r
-        "y": 1706,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4294.75,\r
+        "y": 1862,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "7b4a137a.364fcc"\r
+                "48500cb6.0a5974"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4bdd9e57.a5e13",\r
+        "id": "a71424bd.8e0678",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4898,\r
-        "y": 1709,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4882.75,\r
+        "y": 1865,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "8afff046.26af98",\r
-                "5118b1e.53f805",\r
-                "5a800db8.063d6c"\r
+                "a7626fee.35776",\r
+                "f55d0ed2.02e038",\r
+                "47407f5a.98f7f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37fe69a9.07064e",\r
+        "id": "9253635.59581a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4690,\r
-        "y": 1702,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4674.75,\r
+        "y": 1858,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d299743b.8f6b68",\r
-                "4bdd9e57.a5e13"\r
+                "3d578b8.a79bc74",\r
+                "a71424bd.8e0678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d299743b.8f6b68",\r
+        "id": "3d578b8.a79bc74",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainB id",\r
         "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",\r
         "comments": "",\r
-        "x": 4928,\r
-        "y": 1657,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4912.75,\r
+        "y": 1813,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2523ddf0.8e1c8a",\r
+        "id": "d6ea76ec.6a17f8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5257,\r
-        "y": 1813,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5241.75,\r
+        "y": 1969,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6f850c0f.e212ac",\r
+        "id": "2c34e3d1.56f314",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5268,\r
-        "y": 1758,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5252.75,\r
+        "y": 1914,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "546ca846.269108",\r
+        "id": "fae51f86.36cbd8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5252.38232421875,\r
-        "y": 1697.6556701660156,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5237.13232421875,\r
+        "y": 1853.6556701660156,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "fac7ab27.77dda8"\r
+                "e7fe4b79.28daf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fac7ab27.77dda8",\r
+        "id": "e7fe4b79.28daf8",\r
         "type": "set",\r
         "name": "set controller domainB data",\r
         "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",\r
         "comments": "",\r
-        "x": 5467,\r
-        "y": 1694,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5451.75,\r
+        "y": 1850,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8afff046.26af98",\r
+        "id": "a7626fee.35776",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5108,\r
-        "y": 1700,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5092.75,\r
+        "y": 1856,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "546ca846.269108"\r
+                "fae51f86.36cbd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5118b1e.53f805",\r
+        "id": "f55d0ed2.02e038",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5100,\r
-        "y": 1755,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5084.75,\r
+        "y": 1911,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "6f850c0f.e212ac"\r
+                "2c34e3d1.56f314"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5a800db8.063d6c",\r
+        "id": "47407f5a.98f7f8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5105,\r
-        "y": 1812,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5089.75,\r
+        "y": 1968,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "2523ddf0.8e1c8a"\r
+                "d6ea76ec.6a17f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1edca3.1a62bb8",\r
+        "id": "3dd6564a.788bea",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has dst-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3139,\r
-        "y": 658,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3123.75,\r
+        "y": 814,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d4bdeded.3ef248",\r
-                "eead64c.0115918"\r
+                "4498685c.f8a9c8",\r
+                "ce59ca85.515708"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4bdeded.3ef248",\r
+        "id": "4498685c.f8a9c8",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3353,\r
-        "y": 695,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3337.75,\r
+        "y": 851,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "614a0644.b0e3e"\r
+                "b9aa4ba2.44d89"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eead64c.0115918",\r
+        "id": "ce59ca85.515708",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3355,\r
-        "y": 633,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3339.75,\r
+        "y": 789,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "295e16ce.878c6a"\r
+                "50bc7adf.71a1d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "614a0644.b0e3e",\r
+        "id": "b9aa4ba2.44d89",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2933,\r
-        "y": 1938,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2917.75,\r
+        "y": 2094,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "75bfd38b.356f64",\r
-                "f4c4b096.a3ce2"\r
+                "28dcb01c.f45e6",\r
+                "415698c1.9dad18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75bfd38b.356f64",\r
+        "id": "28dcb01c.f45e6",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3186,\r
-        "y": 1972,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3170.75,\r
+        "y": 2128,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "b0597a28.514d3"\r
+                "8cf945af.2f52c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4c4b096.a3ce2",\r
+        "id": "415698c1.9dad18",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3186,\r
-        "y": 1916,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3170.75,\r
+        "y": 2072,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "64045150.224658"\r
+                "c8aba811.103238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0597a28.514d3",\r
+        "id": "8cf945af.2f52c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3337,\r
-        "y": 1972,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3321.75,\r
+        "y": 2128,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cf5b963d.2b5a08",\r
+        "id": "eb2e2de2.a53528",\r
         "type": "set",\r
         "name": "set vpn-bindingA and connectivityA",\r
         "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",\r
         "comments": "",\r
-        "x": 4213,\r
-        "y": 70,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4197.75,\r
+        "y": 226,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4badfb31.b82c1c",\r
+        "id": "15f47b8b.7e00dc",\r
         "type": "set",\r
         "name": "set vpn-bindingB and connectivityB",\r
         "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",\r
         "comments": "",\r
-        "x": 3621,\r
-        "y": 1529,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3605.75,\r
+        "y": 1685,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "552020c2.f01db",\r
+        "id": "9c2c3c17.6c4b68",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3904,\r
-        "y": 327,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3888.75,\r
+        "y": 483,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "cf5b963d.2b5a08",\r
-                "123fcc82.b79ae3",\r
-                "fbd17573.b91cd8",\r
-                "985dbb20.1c3b78",\r
-                "e308a3a2.af826",\r
-                "ec3b4a19.7f5ee",\r
-                "881b2d7a.c4e888",\r
-                "1a392cd7.238923"\r
+                "eb2e2de2.a53528",\r
+                "bd448e7d.80d888",\r
+                "47a40348.350864",\r
+                "e86c4698.44de68",\r
+                "13f5ead.1dca895",\r
+                "94ce35b5.84e9d",\r
+                "9dbb6108.db3f08",\r
+                "7f10b67d.13cbf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64045150.224658",\r
+        "id": "c8aba811.103238",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3337,\r
-        "y": 1915,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3321.75,\r
+        "y": 2071,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "4badfb31.b82c1c",\r
-                "139f2f1e.8fa159",\r
-                "a49aeabe.b5ff8",\r
-                "642d00da.b53c68",\r
-                "18d2c2bc.05fd85",\r
-                "724930a5.f44628",\r
-                "98331ea2.d141f",\r
-                "f84de17e.e8ea08"\r
+                "15f47b8b.7e00dc",\r
+                "a51ca3ec.fcbd9",\r
+                "93204f2.1b4a73",\r
+                "4ba3f303.c0a41c",\r
+                "75a3839f.237ba4",\r
+                "b13189f3.5c00c",\r
+                "72e7ea14.321c0c",\r
+                "a1c10f72.410b08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed40d4d6.135678",\r
+        "id": "30be8f1c.c2c68",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "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",\r
         "comments": "",\r
-        "x": 3575,\r
-        "y": 2214,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3559.75,\r
+        "y": 2370,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b71c97.3dad8368",\r
+        "id": "60d95124.1573e8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3729,\r
-        "y": 2262,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3713.75,\r
+        "y": 2418,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "aa1d9a65.d56ee",\r
-                "ce785491.f82258"\r
+                "626c41a5.4a556",\r
+                "319f7c4c.700584"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa1d9a65.d56ee",\r
+        "id": "626c41a5.4a556",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4074.5,\r
-        "y": 2243,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4059.25,\r
+        "y": 2399,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d8df230a.b47018"\r
+                "a16c0d6b.aa021"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce785491.f82258",\r
+        "id": "319f7c4c.700584",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4078.5,\r
-        "y": 2283,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4063.25,\r
+        "y": 2439,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d2d57048.de12f"\r
+                "c46066f7.6ad638"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8df230a.b47018",\r
+        "id": "a16c0d6b.aa021",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4232.5,\r
-        "y": 2243,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4217.25,\r
+        "y": 2399,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2d57048.de12f",\r
+        "id": "c46066f7.6ad638",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4236,\r
-        "y": 2283,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4220.75,\r
+        "y": 2439,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "703675c3.1d187c",\r
-                "6a8e2764.0748e8"\r
+                "dbf72bce.fe4fd",\r
+                "da41ce10.71c4a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "703675c3.1d187c",\r
+        "id": "dbf72bce.fe4fd",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4576,\r
-        "y": 2282,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4560.75,\r
+        "y": 2438,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b9adfc7b.f1d908",\r
+        "id": "a0a6a7a2.80538",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 4434,\r
-        "y": 2240,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4418.75,\r
+        "y": 2396,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a8e2764.0748e8",\r
+        "id": "da41ce10.71c4a8",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4505,\r
-        "y": 2331,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4489.75,\r
+        "y": 2487,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "641093d5.a73774",\r
+        "id": "509b9ad8.503f2c",\r
         "type": "set",\r
         "name": "set attachment_param (gfp-n) for OTN",\r
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
         "comments": "",\r
-        "x": 3130,\r
-        "y": 598,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3114.75,\r
+        "y": 754,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29b91b19.d2edf4",\r
+        "id": "8edfc4cd.8a0528",\r
         "type": "comment",\r
         "name": "only dst ttp exists. No src",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3725,\r
-        "y": 284,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3709.75,\r
+        "y": 440,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df88a98e.3b797",\r
+        "id": "f79b26c9.540128",\r
         "type": "comment",\r
         "name": "only src ttp exists. No dst",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3282,\r
-        "y": 1862,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3266.75,\r
+        "y": 2018,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "295e16ce.878c6a",\r
+        "id": "50bc7adf.71a1d4",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3461,\r
-        "y": 446,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3445.75,\r
+        "y": 602,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "fdfbdf68.ace01",\r
-                "8f7ef737.3d4208"\r
+                "ebf4cc93.93ec7",\r
+                "8e7f6f60.66ae28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f7ef737.3d4208",\r
+        "id": "8e7f6f60.66ae28",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3703,\r
-        "y": 1035,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3687.75,\r
+        "y": 1191,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d545d977.39f008"\r
+                "d55e670.1fa9f18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fdfbdf68.ace01",\r
+        "id": "ebf4cc93.93ec7",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3697,\r
-        "y": 326,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3681.75,\r
+        "y": 482,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "552020c2.f01db"\r
+                "9c2c3c17.6c4b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d545d977.39f008",\r
+        "id": "d55e670.1fa9f18",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3861,\r
-        "y": 1034,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3845.75,\r
+        "y": 1190,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "127c7c35.f5600c",\r
-                "aa22b9fb.8c00d",\r
-                "7a8bb8ff.a3807",\r
-                "b6e4b7cd.3aab58",\r
-                "9befe6d.bfbfb18",\r
-                "61ff745d.2cf8b4"\r
+                "f4e2a19a.1a35e",\r
+                "f86044a9.f193d",\r
+                "4b4e2775.d6044",\r
+                "86690982.b14b6",\r
+                "21d875df.4e5d92",\r
+                "971d8a82.30a53"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa22b9fb.8c00d",\r
+        "id": "f86044a9.f193d",\r
         "type": "set",\r
         "name": "set attachment_param for OTN G",\r
         "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",\r
         "comments": "",\r
-        "x": 4125,\r
-        "y": 917,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4109.75,\r
+        "y": 1073,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9befe6d.bfbfb18",\r
+        "id": "21d875df.4e5d92",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4206,\r
-        "y": 1232,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4190.75,\r
+        "y": 1388,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "602f32f4.cac7b4",\r
-                "1d093526.32224b"\r
+                "cd1830a.9a25b5",\r
+                "5f7c3883.6456e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "602f32f4.cac7b4",\r
+        "id": "cd1830a.9a25b5",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4515.5,\r
-        "y": 1201,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4500.25,\r
+        "y": 1357,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "4513cd6b.369634"\r
+                "cf35e2b3.2c8468"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d093526.32224b",\r
+        "id": "5f7c3883.6456e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4520.5,\r
-        "y": 1266,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4505.25,\r
+        "y": 1422,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "7640c8ac.188fc8"\r
+                "b3a80e08.d037b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4513cd6b.369634",\r
+        "id": "cf35e2b3.2c8468",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4691.5,\r
-        "y": 1201,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4676.25,\r
+        "y": 1357,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7640c8ac.188fc8",\r
+        "id": "b3a80e08.d037b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4687,\r
-        "y": 1266,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4671.75,\r
+        "y": 1422,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7a8bb8ff.a3807",\r
+        "id": "4b4e2775.d6044",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 4063,\r
-        "y": 965,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4047.75,\r
+        "y": 1121,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b6e4b7cd.3aab58",\r
+        "id": "86690982.b14b6",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4089,\r
-        "y": 1082,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4073.75,\r
+        "y": 1238,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "bc604696.f19bf",\r
-                "6b2ab2eb.e94cac",\r
-                "158e3d74.81687b"\r
+                "85fe6961.6a7908",\r
+                "3fb6fcbe.a3fa0c",\r
+                "89e44c19.cf1b38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc604696.f19bf",\r
+        "id": "85fe6961.6a7908",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4284.5001220703125,\r
-        "y": 1034,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4269.2501220703125,\r
+        "y": 1190,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "fbbae41a.6bb8"\r
+                "8a104557.0ad8d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b2ab2eb.e94cac",\r
+        "id": "3fb6fcbe.a3fa0c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4276.5001220703125,\r
-        "y": 1089,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4261.2501220703125,\r
+        "y": 1245,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "5e10560f.7f2a6"\r
+                "42db739a.3307d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fbbae41a.6bb8",\r
+        "id": "8a104557.0ad8d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4428.8824462890625,\r
-        "y": 1033.6556701660156,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4413.6324462890625,\r
+        "y": 1189.6556701660156,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "4ab90ec7.0f8a1"\r
+                "f760615b.c41c38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ab90ec7.0f8a1",\r
+        "id": "f760615b.c41c38",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4613,\r
-        "y": 1032,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4597.75,\r
+        "y": 1188,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "3bb025b6.92298a"\r
+                "142416ba.388749"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bb025b6.92298a",\r
+        "id": "142416ba.388749",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4808,\r
-        "y": 1032,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4792.75,\r
+        "y": 1188,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "ce204654.d589e8"\r
+                "ee80fb82.914478"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "158e3d74.81687b",\r
+        "id": "89e44c19.cf1b38",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4281.5001220703125,\r
-        "y": 1146,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4266.2501220703125,\r
+        "y": 1302,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "cfe04507.17faa"\r
+                "190fd174.e420e7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cfe04507.17faa",\r
+        "id": "190fd174.e420e7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4433.5001220703125,\r
-        "y": 1147,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4418.2501220703125,\r
+        "y": 1303,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5e10560f.7f2a6",\r
+        "id": "42db739a.3307d4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 4444.5001220703125,\r
-        "y": 1090,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4429.2501220703125,\r
+        "y": 1246,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "127c7c35.f5600c",\r
+        "id": "f4e2a19a.1a35e",\r
         "type": "set",\r
         "name": "set vpn-bindingG and connectivityG",\r
         "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",\r
         "comments": "",\r
-        "x": 4120,\r
-        "y": 857,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4104.75,\r
+        "y": 1013,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ce204654.d589e8",\r
+        "id": "ee80fb82.914478",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5011,\r
-        "y": 1036,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4995.75,\r
+        "y": 1192,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "fea8f5c8.b664d8"\r
+                "16f58788.f805f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17936311.45c0f5",\r
+        "id": "4337aa6a.e7854c",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5396,\r
-        "y": 1049,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5380.75,\r
+        "y": 1205,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "bda3b861.07af08",\r
-                "8ce8739f.28fc08",\r
-                "8098fa71.4cbf3"\r
+                "d59e46ba.4f5ed8",\r
+                "51e7728a.8676fc",\r
+                "dbdd6c65.aefc38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fea8f5c8.b664d8",\r
+        "id": "16f58788.f805f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5190,\r
-        "y": 1036,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5174.75,\r
+        "y": 1192,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "619520a0.18d9e",\r
-                "17936311.45c0f5"\r
+                "925f4411.b3c5c",\r
+                "4337aa6a.e7854c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "619520a0.18d9e",\r
+        "id": "925f4411.b3c5c",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainG id",\r
         "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",\r
         "comments": "",\r
-        "x": 5426,\r
-        "y": 997,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5410.75,\r
+        "y": 1153,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bda3b861.07af08",\r
+        "id": "d59e46ba.4f5ed8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5606,\r
-        "y": 1040,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5590.75,\r
+        "y": 1196,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "3c9ad3f5.e5e4a4"\r
+                "9fb3d6ee.612538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ce8739f.28fc08",\r
+        "id": "51e7728a.8676fc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5598,\r
-        "y": 1095,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5582.75,\r
+        "y": 1251,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "ec86cd9f.a15968"\r
+                "1c483cb2.44cb23"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8098fa71.4cbf3",\r
+        "id": "dbdd6c65.aefc38",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5603,\r
-        "y": 1152,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5587.75,\r
+        "y": 1308,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "244270ad.8dfe1"\r
+                "c131e872.bad5c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "244270ad.8dfe1",\r
+        "id": "c131e872.bad5c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5755,\r
-        "y": 1153,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5739.75,\r
+        "y": 1309,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ec86cd9f.a15968",\r
+        "id": "1c483cb2.44cb23",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 5766,\r
-        "y": 1098,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5750.75,\r
+        "y": 1254,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3c9ad3f5.e5e4a4",\r
+        "id": "9fb3d6ee.612538",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5750.38232421875,\r
-        "y": 1037.6556701660156,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5735.13232421875,\r
+        "y": 1193.6556701660156,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "2068f2a1.5ec866"\r
+                "e9716a08.a0ba08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2068f2a1.5ec866",\r
+        "id": "e9716a08.a0ba08",\r
         "type": "set",\r
         "name": "set controller domainG data",\r
         "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",\r
         "comments": "",\r
-        "x": 5965,\r
-        "y": 1034,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 5949.75,\r
+        "y": 1190,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e69cbe2a.82be58",\r
+        "id": "c1f0320d.223f",\r
         "type": "comment",\r
         "name": "both src and dst exist",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3739,\r
-        "y": 975,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3723.75,\r
+        "y": 1131,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "957d0d12.f7d338",\r
+        "id": "db55a5db.cc9e2",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2301,\r
-        "y": 702,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2285.75,\r
+        "y": 858,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "7969493f.6a54d",\r
-                "9a6050c4.300548"\r
+                "8cfca669.4c31d",\r
+                "1cedd7fb.e18cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a6050c4.300548",\r
+        "id": "1cedd7fb.e18cd",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2708,\r
-        "y": 720,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2692.75,\r
+        "y": 876,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "66cd0943.de62f"\r
+                "91bf0188.93b52"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7969493f.6a54d",\r
+        "id": "8cfca669.4c31d",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2708,\r
-        "y": 665,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2692.75,\r
+        "y": 821,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "7c5fc999.6b62c"\r
+                "6ae8a7fa.83375"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c5fc999.6b62c",\r
+        "id": "6ae8a7fa.83375",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2864,\r
-        "y": 663,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2848.75,\r
+        "y": 819,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "641093d5.a73774",\r
-                "a1edca3.1a62bb8"\r
+                "509b9ad8.503f2c",\r
+                "3dd6564a.788bea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66cd0943.de62f",\r
+        "id": "91bf0188.93b52",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2841,\r
-        "y": 721,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2825.75,\r
+        "y": 877,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cce8745e.b515b8",\r
+        "id": "14b40144.c74357",\r
         "type": "set",\r
         "name": "unset tmp.aai.all-vpn-bindings",\r
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 1018,\r
-        "y": 137,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1002.75,\r
+        "y": 293,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "48ad099a.c16688",\r
+        "id": "470acf69.6a7218",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "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}",\r
         "comments": "",\r
-        "x": 4135,\r
-        "y": 555,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4119.75,\r
+        "y": 711,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ec3b4a19.7f5ee",\r
+        "id": "94ce35b5.84e9d",\r
         "type": "set",\r
         "name": "set leaf-otn-tunnels-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 4195,\r
-        "y": 594,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4179.75,\r
+        "y": 750,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "706cb78c.da92b",\r
+        "id": "8371652a.c1422",\r
         "type": "set",\r
         "name": "unset leaf-otn-tunnels-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 1011,\r
-        "y": 45,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 995.75,\r
+        "y": 201,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9a38eb9e.71f4d8",\r
+        "id": "180e951c.adb823",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "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}",\r
         "comments": "",\r
-        "x": 3547,\r
-        "y": 2071,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3531.75,\r
+        "y": 2227,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "724930a5.f44628",\r
+        "id": "b13189f3.5c00c",\r
         "type": "set",\r
         "name": "set root-otn-tunnels-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 3603,\r
-        "y": 2120,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3587.75,\r
+        "y": 2276,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a414bdc.2311dc",\r
+        "id": "68b96268.5bf0d4",\r
         "type": "set",\r
         "name": "unset root-otn-tunnels-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 1011,\r
-        "y": 84,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 995.75,\r
+        "y": 240,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "88772a4.9b58658",\r
+        "id": "ab74b4be.cbc48",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "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' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1042,\r
-        "y": 185,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1026.75,\r
+        "y": 341,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4ace150.4554dec",\r
+        "id": "77984a30.f32474",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "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-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 252,\r
-        "y": 660,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 236.75,\r
+        "y": 816,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "ce4ab0d3.b836a",\r
-                "9dbee6c6.1a60a",\r
-                "290803ec.65c94c"\r
+                "6b466955.39f7e8",\r
+                "ea72fa7a.37647",\r
+                "256cca7a.4ba78e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce4ab0d3.b836a",\r
+        "id": "6b466955.39f7e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 471,\r
-        "y": 598,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 455.75,\r
+        "y": 754,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "280015e3.c315e2"\r
+                "ff154227.b5783"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9dbee6c6.1a60a",\r
+        "id": "ea72fa7a.37647",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 480.490966796875,\r
-        "y": 640.5740356445312,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 465.240966796875,\r
+        "y": 796.5740356445312,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "290803ec.65c94c",\r
+        "id": "256cca7a.4ba78e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 469,\r
-        "y": 687,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 453.75,\r
+        "y": 843,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "f842cdf9.29a79"\r
+                "9c1b438c.70f6e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "280015e3.c315e2",\r
+        "id": "ff154227.b5783",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 668,\r
-        "y": 594,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 652.75,\r
+        "y": 750,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "cd508bdd.302a88"\r
+                "d19cd8ca.093408"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f842cdf9.29a79",\r
+        "id": "9c1b438c.70f6e8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 638,\r
-        "y": 688,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 622.75,\r
+        "y": 844,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd508bdd.302a88",\r
+        "id": "d19cd8ca.093408",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 891.33349609375,\r
-        "y": 593.9999389648438,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 876.08349609375,\r
+        "y": 749.9999389648438,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d4df8e14.56fc08"\r
+                "ec3530b4.60943"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4df8e14.56fc08",\r
+        "id": "ec3530b4.60943",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1092.0001335144043,\r
-        "y": 595.000020980835,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1076.7501335144043,\r
+        "y": 751.000020980835,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "b67eb6e5.58b31"\r
+                "732a5938.51aee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b67eb6e5.58b31",\r
+        "id": "732a5938.51aee8",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 222,\r
-        "y": 857,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 206.75,\r
+        "y": 1013,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "eb910f68.8a5408",\r
-                "a6536ba8.c4e148",\r
-                "6d1288a7.3722b8"\r
+                "23a8b591.9364c2",\r
+                "8c7cc41e.285ad",\r
+                "a093cec4.b44ed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb910f68.8a5408",\r
+        "id": "23a8b591.9364c2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 430,\r
-        "y": 821,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 414.75,\r
+        "y": 977,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "6687da8.fb06ca4"\r
+                "9b9627ac.373dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6536ba8.c4e148",\r
+        "id": "8c7cc41e.285ad",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 430.490966796875,\r
-        "y": 866.5740356445312,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 415.240966796875,\r
+        "y": 1022.5740356445312,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6d1288a7.3722b8",\r
+        "id": "a093cec4.b44ed",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 428,\r
-        "y": 910,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 412.75,\r
+        "y": 1066,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "a3e6b31.4b2495"\r
+                "26fe918.5a2edee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3e6b31.4b2495",\r
+        "id": "26fe918.5a2edee",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 597,\r
-        "y": 911,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 581.75,\r
+        "y": 1067,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "64de189c.ea0ca",\r
+        "id": "f6f3f7dd.ddd42",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 569,\r
-        "y": 1405,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 553.75,\r
+        "y": 1561,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "f09d5f3a.90b09"\r
+                "8744e477.6cb05"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f09d5f3a.90b09",\r
+        "id": "8744e477.6cb05",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 772,\r
-        "y": 1417,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 756.75,\r
+        "y": 1573,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "be069a3d.2f258"\r
+                "9fc39c57.082728"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be069a3d.2f258",\r
+        "id": "9fc39c57.082728",\r
         "type": "outcome",\r
         "name": "UNI",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 938,\r
-        "y": 1414,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 922.75,\r
+        "y": 1570,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "b33327bf.cf44b8"\r
+                "5d341323.92886c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b33327bf.cf44b8",\r
+        "id": "5d341323.92886c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1099,\r
-        "y": 1411,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1083.75,\r
+        "y": 1567,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "9b6250ff.75cf18",\r
-                "6e8e9c3e.00f634",\r
-                "db16830a.f6a5",\r
-                "611e4d54.277574",\r
-                "c0f4e533.035be8",\r
-                "ee82569c.a25768"\r
+                "878fc20b.33088",\r
+                "9a421f91.9b1b28",\r
+                "7916417b.dd4858",\r
+                "277d0a08.b51776",\r
+                "5d833ac3.a3e554",\r
+                "6bd95e1e.6c91d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e8e9c3e.00f634",\r
+        "id": "9a421f91.9b1b28",\r
         "type": "set",\r
         "name": "unset tmp.aai.uni",\r
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",\r
         "comments": "",\r
-        "x": 1305,\r
-        "y": 1010.9999389648438,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1289.75,\r
+        "y": 1166.9999389648438,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b6250ff.75cf18",\r
+        "id": "878fc20b.33088",\r
         "type": "save",\r
         "name": "get uni from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1302,\r
-        "y": 1055.9999389648438,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1286.75,\r
+        "y": 1211.9999389648438,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "1b290eb5.e974c9",\r
-                "b84573d.a8be19",\r
-                "ef2334eb.3c1b68"\r
+                "1277502d.c8e7a",\r
+                "3575cdbd.1f32e2",\r
+                "bad103b9.14ac5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b84573d.a8be19",\r
+        "id": "3575cdbd.1f32e2",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1497.490966796875,\r
-        "y": 1029.5739135742188,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1482.240966796875,\r
+        "y": 1185.5739135742188,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "45bb14a8.1a7924"\r
+                "245198ca.86efd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef2334eb.3c1b68",\r
+        "id": "bad103b9.14ac5",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1493,\r
-        "y": 1073.9998779296875,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1477.75,\r
+        "y": 1229.9998779296875,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "cd1f6950.fef1f"\r
+                "564cd01d.c60fe8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45bb14a8.1a7924",\r
+        "id": "245198ca.86efd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 1660.0625,\r
-        "y": 1028.859619140625,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1644.8125,\r
+        "y": 1184.859619140625,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd1f6950.fef1f",\r
+        "id": "564cd01d.c60fe8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1661,\r
-        "y": 1073.9998779296875,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1645.75,\r
+        "y": 1229.9998779296875,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd4af41f.be1a78",\r
+        "id": "57d2d0ba.ac96f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1663,\r
-        "y": 1120.9998779296875,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1647.75,\r
+        "y": 1276.9998779296875,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1b290eb5.e974c9",\r
+        "id": "1277502d.c8e7a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1494,\r
-        "y": 1120.9998779296875,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1478.75,\r
+        "y": 1276.9998779296875,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "cd4af41f.be1a78"\r
+                "57d2d0ba.ac96f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60f7024f.a382fc",\r
+        "id": "5f14d939.b7d6d",\r
         "type": "comment",\r
         "name": "CLL new",\r
         "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}",\r
         "comments": "",\r
-        "x": 1276,\r
-        "y": 1642,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1260.75,\r
+        "y": 1798,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "db16830a.f6a5",\r
+        "id": "7916417b.dd4858",\r
         "type": "set",\r
         "name": "set ethernet-srv-end-points-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 1367,\r
-        "y": 1696,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1351.75,\r
+        "y": 1852,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1989ebd9.8b76bc",\r
+        "id": "780a0f58.bba71",\r
         "type": "set",\r
         "name": "unset ethernet-srv-end-points-list",\r
         "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' />",\r
         "comments": "",\r
-        "x": 2043.5,\r
-        "y": 1109,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2028.25,\r
+        "y": 1265,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9da50ff.0241af",\r
+        "id": "423abc5f.68ffa4",\r
         "type": "set",\r
         "name": "unset ethernet-srv-end-points-list",\r
         "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' />",\r
         "comments": "",\r
-        "x": 2048.5,\r
-        "y": 1211,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2033.25,\r
+        "y": 1367,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eda2f0f7.d8fb38",\r
+        "id": "9ae45b75.53fe1",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 532,\r
-        "y": 1661,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 516.75,\r
+        "y": 1817,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "62852429.1f30ac"\r
+                "a1c491a.b9e1cf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62852429.1f30ac",\r
+        "id": "a1c491a.b9e1cf",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 764,\r
-        "y": 1660,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 748.75,\r
+        "y": 1816,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "ede4a749.9f1af8"\r
+                "c7d001fc.995ef"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ede4a749.9f1af8",\r
+        "id": "c7d001fc.995ef",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 976,\r
-        "y": 1661,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 960.75,\r
+        "y": 1817,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "b699a292.eb6f88"\r
+                "af8caf57.c80ff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b699a292.eb6f88",\r
+        "id": "af8caf57.c80ff",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 232,\r
-        "y": 1817,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 216.75,\r
+        "y": 1973,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "13d7e483.3188fb",\r
-                "74bc3a8f.9628d4"\r
+                "dbb11610.758b08",\r
+                "e6442fee.44c628"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "74bc3a8f.9628d4",\r
+        "id": "e6442fee.44c628",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 467,\r
-        "y": 1804,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 451.75,\r
+        "y": 1960,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "13d7e483.3188fb",\r
+        "id": "dbb11610.758b08",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 457,\r
-        "y": 1865,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 441.75,\r
+        "y": 2021,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "bcef8cd9.e20998",\r
-                "764e27eb.b5496",\r
-                "21958602.3fa0ea"\r
+                "afa88564.16a37",\r
+                "83950a7.2f6c078",\r
+                "12b1aba5.e7a0f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "764e27eb.b5496",\r
+        "id": "83950a7.2f6c078",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 670.490966796875,\r
-        "y": 1849.5740356445312,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 655.240966796875,\r
+        "y": 2005.5740356445312,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "9c812de2.87639"\r
+                "ea85ca6d.e8d7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21958602.3fa0ea",\r
+        "id": "12b1aba5.e7a0f4",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 666,\r
-        "y": 1894,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 650.75,\r
+        "y": 2050,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "2915d3a6.63730c"\r
+                "eb678b0e.5293e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bcef8cd9.e20998",\r
+        "id": "afa88564.16a37",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 668,\r
-        "y": 1954,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 652.75,\r
+        "y": 2110,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "bb26f0d0.bc6288"\r
+                "46f07676.1e063"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c812de2.87639",\r
+        "id": "ea85ca6d.e8d7e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 833.0625,\r
-        "y": 1848.8597412109375,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 817.8125,\r
+        "y": 2004.8597412109375,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2915d3a6.63730c",\r
+        "id": "eb678b0e.5293e8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 834,\r
-        "y": 1894,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 818.75,\r
+        "y": 2050,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bb26f0d0.bc6288",\r
+        "id": "46f07676.1e063",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 837,\r
-        "y": 1953,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 821.75,\r
+        "y": 2109,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "e8fb0469.22a408",\r
-                "b503b0ba.b1ff6"\r
+                "d6f04402.414508",\r
+                "ac4ce335.0555f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "445d8bb1.6c470c",\r
+        "id": "42a4fda9.57619c",\r
         "type": "set",\r
         "name": "set sotn_value",\r
-        "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",\r
+        "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",\r
         "comments": "",\r
-        "x": 236,\r
-        "y": 2452,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 241.75,\r
+        "y": 2611,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "925823e9.1c4a4",\r
+        "id": "3738a9bc.2f26e6",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 379,\r
-        "y": 2512,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 363.75,\r
+        "y": 2668,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "345842a4.88ef2e",\r
-                "a4dc32a8.6620d8"\r
+                "ac81680a.65fae",\r
+                "96fc6628.148e78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "345842a4.88ef2e",\r
+        "id": "ac81680a.65fae",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 691.5,\r
-        "y": 2489,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 676.25,\r
+        "y": 2645,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a4dc32a8.6620d8",\r
+        "id": "96fc6628.148e78",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 695.5,\r
-        "y": 2529,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 680.25,\r
+        "y": 2685,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "d1fda3bb.92b0e"\r
+                "bf7ee9c0.419518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cde1b667.7c4d6",\r
+        "id": "6f03e95e.3ec198",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 871.5,\r
-        "y": 2493,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 856.25,\r
+        "y": 2649,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d1fda3bb.92b0e",\r
+        "id": "bf7ee9c0.419518",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 887,\r
-        "y": 2547,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 871.75,\r
+        "y": 2703,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "a9ee92c3.93f6e8"\r
+                "846842ab.33ca8",\r
+                "5e1c0ed5.c69c48",\r
+                "9a742833.7a10a8",\r
+                "feb8a80.2e93d58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "459839ba.ae33c",\r
+        "id": "214d3a40.5474be",\r
         "type": "save",\r
         "name": "update vpn-binding resource (aka. OTN ) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1182.5,\r
-        "y": 2516,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1167.25,\r
+        "y": 2672,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "120147ed.79206",\r
+        "id": "4243a8af.47f99",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 2649.5,\r
-        "y": 1867,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2634.25,\r
+        "y": 2023,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a9ee92c3.93f6e8",\r
+        "id": "846842ab.33ca8",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1144.5,\r
-        "y": 2558,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1129.25,\r
+        "y": 2714,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9d25e547.75567",\r
+        "id": "eb2c1071.d160d8",\r
         "type": "set",\r
         "name": "set leafOrRootAccess",\r
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",\r
         "comments": "",\r
-        "x": 2009.5,\r
-        "y": 1147,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1994.25,\r
+        "y": 1303,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "52a255e0.e77dec",\r
+        "id": "3c1d8397.66cfbc",\r
         "type": "set",\r
         "name": "set leafOrRootAccess",\r
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",\r
         "comments": "",\r
-        "x": 2010.5,\r
-        "y": 1251,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1995.25,\r
+        "y": 1407,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "881b2d7a.c4e888",\r
+        "id": "9dbb6108.db3f08",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4304,\r
-        "y": 508,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4288.75,\r
+        "y": 664,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "61ff745d.2cf8b4",\r
+        "id": "971d8a82.30a53",\r
         "type": "save",\r
         "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4207,\r
-        "y": 1327,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4191.75,\r
+        "y": 1483,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "98331ea2.d141f",\r
+        "id": "72e7ea14.321c0c",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3701,\r
-        "y": 1999,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3685.75,\r
+        "y": 2155,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6687da8.fb06ca4",\r
+        "id": "9b9627ac.373dc8",\r
         "type": "switchNode",\r
         "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",\r
         "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 802,\r
-        "y": 807,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 786.75,\r
+        "y": 963,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "11a4a5f5.385f32",\r
-                "192499d2.667f1e"\r
+                "20416bfa.abd944",\r
+                "3157f22c.bca4c6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11a4a5f5.385f32",\r
+        "id": "20416bfa.abd944",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1165,\r
-        "y": 830,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1149.75,\r
+        "y": 986,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "1fc9c5be.8fac2a"\r
+                "16371b2a.82f3f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "192499d2.667f1e",\r
+        "id": "3157f22c.bca4c6",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1165,\r
-        "y": 779,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1149.75,\r
+        "y": 935,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "5fe8520c.50e664"\r
+                "7c942827.229d68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1fc9c5be.8fac2a",\r
+        "id": "16371b2a.82f3f5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1321,\r
-        "y": 828,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1305.75,\r
+        "y": 984,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "a46faf22.6dbda8"\r
+                "6516a515.9e0ed4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5fe8520c.50e664",\r
+        "id": "7c942827.229d68",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1298,\r
-        "y": 780,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1282.75,\r
+        "y": 936,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1f9b767f.d670b2",\r
+        "id": "d1721022.90ae5",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",\r
         "comments": "",\r
-        "x": 2058,\r
-        "y": 178,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2042.75,\r
+        "y": 334,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f84de17e.e8ea08",\r
+        "id": "a1c10f72.410b08",\r
         "type": "set",\r
         "name": "set root-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 3600,\r
-        "y": 2159,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 3584.75,\r
+        "y": 2315,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1a392cd7.238923",\r
+        "id": "7f10b67d.13cbf",\r
         "type": "set",\r
         "name": "set leaf-otn-tunnels-list array",\r
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 4190,\r
-        "y": 632,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 4174.75,\r
+        "y": 788,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "611e4d54.277574",\r
+        "id": "277d0a08.b51776",\r
         "type": "set",\r
         "name": "set ethernet-srv-end-points-list array",\r
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1364,\r
-        "y": 1738,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1348.75,\r
+        "y": 1894,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dc7d7df9.afb81",\r
+        "id": "dbed9630.5fe208",\r
         "type": "set",\r
         "name": "set filename",\r
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",\r
         "comments": "",\r
-        "x": 543,\r
-        "y": 1472,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 527.75,\r
+        "y": 1628,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c70f6326.e297a",\r
+        "id": "b8630526.556578",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 574,\r
-        "y": 1512,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 558.75,\r
+        "y": 1668,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e8fb0469.22a408",\r
+        "id": "d6f04402.414508",\r
         "type": "set",\r
         "name": "set otn-tunnels-name-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 1122,\r
-        "y": 1920,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1106.75,\r
+        "y": 2076,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b503b0ba.b1ff6",\r
+        "id": "ac4ce335.0555f",\r
         "type": "set",\r
         "name": "set otn-tunnels-name-list array",\r
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",\r
         "comments": "",\r
-        "x": 1125,\r
-        "y": 1962,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1109.75,\r
+        "y": 2118,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f7d70d92.8a17d",\r
+        "id": "d6151d45.cfb988",\r
         "type": "set",\r
         "name": "unset otn-tunnels-name-list array",\r
         "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",\r
         "comments": "",\r
-        "x": 568,\r
-        "y": 1602,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 552.75,\r
+        "y": 1758,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "93ecab9f.5bb27",\r
+        "id": "f1b784f.6be4af8",\r
         "type": "set",\r
         "name": "set filename",\r
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",\r
         "comments": "",\r
-        "x": 323,\r
-        "y": 1981,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 307.75,\r
+        "y": 2137,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e1bf516d.80132",\r
+        "id": "b54d5a69.762db",\r
         "type": "execute",\r
         "name": "execute printContext",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 331,\r
-        "y": 2038,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 315.75,\r
+        "y": 2194,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c0f4e533.035be8",\r
+        "id": "5d833ac3.a3e554",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1342,\r
-        "y": 1587,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1326.75,\r
+        "y": 1743,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "ff9a5641.69fda",\r
-                "a44c9ce4.5d2008"\r
+                "5ddf355f.54101c",\r
+                "1bdf6619.a36342"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a44c9ce4.5d2008",\r
+        "id": "1bdf6619.a36342",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1565,\r
-        "y": 1542,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1549.75,\r
+        "y": 1698,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "eaca171f.944a48"\r
+                "754506fa.d51aa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff9a5641.69fda",\r
+        "id": "5ddf355f.54101c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1567,\r
-        "y": 1606,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1551.75,\r
+        "y": 1762,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "93d69fa.52d496"\r
+                "68209615.eef37"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eaca171f.944a48",\r
+        "id": "754506fa.d51aa8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1730,\r
-        "y": 1539,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1714.75,\r
+        "y": 1695,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "b0447236.92d3b"\r
+                "714f4595.b88ec4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93d69fa.52d496",\r
+        "id": "68209615.eef37",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
-        "x": 1729,\r
-        "y": 1602,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1713.75,\r
+        "y": 1758,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b0447236.92d3b",\r
+        "id": "714f4595.b88ec4",\r
         "type": "set",\r
         "name": "set tmp.uni-node-id-short",\r
         "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",\r
         "comments": "",\r
-        "x": 1950,\r
-        "y": 1553,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1934.75,\r
+        "y": 1709,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ab15b7a9.bc6bc8",\r
+        "id": "1db1829e.06c1d5",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1495,\r
-        "y": 2278,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1479.75,\r
+        "y": 2434,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "be2440af.c20c98"\r
+                "2cbd7342.8e2ecc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1405448e.40f263",\r
+        "id": "fa138a5b.3e0008",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1880,\r
-        "y": 2291,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1864.75,\r
+        "y": 2447,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "facba133.b01618",\r
-                "36457cd.f85a104",\r
-                "a0c24437.cf174"\r
+                "e14f1acf.1bcd",\r
+                "c2e19be7.fca29",\r
+                "775dbfec.d9501"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be2440af.c20c98",\r
+        "id": "2cbd7342.8e2ecc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1674,\r
-        "y": 2278,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1658.75,\r
+        "y": 2434,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "eec40e11.9fdab",\r
-                "1405448e.40f263"\r
+                "6f327062.742838",\r
+                "fa138a5b.3e0008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eec40e11.9fdab",\r
+        "id": "6f327062.742838",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainConn id",\r
         "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",\r
         "comments": "",\r
-        "x": 1910,\r
-        "y": 2239,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1894.75,\r
+        "y": 2395,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "facba133.b01618",\r
+        "id": "e14f1acf.1bcd",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2090,\r
-        "y": 2282,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2074.75,\r
+        "y": 2438,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "926a046d.eed228"\r
+                "d0fc139e.1761"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36457cd.f85a104",\r
+        "id": "c2e19be7.fca29",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2082,\r
-        "y": 2337,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2066.75,\r
+        "y": 2493,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "6ca22053.c9fba8"\r
+                "43b937df.ececd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0c24437.cf174",\r
+        "id": "775dbfec.d9501",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2087,\r
-        "y": 2394,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2071.75,\r
+        "y": 2550,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "f91dd017.676d7"\r
+                "ac944679.99243"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f91dd017.676d7",\r
+        "id": "ac944679.99243",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2239,\r
-        "y": 2395,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2223.75,\r
+        "y": 2551,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6ca22053.c9fba8",\r
+        "id": "43b937df.ececd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 2250,\r
-        "y": 2340,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2234.75,\r
+        "y": 2496,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "926a046d.eed228",\r
+        "id": "d0fc139e.1761",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2234.38232421875,\r
-        "y": 2279.6556701660156,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2219.13232421875,\r
+        "y": 2435.6556701660156,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "1e25e04f.ee7df"\r
+                "79bc2aa4.303284"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e25e04f.ee7df",\r
+        "id": "79bc2aa4.303284",\r
         "type": "set",\r
         "name": "set controller domainConn data",\r
         "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",\r
         "comments": "",\r
-        "x": 2449,\r
-        "y": 2276,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2433.75,\r
+        "y": 2432,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46842cb8.91c5bc",\r
+        "id": "d91a9773.8b97d8",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 573,\r
-        "y": 2324,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 557.75,\r
+        "y": 2480,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "80e94eed.70f82",\r
-                "e1101309.b00428",\r
-                "6cefa506.12a2dc"\r
+                "fd5d97.57110a68",\r
+                "e3891e3f.2fa52",\r
+                "6282c457.966ab4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80e94eed.70f82",\r
+        "id": "fd5d97.57110a68",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 768.5001220703125,\r
-        "y": 2276,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 753.2501220703125,\r
+        "y": 2432,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "a961cabf.5d77d8"\r
+                "ee247bd7.5fac58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1101309.b00428",\r
+        "id": "e3891e3f.2fa52",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 760.5001220703125,\r
-        "y": 2331,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 745.2501220703125,\r
+        "y": 2487,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "cfce6a08.8d1818"\r
+                "91fa570e.651ca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a961cabf.5d77d8",\r
+        "id": "ee247bd7.5fac58",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 912.8824462890625,\r
-        "y": 2275.6556701660156,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 897.6324462890625,\r
+        "y": 2431.6556701660156,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "41f5578e.096c08"\r
+                "ea7d04e7.1afcb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "41f5578e.096c08",\r
+        "id": "ea7d04e7.1afcb8",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1097,\r
-        "y": 2274,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1081.75,\r
+        "y": 2430,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "78702bad.3695f4"\r
+                "40c13bcd.4d6ac4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78702bad.3695f4",\r
+        "id": "40c13bcd.4d6ac4",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1292,\r
-        "y": 2274,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1276.75,\r
+        "y": 2430,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "ab15b7a9.bc6bc8"\r
+                "1db1829e.06c1d5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cefa506.12a2dc",\r
+        "id": "6282c457.966ab4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 765.5001220703125,\r
-        "y": 2388,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 750.2501220703125,\r
+        "y": 2544,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "bbb236e9.1d475"\r
+                "4979dd8d.1f5f3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bbb236e9.1d475",\r
+        "id": "4979dd8d.1f5f3c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 917.5001220703125,\r
-        "y": 2389,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 902.2501220703125,\r
+        "y": 2545,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cfce6a08.8d1818",\r
+        "id": "91fa570e.651ca8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
-        "x": 928.5001220703125,\r
-        "y": 2332,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 913.2501220703125,\r
+        "y": 2488,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fd11a034.71ffe8",\r
+        "id": "bd1da98.2130f58",\r
         "type": "set",\r
         "name": "set tmp.pnf-name-forUrl",\r
         "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",\r
         "comments": "",\r
-        "x": 563,\r
-        "y": 2236,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 547.75,\r
+        "y": 2392,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2ab715a0.ab46a2",\r
+        "id": "aa3bbb2.a6f0e48",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 308,\r
-        "y": 2367,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 292.75,\r
+        "y": 2523,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "fd11a034.71ffe8",\r
-                "46842cb8.91c5bc"\r
+                "bd1da98.2130f58",\r
+                "d91a9773.8b97d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c68339b5.636678",\r
+        "id": "4b46d34a.40e874",\r
         "type": "comment",\r
         "name": "Temporary skipping this check - to support multiple instances in one slice",\r
         "info": "",\r
         "comments": "",\r
-        "x": 1522.9666748046875,\r
-        "y": 184.88333129882812,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1507.7166748046875,\r
+        "y": 340.8833312988281,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6b1a691d.f6617",\r
+        "id": "1d9a3789.c423c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 725,\r
-        "y": 407,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 709.75,\r
+        "y": 563,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a46faf22.6dbda8",\r
+        "id": "6516a515.9e0ed4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 284.5,\r
-        "y": 1376,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 269.25,\r
+        "y": 1532,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "64de189c.ea0ca",\r
-                "eda2f0f7.d8fb38",\r
-                "dc7d7df9.afb81",\r
-                "c70f6326.e297a",\r
-                "445d8bb1.6c470c",\r
-                "925823e9.1c4a4",\r
-                "f7d70d92.8a17d",\r
-                "93ecab9f.5bb27",\r
-                "e1bf516d.80132",\r
-                "2ab715a0.ab46a2"\r
+                "f6f3f7dd.ddd42",\r
+                "9ae45b75.53fe1",\r
+                "dbed9630.5fe208",\r
+                "b8630526.556578",\r
+                "42a4fda9.57619c",\r
+                "3738a9bc.2f26e6",\r
+                "d6151d45.cfb988",\r
+                "f1b784f.6be4af8",\r
+                "b54d5a69.762db",\r
+                "aa3bbb2.a6f0e48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee82569c.a25768",\r
+        "id": "6bd95e1e.6c91d8",\r
         "type": "switchNode",\r
         "name": "switch uni type",\r
         "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1315,\r
-        "y": 1214,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1299.75,\r
+        "y": 1370,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "ef11d348.e67b18",\r
-                "db4eac49.9ee78",\r
-                "ccd7386e.438c4",\r
-                "8a1e26c1.925918"\r
+                "92533584.a5f61",\r
+                "18980475.16f3b4",\r
+                "ec63f877.0fd998",\r
+                "c1c9dc9a.d31ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef11d348.e67b18",\r
+        "id": "92533584.a5f61",\r
         "type": "outcome",\r
         "name": "leaf",\r
         "xml": "<outcome value='leaf'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1480,\r
-        "y": 1196,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1464.75,\r
+        "y": 1352,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "1989ebd9.8b76bc",\r
-                "9d25e547.75567"\r
+                "b00f22e0.6a5e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db4eac49.9ee78",\r
+        "id": "18980475.16f3b4",\r
         "type": "outcome",\r
         "name": "root",\r
         "xml": "<outcome value='root'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1483,\r
-        "y": 1235,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1467.75,\r
+        "y": 1391,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "9da50ff.0241af",\r
-                "52a255e0.e77dec"\r
+                "52cb104.aabcaf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a1e26c1.925918",\r
+        "id": "c1c9dc9a.d31ec",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1477,\r
-        "y": 1313,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1461.75,\r
+        "y": 1469,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "af3eb285.34bda8"\r
+                "4eaa272a.ec5048"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ccd7386e.438c4",\r
+        "id": "ec63f877.0fd998",\r
         "type": "outcome",\r
         "name": "root-secondary",\r
         "xml": "<outcome value='root-secondary'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1500,\r
-        "y": 1276,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1484.75,\r
+        "y": 1432,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             [\r
-                "8dd3ee03.704618",\r
-                "3acf3b0f.3b0184"\r
+                "e77dda82.efac78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8dd3ee03.704618",\r
+        "id": "fb2c8aff.5902e",\r
         "type": "set",\r
         "name": "unset ethernet-srv-end-points-list",\r
         "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' />",\r
         "comments": "",\r
-        "x": 2046,\r
-        "y": 1309,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 2030.75,\r
+        "y": 1465,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3acf3b0f.3b0184",\r
+        "id": "c8ca91d0.91a568",\r
         "type": "set",\r
         "name": "set leafOrRootAccess",\r
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",\r
         "comments": "",\r
-        "x": 2008,\r
-        "y": 1349,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1992.75,\r
+        "y": 1505,\r
+        "z": "111f91bb.269a56",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af3eb285.34bda8",\r
+        "id": "4eaa272a.ec5048",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1629,\r
-        "y": 1334,\r
-        "z": "5a4cb919.dfff38",\r
+        "x": 1613.75,\r
+        "y": 1490,\r
+        "z": "111f91bb.269a56",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "5e1c0ed5.c69c48",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create Performance Monitoring Data",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1203.3333740234375,\r
+        "y": 2789.3336181640625,\r
+        "z": "111f91bb.269a56",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "b00f22e0.6a5e",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1599.6666259765625,\r
+        "y": 1348.333251953125,\r
+        "z": "111f91bb.269a56",\r
+        "wires": [\r
+            [\r
+                "eb2c1071.d160d8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "52cb104.aabcaf",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1601.6666259765625,\r
+        "y": 1386.333251953125,\r
+        "z": "111f91bb.269a56",\r
+        "wires": [\r
+            [\r
+                "3c1d8397.66cfbc"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "e77dda82.efac78",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>",\r
+        "atomic": "false",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1644.6666259765625,\r
+        "y": 1433.333251953125,\r
+        "z": "111f91bb.269a56",\r
+        "wires": [\r
+            [\r
+                "c8ca91d0.91a568"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "9a742833.7a10a8",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishSubscription",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1171.3333740234375,\r
+        "y": 2861.33349609375,\r
+        "z": "111f91bb.269a56",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "feb8a80.2e93d58",\r
+        "type": "execute",\r
+        "name": "execute RestconfDiscoveryNode establishPersistentConnection",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1201.3333740234375,\r
+        "y": 2923.33349609375,\r
+        "z": "111f91bb.269a56",\r
         "wires": [\r
             []\r
         ]\r

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 (file)
index 0000000..3fb30cd
--- /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 @@
+[\r
+    {\r
+        "id": "4bf68406.ddcfc4",\r
+        "type": "dgstart",\r
+        "name": "DGSTART",\r
+        "outputs": 1,\r
+        "x": 252.33331298828125,\r
+        "y": 102.33334350585938,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": [\r
+            [\r
+                "556d56b1.8aa24"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "556d56b1.8aa24",\r
+        "type": "service-logic",\r
+        "name": "GENERIC-RESOURCE-API ${project.version}",\r
+        "module": "GENERIC-RESOURCE-API",\r
+        "version": "${project.version}",\r
+        "comments": "",\r
+        "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}'>",\r
+        "outputs": 1,\r
+        "x": 536.6190032958984,\r
+        "y": 163.5714521408081,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": [\r
+            [\r
+                "5ee8264.6655ed8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "5ee8264.6655ed8",\r
+        "type": "method",\r
+        "name": "method cll-vnf-topology-operation-cll-callbackdg-notification",\r
+        "xml": "<method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 523.7619018554688,\r
+        "y": 239.3333740234375,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": [\r
+            [\r
+                "662af79a.da0ee8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "662af79a.da0ee8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
+        "outputs": 1,\r
+        "x": 852.5713500976562,\r
+        "y": 240.00003051757812,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": [\r
+            [\r
+                "49cf2266.9e9664",\r
+                "6d86a3cf.e795b4",\r
+                "747b5a7a.94fc0c",\r
+                "82c91d0d.6b833",\r
+                "d8e4f1a3.d839d",\r
+                "32379d64.d2f70a",\r
+                "2e37faa.5c2ae06",\r
+                "83f79f41.a9ad3"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "49cf2266.9e9664",\r
+        "type": "execute",\r
+        "name": "execute properties",\r
+        "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' />",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1103.3333129882812,\r
+        "y": 240.33334350585938,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "6d86a3cf.e795b4",\r
+        "type": "set",\r
+        "name": "set received notification parameters",\r
+        "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`' />",\r
+        "comments": "",\r
+        "x": 1131.3333740234375,\r
+        "y": 413.3333435058594,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "83f79f41.a9ad3",\r
+        "type": "record",\r
+        "name": "record",\r
+        "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`\"/>-->",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1067.3333740234375,\r
+        "y": 184.33334350585938,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "747b5a7a.94fc0c",\r
+        "type": "save",\r
+        "name": "save:metadata to AAI",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1088.3333740234375,\r
+        "y": 476.3333435058594,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "32379d64.d2f70a",\r
+        "type": "set",\r
+        "name": "set parameters",\r
+        "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",\r
+        "comments": "",\r
+        "x": 1067.3333740234375,\r
+        "y": 723.3333129882812,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "2e37faa.5c2ae06",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode call VES",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1125.3333740234375,\r
+        "y": 766.3333129882812,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "82c91d0d.6b833",\r
+        "type": "execute",\r
+        "name": "execute UUID generator for eventId",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventId-uuid\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1129.3333740234375,\r
+        "y": 631.3333129882812,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d8e4f1a3.d839d",\r
+        "type": "execute",\r
+        "name": "execute UUID generator for eventName",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventName-uuid\"/>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1142.3333740234375,\r
+        "y": 673.3333129882812,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "d1081f1a.6938",\r
+        "type": "comment",\r
+        "name": "Calling VES and passing notification parameters",\r
+        "info": "",\r
+        "comments": "",\r
+        "x": 1156.3333740234375,\r
+        "y": 576.3333129882812,\r
+        "z": "f5fa16f3.117ab8",\r
+        "wires": []\r
+    }\r
+]
\ 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 2a4ee23..1a4c840 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "a85fdd45.18532",\r
+        "id": "d6c73c0b.0d5f48",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 171.88333129882812,\r
-        "y": 177,\r
-        "z": "8bd89607.6248d8",\r
+        "x": 157.88330078125,\r
+        "y": 156.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2eaf78b5.ba0318"\r
+                "d49f5b5f.8b9338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2eaf78b5.ba0318",\r
+        "id": "d49f5b5f.8b9338",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -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}'>",\r
         "outputs": 1,\r
         "x": 456.1690216064453,\r
-        "y": 238.23810863494873,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 212.52387523651123,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "28e9741c.d81dfc"\r
+                "3720330.25593ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28e9741c.d81dfc",\r
+        "id": "3720330.25593ce",\r
         "type": "method",\r
         "name": "method cll-vnf-topology-operation-cll-delete",\r
         "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 462.3119354248047,\r
-        "y": 323.0000305175781,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 297.2857971191406,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "df14e360.a098e8"\r
+                "7f694928.267bb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df14e360.a098e8",\r
+        "id": "7f694928.267bb8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 811.8833312988281,\r
-        "y": 382,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 356.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e87fcff0.55123",\r
-                "b8bbed17.73d098",\r
-                "ed2f6b65.8be208"\r
+                "14360151.1c2e2f",\r
+                "2b05d42f.ff48b4",\r
+                "b833ca08.643e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e87fcff0.55123",\r
+        "id": "14360151.1c2e2f",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
         "x": 1113.2168273925781,\r
-        "y": 652.9302978515625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 627.216064453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b8bbed17.73d098",\r
+        "id": "2b05d42f.ff48b4",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "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\">-->",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1134.6452941894531,\r
-        "y": 355.33331298828125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 329.61907958984375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c5539326.dc2ce",\r
-                "9370873a.5ec85",\r
-                "3f911b4d.a21904"\r
+                "41fb5683.e713a",\r
+                "80e71c24.60d2d",\r
+                "fe4111b5.f2228"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5539326.dc2ce",\r
+        "id": "41fb5683.e713a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1359.6452941894531,\r
-        "y": 213.33331298828125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 187.61907958984375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a5dbcf8a.fe1748"\r
+                "41abc238.ea1884"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9370873a.5ec85",\r
+        "id": "80e71c24.60d2d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1355.1362609863281,\r
-        "y": 282.9073486328125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 257.193115234375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "49f0af9f.5fedb8"\r
+                "844c0ad5.c095b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f911b4d.a21904",\r
+        "id": "fe4111b5.f2228",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1343.6452941894531,\r
-        "y": 329.33331298828125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 303.61907958984375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "61830ec6.dfc06"\r
+                "1e9cd9f4.55835e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f78d475.109eab8",\r
+        "id": "692bc437.51a034",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
         "x": 1113.6452941894531,\r
-        "y": 243.33331298828125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 217.61907958984375,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ed2f6b65.8be208",\r
+        "id": "b833ca08.643e2",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "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' />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1101.6452941894531,\r
-        "y": 295.33331298828125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 269.61907958984375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a5dbcf8a.fe1748",\r
+        "id": "41abc238.ea1884",\r
         "type": "switchNode",\r
         "name": "switch allotted-resources_length != 0",\r
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1599.8833312988281,\r
-        "y": 210,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 184.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b303ce6.b126d3",\r
-                "55aeefb2.59b1e8"\r
+                "edbcfce1.4d552",\r
+                "d741e3bd.0b6788"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49f0af9f.5fedb8",\r
+        "id": "844c0ad5.c095b",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 1509.9457092285156,\r
-        "y": 285.8597717285156,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 260.1455383300781,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "61830ec6.dfc06",\r
+        "id": "1e9cd9f4.55835e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 1513.8833312988281,\r
-        "y": 330,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 304.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b303ce6.b126d3",\r
+        "id": "edbcfce1.4d552",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1804.8833312988281,\r
-        "y": 247,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 221.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f1542288.012e3"\r
+                "589ae77f.807888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55aeefb2.59b1e8",\r
+        "id": "d741e3bd.0b6788",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1814.8833312988281,\r
-        "y": 174,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 148.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f1542288.012e3",\r
+        "id": "589ae77f.807888",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -245,547 +245,547 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1797.8833312988281,\r
-        "y": 322,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 296.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "abe13a08.545e98",\r
-                "7178c36c.cf3274",\r
-                "ac38a7a3.b352e8",\r
-                "d727f01e.ad9c98",\r
-                "8cb68ccc.e851f8"\r
+                "10bd96f7.8fa059",\r
+                "cb92da4c.da1bb",\r
+                "cbe49015.ae0dd",\r
+                "6c495f2.f763aa",\r
+                "4304e2aa.cc073c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66649512.c7d5bc",\r
+        "id": "5f06cb70.adae8c",\r
         "type": "save",\r
         "name": "get allotted-resource from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2283.883331298828,\r
-        "y": 373,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 347.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b9d85c6f.27205",\r
-                "376ece8a.ca776a",\r
-                "b6dfab0d.b44bd8"\r
+                "c68fbf4e.5d82c",\r
+                "2146d17e.d0a56e",\r
+                "f04a7ec7.eb68d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9d85c6f.27205",\r
+        "id": "c68fbf4e.5d82c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2499.883331298828,\r
-        "y": 440,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 414.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c1b489c1.9564e8"\r
+                "cbd25b41.5a644"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "376ece8a.ca776a",\r
+        "id": "2146d17e.d0a56e",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2500.374298095703,\r
-        "y": 339.573974609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 313.8597412109375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "742662fc.5de6dc"\r
+                "d020f647.b48948"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6dfab0d.b44bd8",\r
+        "id": "f04a7ec7.eb68d",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2495.883331298828,\r
-        "y": 389,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 363.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b4af8420.603268"\r
+                "bf60182e.46d6e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abe13a08.545e98",\r
+        "id": "10bd96f7.8fa059",\r
         "type": "for",\r
         "name": "for each allotted-resource",\r
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2000.8833312988281,\r
-        "y": 354,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 328.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7d659bd1.1ff4ec",\r
-                "66649512.c7d5bc",\r
-                "cfd6a168.75b7d8",\r
-                "fe93cfa.921edb"\r
+                "9d7e7b42.ef2a18",\r
+                "5f06cb70.adae8c",\r
+                "b4f5dada.48378",\r
+                "5db562b1.71111c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d659bd1.1ff4ec",\r
+        "id": "9d7e7b42.ef2a18",\r
         "type": "set",\r
         "name": "set the current allotted-resource-id",\r
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",\r
         "comments": "",\r
         "x": 2280.883331298828,\r
-        "y": 292,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 266.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d727f01e.ad9c98",\r
+        "id": "6c495f2.f763aa",\r
         "type": "set",\r
         "name": "set tmp.arr",\r
         "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",\r
         "comments": "",\r
         "x": 1974.8833312988281,\r
-        "y": 304,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 278.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7178c36c.cf3274",\r
+        "id": "cb92da4c.da1bb",\r
         "type": "get-resource",\r
         "name": "get-resource pnfs-list",\r
         "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\" >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2017.8833312988281,\r
-        "y": 163,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 137.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "ac38a7a3.b352e8",\r
+        "id": "cbe49015.ae0dd",\r
         "type": "get-resource",\r
         "name": "get-resource logical-links",\r
         "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\" >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2029.8833312988281,\r
-        "y": 204,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 178.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "eed8a5a0.afccb8",\r
+        "id": "f6d3e50c.b329e8",\r
         "type": "comment",\r
         "name": "The following two nodes are for PCE",\r
         "info": "",\r
         "comments": "",\r
         "x": 2054.883331298828,\r
-        "y": 116,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 90.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "141349a5.fce93e",\r
+        "id": "300ce0be.29882",\r
         "type": "set",\r
         "name": "set tmp.arr",\r
         "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",\r
         "comments": "",\r
         "x": 1974.8833312988281,\r
-        "y": 250,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 224.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "742662fc.5de6dc",\r
+        "id": "d020f647.b48948",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 2678.883331298828,\r
-        "y": 342,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 316.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b4af8420.603268",\r
+        "id": "bf60182e.46d6e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 2678.820831298828,\r
-        "y": 391.1402587890625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 365.426025390625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1b489c1.9564e8",\r
+        "id": "cbd25b41.5a644",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2680.820831298828,\r
-        "y": 442.1402587890625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 416.426025390625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "fcfb8da2.5eaaf8"\r
+                "365e9f97.d4a028"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fcfb8da2.5eaaf8",\r
+        "id": "365e9f97.d4a028",\r
         "type": "save",\r
         "name": "get allotted-resource relationship from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2973.820831298828,\r
-        "y": 389.1402587890625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 363.426025390625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c3da29e4.d4aec",\r
-                "5d798b7c.bb38bc",\r
-                "f79e6540.82af6"\r
+                "6e92372c.3a07f8",\r
+                "c96fb012.9bb888",\r
+                "95b7cbb5.ac06c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d798b7c.bb38bc",\r
+        "id": "c96fb012.9bb888",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3277.311767578125,\r
-        "y": 45.7142333984375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 20,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "90e8e37d.ca8e98"\r
+                "58ab1443.358994"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90e8e37d.ca8e98",\r
+        "id": "58ab1443.358994",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3454.88330078125,\r
-        "y": 46,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 20.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f79e6540.82af6",\r
+        "id": "95b7cbb5.ac06c8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3272.82080078125,\r
-        "y": 95.1402587890625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 69.426025390625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9bf9393a.ada1c"\r
+                "1f97dde6.30f20a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9bf9393a.ada1c",\r
+        "id": "1f97dde6.30f20a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3454.82080078125,\r
-        "y": 95.1402587890625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 69.426025390625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c3da29e4.d4aec",\r
+        "id": "6e92372c.3a07f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3276.82080078125,\r
-        "y": 146.1402587890625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 120.426025390625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "614d711.ad6151"\r
+                "7a25dc67.63046c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "614d711.ad6151",\r
+        "id": "7a25dc67.63046c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3456.82080078125,\r
-        "y": 146.1402587890625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 120.426025390625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6f9dfac6.7f7acc"\r
+                "742cdaa9.4808c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f9dfac6.7f7acc",\r
+        "id": "742cdaa9.4808c4",\r
         "type": "switchNode",\r
         "name": "switch allotted-resource.relationship-list not empty",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2992.883331298828,\r
-        "y": 517,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 491.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cc5d43a6.52dac",\r
-                "df06d31e.f926b8"\r
+                "9afa3e4f.f2f2c8",\r
+                "ce58b166.b2448"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df06d31e.f926b8",\r
+        "id": "ce58b166.b2448",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3332.88330078125,\r
-        "y": 288,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 262.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "cc5d43a6.52dac",\r
+        "id": "9afa3e4f.f2f2c8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3331.88330078125,\r
-        "y": 342,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 316.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9005c08e.45bff"\r
+                "aba0f7b5.b64ec8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7cc4c3ab.96110c",\r
+        "id": "50f7604e.0c4dc8",\r
         "type": "outcome",\r
         "name": "network-policy",\r
         "xml": "<outcome value='network-policy'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4076.88330078125,\r
-        "y": 296,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 270.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e1ccec43.b4b718"\r
+                "e079a6c2.9c941"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1ccec43.b4b718",\r
+        "id": "e079a6c2.9c941",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4253.8831787109375,\r
-        "y": 288.9998779296875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 263.28564453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6a0eff2d.7a17d8",\r
-                "c12539fb.18b098"\r
+                "83280d27.4bae7",\r
+                "92c6fb1f.05a328"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9005c08e.45bff",\r
+        "id": "aba0f7b5.b64ec8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3495.88330078125,\r
-        "y": 268,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 242.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c7cdd797.5d9c98",\r
-                "a2ea3a5e.b8028"\r
+                "a8c08369.0aef78",\r
+                "98755b5f.40e4a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7cdd797.5d9c98",\r
+        "id": "a8c08369.0aef78",\r
         "type": "for",\r
         "name": "for each allotted-resource relationship",\r
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3776.88330078125,\r
-        "y": 224,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 198.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "fdc5f0cb.fc2a38"\r
+                "64ebbb1e.14821c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fdc5f0cb.fc2a38",\r
+        "id": "64ebbb1e.14821c",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4038.88330078125,\r
-        "y": 224,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 198.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7cc4c3ab.96110c"\r
+                "50f7604e.0c4dc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a0eff2d.7a17d8",\r
+        "id": "83280d27.4bae7",\r
         "type": "set",\r
         "name": "set the 1st network-policy-id",\r
         "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",\r
         "comments": "",\r
         "x": 4496.8831787109375,\r
-        "y": 245.9998779296875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 220.28564453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c12539fb.18b098",\r
+        "id": "92c6fb1f.05a328",\r
         "type": "save",\r
         "name": "get network-policy from aai",\r
         "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\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4485.8831787109375,\r
-        "y": 300.9998779296875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 275.28564453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "53e90890.b88808",\r
-                "99815c1a.2d5d9",\r
-                "ef9ec486.51c458"\r
+                "26a63936.d2dcb6",\r
+                "935c2a76.01522",\r
+                "61809f6c.f102a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef9ec486.51c458",\r
+        "id": "61809f6c.f102a",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4738.88330078125,\r
-        "y": 187,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 161.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "928a2f6e.9dcef"\r
+                "8483d549.4ff1d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "928a2f6e.9dcef",\r
+        "id": "8483d549.4ff1d8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4887.454833984375,\r
-        "y": 187.2857666015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 161.571533203125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f26f831.604e6",\r
+        "id": "79f73429.37a0f4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4886.392333984375,\r
-        "y": 231.426025390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 205.7117919921875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "99815c1a.2d5d9",\r
+        "id": "935c2a76.01522",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4727.392333984375,\r
-        "y": 231.426025390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 205.7117919921875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5f26f831.604e6"\r
+                "79f73429.37a0f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53e90890.b88808",\r
+        "id": "26a63936.d2dcb6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4734.392333984375,\r
-        "y": 310.426025390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 284.7117919921875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c7f5e24b.264e08"\r
+                "4efa868e.4aaf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7f5e24b.264e08",\r
+        "id": "4efa868e.4aaf8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -793,203 +793,203 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4873.392333984375,\r
-        "y": 310.426025390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 284.7117919921875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "bd533599.870598",\r
-                "5b846fca.358228"\r
+                "ac693539.f50e98",\r
+                "9a31854c.efaef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd533599.870598",\r
+        "id": "ac693539.f50e98",\r
         "type": "set",\r
         "name": "set the max bandwidth",\r
         "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",\r
         "comments": "",\r
         "x": 5078.88330078125,\r
-        "y": 308,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 282.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b846fca.358228",\r
+        "id": "9a31854c.efaef8",\r
         "type": "set",\r
         "name": "set the max bandwidth",\r
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",\r
         "comments": "",\r
         "x": 5077.88330078125,\r
-        "y": 354,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 328.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a2ea3a5e.b8028",\r
+        "id": "98755b5f.40e4a",\r
         "type": "for",\r
         "name": "for each allotted-resource relationship",\r
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3593.88330078125,\r
-        "y": 340,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 314.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "25258bcb.d218b4"\r
+                "a599949c.47c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "25258bcb.d218b4",\r
+        "id": "a599949c.47c2",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3873.88330078125,\r
-        "y": 340,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 314.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f26cca47.0cf8c8"\r
+                "9f30fb79.9864f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f26cca47.0cf8c8",\r
+        "id": "9f30fb79.9864f8",\r
         "type": "outcome",\r
         "name": "logical-link",\r
         "xml": "<outcome value='logical-link'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2256.8834533691406,\r
-        "y": 829.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 803.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d5f97832.254d88"\r
+                "4497a7be.db159"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d5f97832.254d88",\r
+        "id": "4497a7be.db159",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2433.883331298828,\r
-        "y": 822,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 796.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ae5af3.3e9a4d1",\r
-                "12544593.6754f2"\r
+                "748da704.3dc228",\r
+                "132fdd9a.6a584a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae5af3.3e9a4d1",\r
+        "id": "748da704.3dc228",\r
         "type": "set",\r
         "name": "set the current logical-link-name",\r
         "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",\r
         "comments": "",\r
         "x": 2676.883331298828,\r
-        "y": 779,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 753.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "12544593.6754f2",\r
+        "id": "132fdd9a.6a584a",\r
         "type": "save",\r
         "name": "get logical-link from aai",\r
         "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\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2665.883331298828,\r
-        "y": 834,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 808.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "79a8fecf.d1f59",\r
-                "b24729e3.47e65",\r
-                "4a9529bf.26c65"\r
+                "1d5c52ad.8a4fcd",\r
+                "c6fd8eb5.369a58",\r
+                "b0ba9e98.5ef29"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "79a8fecf.d1f59",\r
+        "id": "1d5c52ad.8a4fcd",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2957.374298095703,\r
-        "y": 812.573974609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 786.8597412109375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d25941f1.946b68"\r
+                "81786826.f1adc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b24729e3.47e65",\r
+        "id": "c6fd8eb5.369a58",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2945.883331298828,\r
-        "y": 857,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 831.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "11547725.a203f9"\r
+                "568abbfd.c78f14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d25941f1.946b68",\r
+        "id": "81786826.f1adc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3105.945831298828,\r
-        "y": 812.8597412109375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 787.1455078125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "11547725.a203f9",\r
+        "id": "568abbfd.c78f14",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3104.883331298828,\r
-        "y": 857,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 831.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4a9529bf.26c65",\r
+        "id": "b0ba9e98.5ef29",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2952.883331298828,\r
-        "y": 936,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 910.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a4fd9348.176d48"\r
+                "56d4032d.446f0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a4fd9348.176d48",\r
+        "id": "56d4032d.446f0c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -997,867 +997,867 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 3091.883331298828,\r
-        "y": 936,\r
-        "z": "8bd89607.6248d8",\r
-        "wires": [\r
-            [\r
-                "6c4953ff.9536c4",\r
-                "757555b7.a275b4",\r
-                "da8313.90b574f",\r
-                "a53e9db6.011d6",\r
-                "2b20579c.df8a7",\r
-                "1abe7496.3f7c9b",\r
-                "652968a1.d93e88",\r
-                "f369a6e9.5de548",\r
-                "fc221d76.582c9",\r
-                "5fd92a3e.ed6fec",\r
-                "4a864e6a.471e",\r
-                "e264db5d.2744d",\r
-                "afaae138.bb9798",\r
-                "121ba89c.f4d387",\r
-                "e7a924f9.c6032",\r
-                "e3b4a4d3.b60598",\r
-                "22dcd918.a9e88e",\r
-                "1743864d.d3d2f2",\r
-                "898efbe9.b7aab8",\r
-                "3ddfa25a.4bc3f6",\r
-                "f7bdbced.e4e6e",\r
-                "b2f7d29a.c36bc8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "3c4bd54a.0e1cfa",\r
+        "y": 910.2857666015625,\r
+        "z": "1806503a.76a7a",\r
+        "wires": [\r
+            [\r
+                "a588efb1.b17fd",\r
+                "9c7e31dc.43bc2",\r
+                "64cc49aa.338118",\r
+                "a266d487.c02dd",\r
+                "f1099f4d.7efe5",\r
+                "6aa3951e.157a4c",\r
+                "4618e1c0.461d88",\r
+                "d38e0865.514348",\r
+                "eef6ad07.9c7d5",\r
+                "78d4922e.8ebe04",\r
+                "c220ecdf.76a978",\r
+                "940f9aa.5464fe8",\r
+                "14f1d608.fff342",\r
+                "5e5dd175.2ee1b",\r
+                "95f11825.f517d8",\r
+                "79dba259.2612cc",\r
+                "11c024cf.1cb7db",\r
+                "8bfce836.dcd148",\r
+                "ec6aad53.7d628",\r
+                "c02bc34.16c814",\r
+                "ad2e0fde.b44de8",\r
+                "d87e7a94.9bda08"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6986f9e3.b25bc8",\r
         "type": "execute",\r
         "name": "execute UUID generator for ethernet-service-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3435.883270263672,\r
-        "y": 410,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 384.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6c4953ff.9536c4",\r
+        "id": "a588efb1.b17fd",\r
         "type": "execute",\r
         "name": "execute UUID generator for otn-tunnel-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3416.883270263672,\r
-        "y": 510,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 484.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e264db5d.2744d",\r
+        "id": "940f9aa.5464fe8",\r
         "type": "set",\r
         "name": "set new ethernet-service-name",\r
         "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",\r
         "comments": "",\r
         "x": 3370.883270263672,\r
-        "y": 561,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 535.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "757555b7.a275b4",\r
+        "id": "9c7e31dc.43bc2",\r
         "type": "set",\r
         "name": "set network-route-one",\r
         "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",\r
         "comments": "",\r
         "x": 3344.883270263672,\r
-        "y": 610,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 584.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "da8313.90b574f",\r
+        "id": "64cc49aa.338118",\r
         "type": "set",\r
         "name": "set network-route-two",\r
         "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",\r
         "comments": "",\r
         "x": 3343.883270263672,\r
-        "y": 659,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 633.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a53e9db6.011d6",\r
+        "id": "a266d487.c02dd",\r
         "type": "save",\r
         "name": "get network-route-one from aai",\r
         "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\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3352.883270263672,\r
-        "y": 797,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 771.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cca9aa9c.5b4b58",\r
-                "6d66b175.a27548",\r
-                "6cf4995a.fab31"\r
+                "1276721a.95abce",\r
+                "59c480c0.a5bb2",\r
+                "56433b78.3dde04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b20579c.df8a7",\r
+        "id": "f1099f4d.7efe5",\r
         "type": "save",\r
         "name": "get network-route-two from aai",\r
         "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\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3345.883270263672,\r
-        "y": 857.9998779296875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 832.28564453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a115586d.1910d8",\r
-                "61de0330.a424c4",\r
-                "89e5a0b3.03b87"\r
+                "194bfca3.59d3d3",\r
+                "f16b27ad.e4a0d",\r
+                "a3a5e961.07f0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cca9aa9c.5b4b58",\r
+        "id": "1276721a.95abce",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3601.883026123047,\r
-        "y": 692,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 666.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "294610ae.745698"\r
+                "5d3d475c.e8e038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d66b175.a27548",\r
+        "id": "59c480c0.a5bb2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3595.392059326172,\r
-        "y": 733.426025390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 707.7117919921875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "61b00039.d9b688"\r
+                "c3e2bb46.01e6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cf4995a.fab31",\r
+        "id": "56433b78.3dde04",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3590.392059326172,\r
-        "y": 783.426025390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 757.7117919921875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1fe35696.f7e9f9"\r
+                "1b66d741.6f4631"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "294610ae.745698",\r
+        "id": "5d3d475c.e8e038",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3750.454559326172,\r
-        "y": 691.2857666015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 665.571533203125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "61b00039.d9b688",\r
+        "id": "c3e2bb46.01e6a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3740.392059326172,\r
-        "y": 741.426025390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 715.7117919921875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a115586d.1910d8",\r
+        "id": "194bfca3.59d3d3",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3566.883270263672,\r
-        "y": 843.9998779296875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 818.28564453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "807fba07.07f6d"\r
+                "8a4c46dd.2c996"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61de0330.a424c4",\r
+        "id": "f16b27ad.e4a0d",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3562.392303466797,\r
-        "y": 893.4259033203125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 867.711669921875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9f751353.b361d"\r
+                "171f1743.fcb899"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89e5a0b3.03b87",\r
+        "id": "a3a5e961.07f0a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3563.392303466797,\r
-        "y": 946.4259033203125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 920.711669921875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "17e5ea49.0fe58e"\r
+                "c731b8e7.238d38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "807fba07.07f6d",\r
+        "id": "8a4c46dd.2c996",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3719.4546508789062,\r
-        "y": 849.28564453125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 823.5714111328125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9f751353.b361d",\r
+        "id": "171f1743.fcb899",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3705.392303466797,\r
-        "y": 893.4259033203125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 867.711669921875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1fe35696.f7e9f9",\r
+        "id": "1b66d741.6f4631",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3762.883026123047,\r
-        "y": 794,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 768.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6a90f954.4bce88"\r
+                "cecd018.605a88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17e5ea49.0fe58e",\r
+        "id": "c731b8e7.238d38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3716.883270263672,\r
-        "y": 945.9998779296875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 920.28564453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f51128b5.0b454"\r
+                "f9f52da3.b95878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a90f954.4bce88",\r
+        "id": "cecd018.605a88",\r
         "type": "switchNode",\r
         "name": "switch nr type",\r
         "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3923.883270263672,\r
-        "y": 681,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 655.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d28de3c8.def278",\r
-                "32596d77.fd201a",\r
-                "c2039341.ed7fe"\r
+                "f0539c95.2ea1d",\r
+                "44b1b904.08834",\r
+                "41d8ce05.5caae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f51128b5.0b454",\r
+        "id": "f9f52da3.b95878",\r
         "type": "switchNode",\r
         "name": "switch nr type",\r
         "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3915.883270263672,\r
-        "y": 866,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 840.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6179a2a6.c7a764",\r
-                "6a08da95.c46784",\r
-                "49cd1e6.2c21e6"\r
+                "abd0f375.c30ff",\r
+                "eba9832a.ffee4",\r
+                "4bc67983.47c6f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d28de3c8.def278",\r
+        "id": "f0539c95.2ea1d",\r
         "type": "outcome",\r
         "name": "ROOT",\r
         "xml": "<outcome value='ROOT'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4147.883758544922,\r
-        "y": 384.99993896484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 359.28570556640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "af392071.289a38"\r
+                "653aef18.035f68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32596d77.fd201a",\r
+        "id": "44b1b904.08834",\r
         "type": "outcome",\r
         "name": "LEAF",\r
         "xml": "<outcome value='LEAF'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4149.883758544922,\r
-        "y": 438.99993896484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 413.28570556640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7fbb2a1.f3ae954"\r
+                "4456e14a.c61538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6179a2a6.c7a764",\r
+        "id": "abd0f375.c30ff",\r
         "type": "outcome",\r
         "name": "ROOT",\r
         "xml": "<outcome value='ROOT'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4113.883758544922,\r
-        "y": 645,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 619.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "92f10d9d.0be95"\r
+                "dc25cb2f.e0da48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a08da95.c46784",\r
+        "id": "eba9832a.ffee4",\r
         "type": "outcome",\r
         "name": "LEAF",\r
         "xml": "<outcome value='LEAF'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4115.883758544922,\r
-        "y": 699,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 673.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "bbb0db7f.fd9908"\r
+                "7b200b08.d1724c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "892e5669.1ea2b",\r
+        "id": "a11ab8.c3c2f548",\r
         "type": "set",\r
         "name": "set network-route-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4457.883758544922,\r
-        "y": 336.99993896484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 311.28570556640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a564e86.c1193",\r
+        "id": "7e53eaf1.53c434",\r
         "type": "set",\r
         "name": "set network-route-LEAF",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4450.883758544922,\r
-        "y": 434.99993896484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 409.28570556640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a3abd24c.7a5ec",\r
+        "id": "231b0ffb.372688",\r
         "type": "set",\r
         "name": "set network-route-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4429.883758544922,\r
-        "y": 618,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 592.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dc9fae61.a17b2",\r
+        "id": "1b4ef1ae.221bae",\r
         "type": "set",\r
         "name": "set network-route-LEAF",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4433.883758544922,\r
-        "y": 711,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 685.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50eeb433.a27fd4",\r
+        "id": "f61c43e6.4dbe28",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3609.88330078125,\r
-        "y": 1371,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1345.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c94a30c2.a398b"\r
+                "58e01c76.2a233c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a408ed17.7674d",\r
+        "id": "f239d755.e3888",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3619.374267578125,\r
-        "y": 1413.5740356445312,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1387.8598022460938,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "82ef970c.862378"\r
+                "ffe24b12.95af4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bc8671c.26c7e",\r
+        "id": "7fecb9.d188bb48",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3607.88330078125,\r
-        "y": 1460,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1434.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5a6a5226.7899ec"\r
+                "6af9609c.4c1ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "246e8fda.9e3d88",\r
+        "id": "6132f0e6.1cd1a8",\r
         "type": "comment",\r
         "name": "Question?",\r
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
         "comments": "",\r
         "x": 3309.88330078125,\r
-        "y": 1333,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1307.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "652968a1.d93e88",\r
+        "id": "4618e1c0.461d88",\r
         "type": "save",\r
         "name": "get p-interface-src from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3352.88330078125,\r
-        "y": 1398,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1372.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "50eeb433.a27fd4",\r
-                "a408ed17.7674d",\r
-                "3bc8671c.26c7e"\r
+                "f61c43e6.4dbe28",\r
+                "f239d755.e3888",\r
+                "7fecb9.d188bb48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1abe7496.3f7c9b",\r
+        "id": "6aa3951e.157a4c",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3353.883270263672,\r
-        "y": 1150,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1124.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "56f8321f.20ee54",\r
-                "27baf83a.a648a"\r
+                "273ca4a1.1ba064",\r
+                "4a30eba.076bb14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27baf83a.a648a",\r
+        "id": "4a30eba.076bb14",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3576.883270263672,\r
-        "y": 1136,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1110.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "89fdb9b4.3821e8"\r
+                "3b0c1a6c.5d807e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56f8321f.20ee54",\r
+        "id": "273ca4a1.1ba064",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3578.883270263672,\r
-        "y": 1169,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1143.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "bd796d50.897138"\r
+                "1277d9f.69171a6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c94a30c2.a398b",\r
+        "id": "58e01c76.2a233c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3782.5498046875,\r
-        "y": 1370,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1344.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5b1520ee.c993d8",\r
-                "92906f1e.302de8"\r
+                "f718a065.a6f86",\r
+                "66055190.fb6538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82ef970c.862378",\r
+        "id": "ffe24b12.95af4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3772.9456787109375,\r
-        "y": 1416.8597717285156,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1391.1455383300781,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5a6a5226.7899ec",\r
+        "id": "6af9609c.4c1ea",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3776.88330078125,\r
-        "y": 1461,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1435.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b1520ee.c993d8",\r
+        "id": "f718a065.a6f86",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4046.88330078125,\r
-        "y": 1354,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1328.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "40f95927.3e48a8",\r
-                "155b2019.4d901"\r
+                "97c35025.9a9a9",\r
+                "3a478d5e.f8179a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "155b2019.4d901",\r
+        "id": "3a478d5e.f8179a",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4269.88330078125,\r
-        "y": 1309,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1283.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8cff212e.fd093"\r
+                "e66b8dbe.739f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40f95927.3e48a8",\r
+        "id": "97c35025.9a9a9",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4271.88330078125,\r
-        "y": 1373,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1347.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9ea2b228.156828"\r
+                "8b5a4d36.3a2bb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ea2b228.156828",\r
+        "id": "8b5a4d36.3a2bb8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 4433.88330078125,\r
-        "y": 1369,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1343.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cff212e.fd093",\r
+        "id": "e66b8dbe.739f2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4434.88330078125,\r
-        "y": 1306,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1280.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ea39175a.08155",\r
-                "81bb5906.bb1848"\r
+                "9ab6076f.b64fb",\r
+                "39801818.ba2ad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd796d50.897138",\r
+        "id": "1277d9f.69171a6",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 3721.883270263672,\r
-        "y": 1166,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1140.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "89fdb9b4.3821e8",\r
+        "id": "3b0c1a6c.5d807e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3724.883270263672,\r
-        "y": 1129,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1103.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "242e596.6a45da6",\r
-                "c522f465.9b1b48"\r
+                "67f68b93.dc06f4",\r
+                "41f439c7.6c07f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "242e596.6a45da6",\r
+        "id": "67f68b93.dc06f4",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 3916.883270263672,\r
-        "y": 1131,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1105.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "92906f1e.302de8",\r
+        "id": "66055190.fb6538",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4006.88330078125,\r
-        "y": 1486,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1460.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9d7e97d1.f3da4"\r
+                "c328fdc0.a05af"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d7e97d1.f3da4",\r
+        "id": "c328fdc0.a05af",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4212.88330078125,\r
-        "y": 1486,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1460.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "39469ddd.cce81a"\r
+                "23ec2727.c8e7f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "39469ddd.cce81a",\r
+        "id": "23ec2727.c8e7f",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4428.1689453125,\r
-        "y": 1485.82177734375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1460.1075439453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "286435fd.520a92"\r
+                "e1b77e00.282c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c522f465.9b1b48",\r
+        "id": "41f439c7.6c07f8",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3913.883270263672,\r
-        "y": 1196,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1170.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9a817681.2b7108",\r
-                "845c0857.7834f8",\r
-                "aae3c73d.eac74"\r
+                "89a8d2d0.88f3",\r
+                "6334a351.696854",\r
+                "c542e0e0.bf42b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a817681.2b7108",\r
+        "id": "89a8d2d0.88f3",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4109.383392333984,\r
-        "y": 1148,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1122.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d82b3eae.4c278"\r
+                "c62cbf2d.6fa458"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "845c0857.7834f8",\r
+        "id": "6334a351.696854",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4101.383392333984,\r
-        "y": 1203,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1177.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c5b5dd85.a284c8"\r
+                "143c4bf3.014b4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aae3c73d.eac74",\r
+        "id": "c542e0e0.bf42b",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4106.383392333984,\r
-        "y": 1260,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1234.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "535d5ed7.3fd4e"\r
+                "ca788cf9.3c8038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "535d5ed7.3fd4e",\r
+        "id": "ca788cf9.3c8038",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4258.383392333984,\r
-        "y": 1261,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1235.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c5b5dd85.a284c8",\r
+        "id": "143c4bf3.014b4c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4269.383392333984,\r
-        "y": 1206,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1180.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d82b3eae.4c278",\r
+        "id": "c62cbf2d.6fa458",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -1865,345 +1865,345 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4253.765716552734,\r
-        "y": 1145.6556701660156,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1119.9414367675781,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5176f492.5f7e8c"\r
+                "aab3feab.bcb5b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5176f492.5f7e8c",\r
+        "id": "aab3feab.bcb5b",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4447.883270263672,\r
-        "y": 1189.9999389648438,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1164.2857055664062,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1d42fe6d.851b3a"\r
+                "ac9dba33.9ee3a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81bb5906.bb1848",\r
+        "id": "39801818.ba2ad",\r
         "type": "set",\r
         "name": "set ltpId",\r
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",\r
         "comments": "",\r
         "x": 4604.88330078125,\r
-        "y": 1264,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1238.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea39175a.08155",\r
+        "id": "9ab6076f.b64fb",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",\r
         "comments": "",\r
         "x": 4605.88330078125,\r
-        "y": 1372,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1346.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ea0872ed.58cfa",\r
+        "id": "6381354a.11146c",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "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",\r
         "comments": "",\r
         "x": 4606.88330078125,\r
-        "y": 1321,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1295.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "286435fd.520a92",\r
+        "id": "e1b77e00.282c4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4635.00048828125,\r
-        "y": 1486.34033203125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1460.6260986328125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b0e3cfe1.6d40f",\r
-                "7126b880.f67e48",\r
-                "ad3a7086.abf6b"\r
+                "a1ad6a91.cdad1",\r
+                "bef51671.772a1",\r
+                "55e08f7a.b87978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0e3cfe1.6d40f",\r
+        "id": "a1ad6a91.cdad1",\r
         "type": "set",\r
         "name": "set source ttp-id",\r
         "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",\r
         "comments": "",\r
         "x": 4850.00048828125,\r
-        "y": 1448.34033203125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1422.6260986328125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7126b880.f67e48",\r
+        "id": "bef51671.772a1",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4847.00048828125,\r
-        "y": 1487.34033203125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1461.6260986328125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7a65c420.1080dc"\r
+                "db81e8e0.68e13"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad3a7086.abf6b",\r
+        "id": "55e08f7a.b87978",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4802.50048828125,\r
-        "y": 1529.34033203125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1503.6260986328125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a65c420.1080dc",\r
+        "id": "db81e8e0.68e13",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5027.50048828125,\r
-        "y": 1486.34033203125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1460.6260986328125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "96c8a7ed.e41958"\r
+                "52661a57.fe0a3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90470a6f.8ef5f8",\r
+        "id": "409a042d.2fadac",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4835.88330078125,\r
-        "y": 1082,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1056.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e5efb625.18037"\r
+                "f76f51b8.a98b3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5efb625.18037",\r
+        "id": "f76f51b8.a98b3",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5012.88330078125,\r
-        "y": 1074,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1048.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "732587d3.ab7a9",\r
-                "4baffabc.103f3c"\r
+                "f1cd5bd3.ddbdb8",\r
+                "b8b89faf.7ac19"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d42fe6d.851b3a",\r
+        "id": "ac9dba33.9ee3a8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4638.883270263672,\r
-        "y": 1179.9999389648438,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1154.2857055664062,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "90470a6f.8ef5f8",\r
-                "6cae07e7.8ff81"\r
+                "409a042d.2fadac",\r
+                "80f5aaec.b0ffc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6cae07e7.8ff81",\r
+        "id": "80f5aaec.b0ffc8",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4838.88330078125,\r
-        "y": 1156,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1130.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8681155.73991e8"\r
+                "bf72647d.49f538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8681155.73991e8",\r
+        "id": "bf72647d.49f538",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5015.88330078125,\r
-        "y": 1148,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1122.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c2e2c331.f24d7"\r
+                "97239b14.6f12c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96c8a7ed.e41958",\r
+        "id": "52661a57.fe0a3c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5185.50048828125,\r
-        "y": 1486.34033203125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1460.6260986328125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d73ce805.51d21"\r
+                "5700a19e.1dbeb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d73ce805.51d21",\r
+        "id": "5700a19e.1dbeb8",\r
         "type": "set",\r
         "name": "set source tunnel tp ip",\r
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
         "x": 5392.50048828125,\r
-        "y": 1486.34033203125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1460.6260986328125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4baffabc.103f3c",\r
+        "id": "b8b89faf.7ac19",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5220.88330078125,\r
-        "y": 1081,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1055.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "276c589.f8898a8",\r
-                "b6b78749.64c52",\r
-                "710e31ca.f7c328"\r
+                "5d74c4c9.fd207c",\r
+                "bdb7d238.f96a08",\r
+                "7cf71a83.19030c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "732587d3.ab7a9",\r
+        "id": "f1cd5bd3.ddbdb8",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainA id",\r
         "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",\r
         "comments": "",\r
         "x": 5250.88330078125,\r
-        "y": 1029,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1003.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "276c589.f8898a8",\r
+        "id": "5d74c4c9.fd207c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5430.88330078125,\r
-        "y": 1072,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1046.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6595904d.14fc"\r
+                "e430f4b5.90b5d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6b78749.64c52",\r
+        "id": "bdb7d238.f96a08",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5422.88330078125,\r
-        "y": 1127,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1101.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "870ff6d4.3b5618"\r
+                "46b0e213.0f69d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "710e31ca.f7c328",\r
+        "id": "7cf71a83.19030c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5427.88330078125,\r
-        "y": 1184,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1158.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "14dafdf8.cfb5c2"\r
+                "99bfc958.cc2928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "14dafdf8.cfb5c2",\r
+        "id": "99bfc958.cc2928",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 5579.88330078125,\r
-        "y": 1185,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1159.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "870ff6d4.3b5618",\r
+        "id": "46b0e213.0f69d4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 5590.88330078125,\r
-        "y": 1130,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1104.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6595904d.14fc",\r
+        "id": "e430f4b5.90b5d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -2211,60 +2211,60 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5575.265625,\r
-        "y": 1069.6556701660156,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1043.9414367675781,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4578d3b4.cc9aac"\r
+                "3d0751e6.cf382e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2e2c331.f24d7",\r
+        "id": "97239b14.6f12c8",\r
         "type": "set",\r
         "name": "set domainA ethernet layer network-id",\r
         "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",\r
         "comments": "",\r
         "x": 5250.88330078125,\r
-        "y": 1272,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1246.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4578d3b4.cc9aac",\r
+        "id": "3d0751e6.cf382e",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "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",\r
         "comments": "",\r
         "x": 5789.88330078125,\r
-        "y": 1066,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1040.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d9f780b3.339398",\r
+        "id": "33b11d1b.98a69a",\r
         "type": "set",\r
         "name": "set network-route-B",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4445.883758544922,\r
-        "y": 372.99993896484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 347.28570556640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eeaf4d12.9621",\r
+        "id": "2dc9cffb.3878b8",\r
         "type": "set",\r
         "name": "set network-route-A",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4446.883728027344,\r
-        "y": 476.99993896484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 451.28570556640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af392071.289a38",\r
+        "id": "653aef18.035f68",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -2272,17 +2272,17 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4270.883758544922,\r
-        "y": 378.99993896484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 353.28570556640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "892e5669.1ea2b",\r
-                "d9f780b3.339398"\r
+                "a11ab8.c3c2f548",\r
+                "33b11d1b.98a69a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fbb2a1.f3ae954",\r
+        "id": "4456e14a.c61538",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -2290,17 +2290,17 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4276.883758544922,\r
-        "y": 442.99993896484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 417.28570556640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6a564e86.c1193",\r
-                "eeaf4d12.9621"\r
+                "7e53eaf1.53c434",\r
+                "2dc9cffb.3878b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92f10d9d.0be95",\r
+        "id": "dc25cb2f.e0da48",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -2308,17 +2308,17 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4241.883758544922,\r
-        "y": 645,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 619.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a3abd24c.7a5ec",\r
-                "d4111de3.168d5"\r
+                "231b0ffb.372688",\r
+                "3979d153.538ee6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bbb0db7f.fd9908",\r
+        "id": "7b200b08.d1724c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -2326,456 +2326,456 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4244.883758544922,\r
-        "y": 698,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 672.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "dc9fae61.a17b2",\r
-                "daba5f73.79ab3"\r
+                "1b4ef1ae.221bae",\r
+                "49dc9fac.676fe"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4111de3.168d5",\r
+        "id": "3979d153.538ee6",\r
         "type": "set",\r
         "name": "set network-route-B",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4415.883758544922,\r
-        "y": 658,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 632.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "daba5f73.79ab3",\r
+        "id": "49dc9fac.676fe",\r
         "type": "set",\r
         "name": "set network-route-A",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4418.883758544922,\r
-        "y": 749,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 723.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f11652ec.f5ecc",\r
+        "id": "f7cb7391.6f67a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3741.88330078125,\r
-        "y": 1828.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1802.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2518ba78.6d21ae",\r
-                "ca887fb4.4fa748"\r
+                "9a5ca37c.910178",\r
+                "2a8d98c8.2c78a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d22eff5.ad4738",\r
+        "id": "fd44019f.688f6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3569.216796875,\r
-        "y": 1829.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1803.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f11652ec.f5ecc"\r
+                "f7cb7391.6f67a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f62aa8b7.81c7a8",\r
+        "id": "3eb019bb.1ee706",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3578.707763671875,\r
-        "y": 1871.5741577148438,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1845.8599243164062,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3ccb36a1.cd58ba"\r
+                "f4d10bee.1b32c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "949b65da.c62778",\r
+        "id": "ef74e13b.116b3",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3567.216796875,\r
-        "y": 1918.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1892.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b3008d52.d5dec"\r
+                "7a977b6c.124a74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ccb36a1.cd58ba",\r
+        "id": "f4d10bee.1b32c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3732.2791748046875,\r
-        "y": 1874.8598937988281,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1849.1456604003906,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b3008d52.d5dec",\r
+        "id": "7a977b6c.124a74",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3736.216796875,\r
-        "y": 1919.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1893.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2518ba78.6d21ae",\r
+        "id": "9a5ca37c.910178",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4028.216796875,\r
-        "y": 1832.000244140625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1806.2860107421875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2fdbf5bd.c09292",\r
-                "9a5de981.0de7c"\r
+                "efd0a9b7.e547a8",\r
+                "caaf5e66.b1cb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9a5de981.0de7c",\r
+        "id": "caaf5e66.b1cb",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4251.216796875,\r
-        "y": 1787.000244140625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1761.2860107421875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "82242071.f4a9f"\r
+                "5ec876cd.f1dea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2fdbf5bd.c09292",\r
+        "id": "efd0a9b7.e547a8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4253.216796875,\r
-        "y": 1851.000244140625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1825.2860107421875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "56361c44.c984a4"\r
+                "72d34df6.13ce64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56361c44.c984a4",\r
+        "id": "72d34df6.13ce64",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 4412.216796875,\r
-        "y": 1870.000244140625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1844.2860107421875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "82242071.f4a9f",\r
+        "id": "5ec876cd.f1dea8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4416.216796875,\r
-        "y": 1784.000244140625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1758.2860107421875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "10610dd4.f6c112",\r
-                "ddf5e2c4.67d9f8"\r
+                "2854b6e2.b50402",\r
+                "1fbd987b.e2c578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc221d76.582c9",\r
+        "id": "eef6ad07.9c7d5",\r
         "type": "save",\r
         "name": "get p-interface-dst from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3341.216796875,\r
-        "y": 1864.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1838.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5d22eff5.ad4738",\r
-                "f62aa8b7.81c7a8",\r
-                "949b65da.c62778"\r
+                "fd44019f.688f6",\r
+                "3eb019bb.1ee706",\r
+                "ef74e13b.116b3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "322a186d.549ed",\r
+        "id": "46101f8f.1fb8b8",\r
         "type": "comment",\r
         "name": "Question?",\r
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
         "comments": "",\r
         "x": 3302.216796875,\r
-        "y": 1808.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1782.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f369a6e9.5de548",\r
+        "id": "d38e0865.514348",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3353.216796875,\r
-        "y": 1603,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1577.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cb8e448.206bab8",\r
-                "778779f6.be6098"\r
+                "f536d783.2e1028",\r
+                "54ea75a9.fca1c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "778779f6.be6098",\r
+        "id": "54ea75a9.fca1c4",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3576.216796875,\r
-        "y": 1589,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1563.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4c771f34.9e70b8"\r
+                "3ffa66c6.048e62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb8e448.206bab8",\r
+        "id": "f536d783.2e1028",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3578.216796875,\r
-        "y": 1622,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1596.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7c64438a.ff9f5c"\r
+                "73c7be78.48771"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c64438a.ff9f5c",\r
+        "id": "73c7be78.48771",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 3721.216796875,\r
-        "y": 1619,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1593.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4c771f34.9e70b8",\r
+        "id": "3ffa66c6.048e62",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3724.216796875,\r
-        "y": 1582,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1556.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8b5ae92b.18937",\r
-                "acd78677.da7398"\r
+                "116bcef1.41b689",\r
+                "bd9fbc09.ccb15"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8b5ae92b.18937",\r
+        "id": "116bcef1.41b689",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 3918.216796875,\r
-        "y": 1585.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1559.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ca887fb4.4fa748",\r
+        "id": "2a8d98c8.2c78a",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3969.216766357422,\r
-        "y": 1965,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1939.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d3ca912e.f0454"\r
+                "821e2eef.7d9ce8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3ca912e.f0454",\r
+        "id": "821e2eef.7d9ce8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4175.216766357422,\r
-        "y": 1965,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1939.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e775983e.c87c6"\r
+                "b9228d23.f35b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e775983e.c87c6",\r
+        "id": "b9228d23.f35b1",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4392.502410888672,\r
-        "y": 1963.82177734375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1938.1075439453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8510e412.3775c"\r
+                "1db12922.ce9147"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "acd78677.da7398",\r
+        "id": "bd9fbc09.ccb15",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3940.216796875,\r
-        "y": 1653.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1627.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e413099e.5580f8",\r
-                "73fbbbe6.41f3fc",\r
-                "be84a2f7.e2d8"\r
+                "71a75cfd.cb2324",\r
+                "c5a92d1c.748898",\r
+                "d4c41231.0d38f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e413099e.5580f8",\r
+        "id": "71a75cfd.cb2324",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4135.7169189453125,\r
-        "y": 1605.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1579.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6607b5e0.cc2a14"\r
+                "55c143a3.bf5e9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "73fbbbe6.41f3fc",\r
+        "id": "c5a92d1c.748898",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4127.7169189453125,\r
-        "y": 1660.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1634.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c946d76.aa97f28"\r
+                "a19a5afd.bfc2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be84a2f7.e2d8",\r
+        "id": "d4c41231.0d38f",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4132.7169189453125,\r
-        "y": 1717.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1691.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "55c1c0e2.5aae38"\r
+                "5c56b620.c82d88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55c1c0e2.5aae38",\r
+        "id": "5c56b620.c82d88",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4284.7169189453125,\r
-        "y": 1718.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1692.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c946d76.aa97f28",\r
+        "id": "a19a5afd.bfc2c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4295.7169189453125,\r
-        "y": 1663.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1637.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6607b5e0.cc2a14",\r
+        "id": "55c143a3.bf5e9c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -2783,356 +2783,356 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4280.0992431640625,\r
-        "y": 1602.6557922363281,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1576.9415588378906,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "eb6f70d5.e0fd88"\r
+                "79a34acd.c9a0bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10610dd4.f6c112",\r
+        "id": "2854b6e2.b50402",\r
         "type": "set",\r
         "name": "set ltpId",\r
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",\r
         "comments": "",\r
         "x": 4586.216796875,\r
-        "y": 1745.000244140625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1719.2860107421875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ddf5e2c4.67d9f8",\r
+        "id": "1fbd987b.e2c578",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",\r
         "comments": "",\r
         "x": 4587.216796875,\r
-        "y": 1850.000244140625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1824.2860107421875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f866aa99.a64d6",\r
+        "id": "8823cb9b.b21f5",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "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",\r
         "comments": "",\r
         "x": 4582.216796875,\r
-        "y": 1799.000244140625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1773.2860107421875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8510e412.3775c",\r
+        "id": "1db12922.ce9147",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4599.333953857422,\r
-        "y": 1953.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1927.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3eb610b6.e19958",\r
-                "2b4d2f26.4fc18",\r
-                "56b44513.ed17bc"\r
+                "4fe8713d.4f503",\r
+                "c4b73dd8.f86748",\r
+                "cf5e37a1.834b48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3eb610b6.e19958",\r
+        "id": "4fe8713d.4f503",\r
         "type": "set",\r
         "name": "set destination ttp-id",\r
         "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",\r
         "comments": "",\r
         "x": 4814.333953857422,\r
-        "y": 1915.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1889.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b4d2f26.4fc18",\r
+        "id": "c4b73dd8.f86748",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4811.333953857422,\r
-        "y": 1954.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1928.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b7623c50.89af3"\r
+                "fd454717.5864e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56b44513.ed17bc",\r
+        "id": "cf5e37a1.834b48",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4766.833953857422,\r
-        "y": 1996.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1970.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b7623c50.89af3",\r
+        "id": "fd454717.5864e8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4991.833953857422,\r
-        "y": 1953.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1927.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e2420b84.cbf938"\r
+                "6021f32a.54d8fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e2420b84.cbf938",\r
+        "id": "6021f32a.54d8fc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5149.833953857422,\r
-        "y": 1953.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1927.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d3754257.cdbb9"\r
+                "1a613df3.ff444a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3754257.cdbb9",\r
+        "id": "1a613df3.ff444a",\r
         "type": "set",\r
         "name": "set destination tunnel tp ip",\r
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
         "x": 5356.833953857422,\r
-        "y": 1953.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1927.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "303b1a28.56bd56",\r
+        "id": "1465bad2.a0d805",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4862.216796875,\r
-        "y": 1621.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1595.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8f6cdb8f.90967"\r
+                "f75a0195.2a4c5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f6cdb8f.90967",\r
+        "id": "f75a0195.2a4c5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5039.216796875,\r
-        "y": 1613.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1587.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5fcf484f.8e6e78",\r
-                "f4e9d00a.c60c9"\r
+                "1de23279.e8bad6",\r
+                "95237093.1f1c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb6f70d5.e0fd88",\r
+        "id": "79a34acd.c9a0bc",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4464.216796875,\r
-        "y": 1617.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1591.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "93bac5db.c9063"\r
+                "b5cddb2a.47fb5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93bac5db.c9063",\r
+        "id": "b5cddb2a.47fb5",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4659.216796875,\r
-        "y": 1617.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1591.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "303b1a28.56bd56",\r
-                "6dd697d7.ade42"\r
+                "1465bad2.a0d805",\r
+                "a6e303e4.3eb668"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4e9d00a.c60c9",\r
+        "id": "95237093.1f1c18",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5247.216796875,\r
-        "y": 1620.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1594.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "af18531c.f561e8",\r
-                "6d4f9387.cdc244",\r
-                "7f999aa.ecc8a64"\r
+                "2d3d2acb.c107b6",\r
+                "fb5337e0.94ced8",\r
+                "752448e6.ec72a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e464f44.674b68",\r
+        "id": "6879e9be.d7aee",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5041.216796875,\r
-        "y": 1686.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1660.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c6202cfd.8bcb4"\r
+                "8691b2ec.22b9d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6dd697d7.ade42",\r
+        "id": "a6e303e4.3eb668",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4864.216796875,\r
-        "y": 1694.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1668.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6e464f44.674b68"\r
+                "6879e9be.d7aee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5fcf484f.8e6e78",\r
+        "id": "1de23279.e8bad6",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainB id",\r
         "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",\r
         "comments": "",\r
         "x": 5277.216796875,\r
-        "y": 1568.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1542.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c6202cfd.8bcb4",\r
+        "id": "8691b2ec.22b9d8",\r
         "type": "set",\r
         "name": "set domainB ethernet layer network-id",\r
         "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",\r
         "comments": "",\r
         "x": 5254.216796875,\r
-        "y": 1752.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1726.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af18531c.f561e8",\r
+        "id": "2d3d2acb.c107b6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5457.216796875,\r
-        "y": 1611.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1585.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5e16aade.ea368c"\r
+                "a3e7410.2b3c44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d4f9387.cdc244",\r
+        "id": "fb5337e0.94ced8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5449.216796875,\r
-        "y": 1666.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1640.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "77d34b30.5fb23c"\r
+                "656cbbf6.41438c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f999aa.ecc8a64",\r
+        "id": "752448e6.ec72a8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5454.216796875,\r
-        "y": 1723.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1697.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "674c6f5c.5f0f88"\r
+                "6bb525a1.9cb52c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "674c6f5c.5f0f88",\r
+        "id": "6bb525a1.9cb52c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 5606.216796875,\r
-        "y": 1724.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1698.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "77d34b30.5fb23c",\r
+        "id": "656cbbf6.41438c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 5617.216796875,\r
-        "y": 1669.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1643.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5e16aade.ea368c",\r
+        "id": "a3e7410.2b3c44",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -3140,234 +3140,234 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5601.59912109375,\r
-        "y": 1608.6557922363281,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1582.9415588378906,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4cb5ebab.b25f64"\r
+                "99742e42.2fdbd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4cb5ebab.b25f64",\r
+        "id": "99742e42.2fdbd8",\r
         "type": "set",\r
         "name": "set controller domainB data",\r
         "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",\r
         "comments": "",\r
         "x": 5816.216796875,\r
-        "y": 1605.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1579.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5fd92a3e.ed6fec",\r
+        "id": "78d4922e.8ebe04",\r
         "type": "set",\r
         "name": "set LEAF stuff",\r
         "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",\r
         "comments": "",\r
         "x": 3314.88330078125,\r
-        "y": 1475,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1449.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4a864e6a.471e",\r
+        "id": "c220ecdf.76a978",\r
         "type": "set",\r
         "name": "set ROOT stuff",\r
         "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",\r
         "comments": "",\r
         "x": 3301.88330078125,\r
-        "y": 1995.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1969.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cfd6a168.75b7d8",\r
+        "id": "b4f5dada.48378",\r
         "type": "execute",\r
         "name": "execute UUID generator for ethernet-service-name",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2426.883331298828,\r
-        "y": 188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 162.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fe93cfa.921edb",\r
+        "id": "5db562b1.71111c",\r
         "type": "set",\r
         "name": "set new ethernet-service-name",\r
         "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",\r
         "comments": "",\r
         "x": 2360.883331298828,\r
-        "y": 224,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 198.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "85869c3a.24ed3",\r
+        "id": "3f2dec8d.5c3844",\r
         "type": "comment",\r
         "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",\r
         "info": "",\r
         "comments": "",\r
         "x": 2545.883331298828,\r
-        "y": 151,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 125.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5ea8856.4eb3f",\r
+        "id": "8ae1ae92.9d4708",\r
         "type": "comment",\r
         "name": "NOT NEEDED ANYMORE?",\r
         "info": "",\r
         "comments": "",\r
         "x": 4072.88330078125,\r
-        "y": 1453,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1427.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8e941b0d.26d14",\r
+        "id": "f4b4f4b0.73db2",\r
         "type": "comment",\r
         "name": "NOT NEEDED ANYMORE?",\r
         "info": "",\r
         "comments": "",\r
         "x": 4028.883270263672,\r
-        "y": 1917,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1891.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cb68ccc.e851f8",\r
+        "id": "4304e2aa.cc073c",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3441.8837890625,\r
-        "y": 7483.999969482422,\r
-        "z": "8bd89607.6248d8",\r
+        "x": 2737.8836669921875,\r
+        "y": 7259.28564453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "80d49243.ddf01",\r
+        "id": "f849984b.dddac",\r
         "type": "comment",\r
         "name": "START OF DELETE OPERATION",\r
         "info": "",\r
         "comments": "",\r
         "x": 3296.88330078125,\r
-        "y": 2476.999969482422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2451.2857360839844,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f2ca941.64e03",\r
+        "id": "ff6310d.2048a7",\r
         "type": "save",\r
         "name": "delete LEAF uni resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3880.566650390625,\r
-        "y": 2578.4000854492188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2552.6858520507812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "afaae138.bb9798",\r
+        "id": "14f1d608.fff342",\r
         "type": "save",\r
         "name": "get LEAF uni from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3251.566650390625,\r
-        "y": 2558.4000854492188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2532.6858520507812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "661c06cc.3908b",\r
-                "1ca1166.e689c6a",\r
-                "b5955cba.954b1"\r
+                "30a4f59e.3fde12",\r
+                "98adc704.004778",\r
+                "91611e7f.d3eaa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1ca1166.e689c6a",\r
+        "id": "98adc704.004778",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3479.0576171875,\r
-        "y": 2530.9740600585938,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2505.2598266601562,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e6c36b4a.f9b0a8"\r
+                "94257401.34831"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b5955cba.954b1",\r
+        "id": "91611e7f.d3eaa8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3474.566650390625,\r
-        "y": 2575.4000244140625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2549.685791015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9464bc90.391b5"\r
+                "c2c26a41.57e9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6c36b4a.f9b0a8",\r
+        "id": "94257401.34831",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3641.629150390625,\r
-        "y": 2530.259765625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2504.5455322265625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9464bc90.391b5",\r
+        "id": "c2c26a41.57e9c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 3642.566650390625,\r
-        "y": 2575.4000244140625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2549.685791015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "661c06cc.3908b",\r
+        "id": "30a4f59e.3fde12",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3486.566650390625,\r
-        "y": 2625.4000854492188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2599.6858520507812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8055efb.5ed0c9"\r
+                "4d0f2575.137edc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8055efb.5ed0c9",\r
+        "id": "4d0f2575.137edc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -3375,267 +3375,267 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 3638.88330078125,\r
-        "y": 2628.9999389648438,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2603.2857055664062,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2d855333.ba947c",\r
-                "8f2ca941.64e03",\r
-                "7724024e.bb32ec",\r
-                "b98aea07.4499"\r
+                "589d867c.eeacb",\r
+                "ff6310d.2048a7",\r
+                "84152b78.a442c8",\r
+                "1e88543b.84a814"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2d855333.ba947c",\r
+        "id": "589d867c.eeacb",\r
         "type": "set",\r
         "name": "set bwToBeDecreased tpid cvlan",\r
         "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",\r
         "comments": "",\r
         "x": 3883.566650390625,\r
-        "y": 2521.4000854492188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2495.6858520507812,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a9e99fa6.0d7b7",\r
+        "id": "243640c4.1190f8",\r
         "type": "comment",\r
         "name": "Update ROOT UNI's bw",\r
         "info": "",\r
         "comments": "",\r
         "x": 3845.566650390625,\r
-        "y": 2632.199951171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2606.4857177734375,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2355b29.347a7",\r
+        "id": "83d2a0c.fbf83e",\r
         "type": "save",\r
         "name": "update ROOT UNI in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4523.566650390625,\r
-        "y": 2675.199951171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2649.4857177734375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7724024e.bb32ec",\r
+        "id": "84152b78.a442c8",\r
         "type": "save",\r
         "name": "get root uni from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3837.56640625,\r
-        "y": 2678.199951171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2652.4857177734375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7f7b7065.dfb0f",\r
-                "18f5411.3947abf",\r
-                "5fedf83d.ca31e8"\r
+                "ee63dcff.30bad",\r
+                "80208a9d.4e9bb",\r
+                "3e7ba9dc.c77e76"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18f5411.3947abf",\r
+        "id": "80208a9d.4e9bb",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4141.057373046875,\r
-        "y": 2588.77392578125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2563.0596923828125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "58e0cfbb.eeb22"\r
+                "ee49c3d8.4041d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5fedf83d.ca31e8",\r
+        "id": "3e7ba9dc.c77e76",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4136.56640625,\r
-        "y": 2633.1998901367188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2607.4856567382812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9a2aec0d.d77f58"\r
+                "e34757d5.3f1ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58e0cfbb.eeb22",\r
+        "id": "ee49c3d8.4041d8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4303.62890625,\r
-        "y": 2588.0596313476562,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2562.3453979492188,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9a2aec0d.d77f58",\r
+        "id": "e34757d5.3f1ff8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4304.56640625,\r
-        "y": 2633.1998901367188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2607.4856567382812,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2175339a.46dd54",\r
+        "id": "be9d3338.5121d",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4301.56640625,\r
-        "y": 2683.199951171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2657.4857177734375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9319905e.cf01b",\r
-                "d2355b29.347a7"\r
+                "933a8e8f.7ef918",\r
+                "83d2a0c.fbf83e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f7b7065.dfb0f",\r
+        "id": "ee63dcff.30bad",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4132.56640625,\r
-        "y": 2683.199951171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2657.4857177734375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2175339a.46dd54"\r
+                "be9d3338.5121d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9319905e.cf01b",\r
+        "id": "933a8e8f.7ef918",\r
         "type": "set",\r
         "name": "set new bw",\r
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",\r
         "comments": "",\r
         "x": 4483.567138671875,\r
-        "y": 2625.199951171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2599.4857177734375,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9164c42.75d5f8",\r
+        "id": "21e69316.d31a3c",\r
         "type": "comment",\r
         "name": "Delete LEAF UNI",\r
         "info": "",\r
         "comments": "",\r
         "x": 3831.88330078125,\r
-        "y": 2462.9999389648438,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2437.2857055664062,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "82a9b10f.cbf938",\r
+        "id": "45cb1d93.9cef0c",\r
         "type": "set",\r
         "name": "set current-provider-id and current-cvlan-id",\r
         "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`' />-->",\r
         "comments": "",\r
         "x": 3311.749969482422,\r
-        "y": 3795.6000366210938,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3769.8858032226562,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9a0ba695.c13258",\r
+        "id": "95cc6144.fb6bd8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3444.749969482422,\r
-        "y": 3843.6000366210938,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3817.8858032226562,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a14834df.662a8",\r
+        "id": "21aeddc1.06f77a",\r
         "type": "switchNode",\r
         "name": "switch found-connectivity?",\r
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3266.749969482422,\r
-        "y": 3895.4000854492188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3869.6858520507812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b9a4b0ad.78d9e8",\r
-                "49168449.b48e54"\r
+                "218077ad.f30d3",\r
+                "a4239ce5.8829c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9a4b0ad.78d9e8",\r
+        "id": "218077ad.f30d3",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3459.749969482422,\r
-        "y": 3896.4000854492188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3870.6858520507812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c7d731c2.8648d8"\r
+                "dcbbe6d2.fa9028"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7d731c2.8648d8",\r
+        "id": "dcbbe6d2.fa9028",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3603.749969482422,\r
-        "y": 3892.6000366210938,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3866.8858032226562,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49168449.b48e54",\r
+        "id": "a4239ce5.8829c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3463.749969482422,\r
-        "y": 3940.4000854492188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3914.6858520507812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2b5fde97.f226ea"\r
+                "338c28da.4908c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b5fde97.f226ea",\r
+        "id": "338c28da.4908c8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -3643,165 +3643,165 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 3602.749969482422,\r
-        "y": 3935.4000854492188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3909.6858520507812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6c8d251.aa4085c",\r
-                "1d93d9c1.b4dc36",\r
-                "2f3e9082.a03f"\r
+                "40a81b6.e879ce4",\r
+                "fe7c3ff6.ce34b8",\r
+                "af03ee84.d16068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c8d251.aa4085c",\r
+        "id": "40a81b6.e879ce4",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3853.149627685547,\r
-        "y": 3943.9166870117188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3918.2024536132812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8f03c967.45f27"\r
+                "3fc00cbe.f344f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f03c967.45f27",\r
+        "id": "3fc00cbe.f344f4",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4075.149627685547,\r
-        "y": 3921.9166870117188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3896.2024536132812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3959f0cf.96f36"\r
+                "57d9d04a.beb888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3959f0cf.96f36",\r
+        "id": "57d9d04a.beb888",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4235.149139404297,\r
-        "y": 3901.9166870117188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3876.2024536132812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1414f243.3459be"\r
+                "5fa67fdd.e511b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80ad8584.1bf2c8",\r
+        "id": "b9bbd69a.136aa8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4388.149658203125,\r
-        "y": 3882.916717529297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3857.2024841308594,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "dbcbba23.eadbb",\r
-                "2ba6b637.902e82"\r
+                "17e2ea6.f8df196",\r
+                "947c4850.aa8df"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dbcbba23.eadbb",\r
+        "id": "17e2ea6.f8df196",\r
         "type": "set",\r
         "name": "set tmp.stillHasUni to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",\r
         "comments": "",\r
         "x": 4584.649871826172,\r
-        "y": 3850.9999389648438,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3825.2857055664062,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1d93d9c1.b4dc36",\r
+        "id": "fe7c3ff6.ce34b8",\r
         "type": "set",\r
         "name": "set tmp.stillHasUn tmp.keepVPNBs to FALSE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='false' />\n<parameter name='tmp.keepVPNBs' value='false' />\n",\r
         "comments": "",\r
         "x": 3959.64990234375,\r
-        "y": 3862.999969482422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3837.2857360839844,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f3e9082.a03f",\r
+        "id": "af03ee84.d16068",\r
         "type": "switchNode",\r
         "name": "switch tmp.keepVPNBs?",\r
         "xml": "\n<switch test=\"`$tmp.keepVPNBs`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3767.64990234375,\r
-        "y": 4284.000213623047,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4258.285980224609,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f5f9b41d.cada7",\r
-                "3f4fef24.6df1a"\r
+                "77a80484.fb13cc",\r
+                "a722846c.585ad"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2ba6b637.902e82",\r
+        "id": "947c4850.aa8df",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4552.88330078125,\r
-        "y": 3918.999969482422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3893.2857360839844,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3f4fef24.6df1a",\r
+        "id": "a722846c.585ad",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 154.65066528320312,\r
-        "y": 5348.000457763672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5322.286224365234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "16d898b2.82d4af"\r
+                "c0a1014a.3ea75"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5f9b41d.cada7",\r
+        "id": "77a80484.fb13cc",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3988.650634765625,\r
-        "y": 4386.000213623047,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4360.285980224609,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "26c73a8d.4562be"\r
+                "8774c38d.ee5b7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26c73a8d.4562be",\r
+        "id": "8774c38d.ee5b7",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
@@ -3809,209 +3809,209 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4131.650634765625,\r
-        "y": 4382.000213623047,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4356.285980224609,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e9909468.33151",\r
-                "efe71d55.9caa78",\r
-                "21b48e5f.bc8462",\r
-                "55b631d2.803a38",\r
-                "a2022ff9.9bc538",\r
-                "702c8bba.ca32ac",\r
-                "e084df79.80ceb8",\r
-                "624968c9.f15538",\r
-                "abf74f44.8bd74"\r
+                "f67d6e8d.c4ab",\r
+                "1d885097.bf6b2f",\r
+                "bd8e5c03.dfc108",\r
+                "19328269.e896be",\r
+                "93e60704.65dbd",\r
+                "8b3d1eff.18e008",\r
+                "ffd8a757.b8a3f",\r
+                "b33560b0.1278c",\r
+                "fc616200.2baf58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4355739e.98f0ec",\r
+        "id": "9c91ac5e.705b8",\r
         "type": "comment",\r
         "name": "keepVPNBs == false, then check tmp.stillHasUni",\r
         "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",\r
         "comments": "",\r
         "x": 181,\r
-        "y": 5304.000457763672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5278.286224365234,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4da2ca0c.4a8b84",\r
+        "id": "fa1b93d9.936e7",\r
         "type": "comment",\r
         "name": "There are still other UNIs in this connectivity that share same OLT node. Only update bw of the vpn-bindings involved",\r
         "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",\r
         "comments": "",\r
         "x": 4007.884033203125,\r
-        "y": 4349.000213623047,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4323.285980224609,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b3df18d.6f724",\r
+        "id": "30095233.787426",\r
         "type": "set",\r
         "name": "set srcTtp OTN layer",\r
         "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",\r
         "comments": "",\r
         "x": 4820.667724609375,\r
-        "y": 4539.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4514.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "84df48a4.4e5358",\r
+        "id": "298f2b5b.0aab2c",\r
         "type": "switchNode",\r
         "name": "switch provider-id domainA",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5165.667724609375,\r
-        "y": 4401.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4376.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cfc0c818.79fe68"\r
+                "1597a82b.d6bf2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "10190e03.34bba2",\r
+        "id": "1126bc47.b4d98c",\r
         "type": "for",\r
         "name": "for netwidx..allNetworksList_length",\r
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4872.667724609375,\r
-        "y": 4395.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4370.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "84df48a4.4e5358"\r
+                "298f2b5b.0aab2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1796601b.dbfbf",\r
+        "id": "9ba49429.2785d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5127.667724609375,\r
-        "y": 4352.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4327.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4871207.ade70e",\r
+        "id": "ace3cbea.15731",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",\r
         "comments": "",\r
         "x": 4816.667724609375,\r
-        "y": 4447.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4422.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fe8bfdbc.e310b8",\r
+        "id": "1d3af694.aab3a1",\r
         "type": "set",\r
         "name": "set tmp.pce-src-node",\r
         "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]`\" />",\r
         "comments": "",\r
         "x": 4824.667724609375,\r
-        "y": 4492.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4467.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ed94bc94.c3085",\r
+        "id": "7a0d3acc.4e0354",\r
         "type": "set",\r
         "name": "unset otnTopoIdSrc",\r
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",\r
         "comments": "",\r
         "x": 4821.667724609375,\r
-        "y": 4345.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4320.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cfc0c818.79fe68",\r
+        "id": "1597a82b.d6bf2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5074.667724609375,\r
-        "y": 4469.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4444.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3784b6ea.dad97a"\r
+                "247fb61.2b27f4a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3784b6ea.dad97a",\r
+        "id": "247fb61.2b27f4a",\r
         "type": "switchNode",\r
         "name": "switch te-topo-id",\r
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5259.667724609375,\r
-        "y": 4468.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4443.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6ba573fe.abd33c"\r
+                "d2d679f0.fa9e7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ba573fe.abd33c",\r
+        "id": "d2d679f0.fa9e7",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5451.667724609375,\r
-        "y": 4471.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4446.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a8101530.41669"\r
+                "7d11177c.7fa498"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8101530.41669",\r
+        "id": "7d11177c.7fa498",\r
         "type": "set",\r
         "name": "set otnTopoIdSrc",\r
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",\r
         "comments": "",\r
         "x": 5623.667724609375,\r
-        "y": 4467.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4442.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a63decd.7b4cb2",\r
+        "id": "b338f208.2e8e8",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4999.667724609375,\r
-        "y": 4582.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4557.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e9909468.33151",\r
+        "id": "f67d6e8d.c4ab",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -4019,232 +4019,232 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4516.667724609375,\r
-        "y": 4367.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4342.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9c834ddf.7b5a8",\r
-                "1b5b7b9f.240eac",\r
-                "4871207.ade70e",\r
-                "fe8bfdbc.e310b8",\r
-                "9b3df18d.6f724",\r
-                "10190e03.34bba2",\r
-                "3a63decd.7b4cb2"\r
+                "6c238e2f.cfa52",\r
+                "97e28bb1.9f6bb8",\r
+                "ace3cbea.15731",\r
+                "1d3af694.aab3a1",\r
+                "30095233.787426",\r
+                "1126bc47.b4d98c",\r
+                "b338f208.2e8e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5418760e.ea421",\r
+        "id": "44415c7f.4f5f24",\r
         "type": "comment",\r
         "name": "The following section is to find srcTtp OTN layer (its long name)",\r
         "info": "The following section is to find srcTtp OTN layer (its long name)",\r
         "comments": "",\r
         "x": 4501.667724609375,\r
-        "y": 4301.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4276.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1b5b7b9f.240eac",\r
+        "id": "97e28bb1.9f6bb8",\r
         "type": "get-resource",\r
         "name": "get-resource network-resources-list",\r
         "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\" >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4880.667724609375,\r
-        "y": 4288.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4263.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cdc8c3cd.7743d8",\r
-                "829501cc.19a87",\r
-                "1796601b.dbfbf"\r
+                "153999c3.0eb42e",\r
+                "a208bb99.66b2e8",\r
+                "9ba49429.2785d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cdc8c3cd.7743d8",\r
+        "id": "153999c3.0eb42e",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5116.667724609375,\r
-        "y": 4271.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4246.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "829501cc.19a87",\r
+        "id": "a208bb99.66b2e8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5113.667724609375,\r
-        "y": 4312.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4287.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9c834ddf.7b5a8",\r
+        "id": "6c238e2f.cfa52",\r
         "type": "set",\r
         "name": "unset parameters",\r
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",\r
         "comments": "",\r
         "x": 4829.667724609375,\r
-        "y": 4245.783660888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4220.069427490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "efe71d55.9caa78",\r
+        "id": "1d885097.bf6b2f",\r
         "type": "set",\r
         "name": "unset tmp.aai.all-vpn-bindings",\r
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",\r
         "comments": "",\r
         "x": 4336.667724609375,\r
-        "y": 4700.183563232422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4674.469329833984,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "429a4c62.ec5bdc",\r
+        "id": "582ea235.e6de1c",\r
         "type": "comment",\r
         "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",\r
         "info": "",\r
         "comments": "",\r
         "x": 4459.968017578125,\r
-        "y": 4739.183563232422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4713.469329833984,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "21b48e5f.bc8462",\r
+        "id": "bd8e5c03.dfc108",\r
         "type": "save",\r
         "name": "get all-vpn-bindings from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4357.968017578125,\r
-        "y": 4774.183563232422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4748.469329833984,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a823d247.f64a98",\r
-                "36823aa3.4d18a6",\r
-                "eb8482c0.2d4878"\r
+                "d0e71616.8c817",\r
+                "148e0bed.377164",\r
+                "3b175283.95d6be"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a823d247.f64a98",\r
+        "id": "d0e71616.8c817",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4562.968017578125,\r
-        "y": 4771.183563232422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4745.469329833984,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8498bebb.23bf48"\r
+                "39c739fc.a6fe6e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36823aa3.4d18a6",\r
+        "id": "148e0bed.377164",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4546.458984375,\r
-        "y": 4832.757598876953,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4807.043365478516,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "386b7921.748fb6"\r
+                "3e1fb649.3101ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eb8482c0.2d4878",\r
+        "id": "3b175283.95d6be",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4543.968017578125,\r
-        "y": 4876.183563232422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4850.469329833984,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "134c42f5.f94555"\r
+                "681b836.365687c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8498bebb.23bf48",\r
+        "id": "39c739fc.a6fe6e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4730.96826171875,\r
-        "y": 4766.183563232422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4740.469329833984,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6b12d916.16568"\r
+                "93e92e1a.778be8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "386b7921.748fb6",\r
+        "id": "3e1fb649.3101ea",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4709.0303955078125,\r
-        "y": 4833.0433349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4807.3291015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "134c42f5.f94555",\r
+        "id": "681b836.365687c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4710.968017578125,\r
-        "y": 4875.183563232422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4849.469329833984,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6b12d916.16568",\r
+        "id": "93e92e1a.778be8",\r
         "type": "for",\r
         "name": "for vpnidx in all-vpn-bindings",\r
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4968.96826171875,\r
-        "y": 4771.183563232422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4745.469329833984,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cfa150d4.94ff28"\r
+                "27f30922.4e6a66"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cfa150d4.94ff28",\r
+        "id": "27f30922.4e6a66",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -4252,74 +4252,74 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5202.968017578125,\r
-        "y": 4778.183563232422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4752.469329833984,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e4eccca9.9724c8"\r
+                "e449a33.b8b696"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd4e0e04.50655",\r
+        "id": "e77a7161.49d068",\r
         "type": "comment",\r
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",\r
         "info": "",\r
         "comments": "",\r
         "x": 5119.783935546875,\r
-        "y": 4849.349884033203,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4823.635650634766,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e4eccca9.9724c8",\r
+        "id": "e449a33.b8b696",\r
         "type": "switchNode",\r
         "name": "switch ops-note is srcTtpOtnLayer",\r
         "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5063.783935546875,\r
-        "y": 4898.349884033203,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4872.635650634766,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7056a1ab.16f5c8",\r
-                "9ff2677.5b72918"\r
+                "62a1336b.ab309c",\r
+                "57ed2482.36942c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ff2677.5b72918",\r
+        "id": "57ed2482.36942c",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5306.784423828125,\r
-        "y": 4939.349395751953,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4913.635162353516,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7056a1ab.16f5c8",\r
+        "id": "62a1336b.ab309c",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5317.7841796875,\r
-        "y": 4896.349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4870.6353759765625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2f2661a7.5dc1e6"\r
+                "6f96293b.020fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a26e073.3ca98f8",\r
+        "id": "48fa24ff.a12f6c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -4327,213 +4327,213 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5544.767578125,\r
-        "y": 4903.76611328125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4878.0518798828125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ff1ba77c.30ef7",\r
-                "6cee0088.2f0908",\r
-                "acf1096d.49e23"\r
+                "d949e407.7d96c8",\r
+                "ba00ef86.599998",\r
+                "e04480f3.8af1b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6e1088cb.02b348",\r
+        "id": "a4fcb041.b0aaf8",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5709.8173828125,\r
-        "y": 4788.766571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4763.052337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "28fa48d0.c1f11"\r
+                "dc33bc78.b33dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28fa48d0.c1f11",\r
+        "id": "dc33bc78.b33dc",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5901.8173828125,\r
-        "y": 4777.766815185547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4752.052581787109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "794e0693.bafff"\r
+                "88251130.694fa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff1ba77c.30ef7",\r
+        "id": "d949e407.7d96c8",\r
         "type": "set",\r
         "name": "unset tmp.aai.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",\r
         "comments": "",\r
         "x": 5658.334228515625,\r
-        "y": 4678.983612060547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4653.269378662109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6cee0088.2f0908",\r
+        "id": "ba00ef86.599998",\r
         "type": "set",\r
         "name": "set tmp.aai.the-vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",\r
         "comments": "",\r
         "x": 5650.334228515625,\r
-        "y": 4727.983612060547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4702.269378662109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "acf1096d.49e23",\r
+        "id": "e04480f3.8af1b",\r
         "type": "save",\r
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5881.751220703125,\r
-        "y": 4909.149627685547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4883.435394287109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7591a9e8.920d7",\r
+        "id": "e369ae1d.045348",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5833.401123046875,\r
-        "y": 4956.466522216797,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4930.752288818359,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "20c2cafd.4f2b6e",\r
+        "id": "7bcaed73.c4335c",\r
         "type": "comment",\r
         "name": "decrease the bw of the-vpn-binding and change status to modified",\r
         "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",\r
         "comments": "",\r
         "x": 5905.751220703125,\r
-        "y": 4870.149627685547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4844.435394287109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "794e0693.bafff",\r
+        "id": "88251130.694fa8",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6083.8173828125,\r
-        "y": 4756.766815185547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4731.052581787109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cb67e673.c3b218"\r
+                "3faa0ed9.e49512"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb67e673.c3b218",\r
+        "id": "3faa0ed9.e49512",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 6245.8173828125,\r
-        "y": 4745.766815185547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4720.052581787109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "28efce3c.031a02",\r
-                "a7f7a502.452a7"\r
+                "1f4e4f1d.0faeb9",\r
+                "71f57a2d.ed1434"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28efce3c.031a02",\r
+        "id": "1f4e4f1d.0faeb9",\r
         "type": "set",\r
         "name": "unset tmp.the-connectivity",\r
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",\r
         "comments": "",\r
         "x": 6442.8173828125,\r
-        "y": 4674.766815185547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4649.052581787109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a7f7a502.452a7",\r
+        "id": "71f57a2d.ed1434",\r
         "type": "set",\r
         "name": "set tmp.the-connectivity",\r
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",\r
         "comments": "",\r
         "x": 6440.2841796875,\r
-        "y": 4773.983612060547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4748.269378662109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "121ba89c.f4d387",\r
+        "id": "5e5dd175.2ee1b",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3097.800048828125,\r
-        "y": 3232.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3207.0857849121094,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e7a924f9.c6032",\r
+        "id": "95f11825.f517d8",\r
         "type": "switchNode",\r
         "name": "switch found-middle-man?",\r
         "xml": "<switch test='`$found-middle-man`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2974.800048828125,\r
-        "y": 3342.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3317.0857849121094,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a8ce787f.7ca8b8",\r
-                "dab4cfcf.e3306"\r
+                "eda02ee3.547818",\r
+                "24ae5a23.6efcde"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8ce787f.7ca8b8",\r
+        "id": "eda02ee3.547818",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3158.800048828125,\r
-        "y": 3321.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3296.0857849121094,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3ed4168e.db435a"\r
+                "25d89b5b.fea624"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ed4168e.db435a",\r
+        "id": "25d89b5b.fea624",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -4541,43 +4541,43 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 3301.800048828125,\r
-        "y": 3321.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3296.0857849121094,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d46982de.a36698"\r
+                "a5e21959.30c488"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d46982de.a36698",\r
+        "id": "a5e21959.30c488",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3477.800048828125,\r
-        "y": 3319.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3294.0857849121094,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dab4cfcf.e3306",\r
+        "id": "24ae5a23.6efcde",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3156.800048828125,\r
-        "y": 3376.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3351.0857849121094,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "55aae2f8.8a15b4"\r
+                "2aa846fb.1fdfe2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "55aae2f8.8a15b4",\r
+        "id": "2aa846fb.1fdfe2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -4585,216 +4585,216 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 3003.800048828125,\r
-        "y": 3509.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3484.0857849121094,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "82a9b10f.cbf938",\r
-                "9a0ba695.c13258",\r
-                "a14834df.662a8",\r
-                "87bd7501.49bf18",\r
-                "4331a4c2.0089dc",\r
-                "b9e9be73.6c3be"\r
+                "45cb1d93.9cef0c",\r
+                "95cc6144.fb6bd8",\r
+                "21aeddc1.06f77a",\r
+                "ab0940a1.911a68",\r
+                "6d6cc518.e0ec9c",\r
+                "3c679d7f.fbbb22"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6411a3c0.06e7c4",\r
+        "id": "522b1854.031bc",\r
         "type": "comment",\r
         "name": "Find LEAF connectivity",\r
         "info": "",\r
         "comments": "",\r
         "x": 3225.88330078125,\r
-        "y": 3749.999969482422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3724.2857360839844,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "87bd7501.49bf18",\r
+        "id": "ab0940a1.911a68",\r
         "type": "set",\r
         "name": "set tmp.MMstillHasUni to FALSE",\r
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",\r
         "comments": "",\r
         "x": 3308.333251953125,\r
-        "y": 3522.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3497.0857849121094,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4331a4c2.0089dc",\r
+        "id": "6d6cc518.e0ec9c",\r
         "type": "for",\r
         "name": "for each relationship of middle-man-conn",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3306.8330078125,\r
-        "y": 3568.716766357422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3543.0025329589844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3cfcd803.984ff"\r
+                "f5f202e7.9ae08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3cfcd803.984ff",\r
+        "id": "f5f202e7.9ae08",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3569.8330078125,\r
-        "y": 3563.716766357422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3538.0025329589844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "19e3fea0.d430a9"\r
+                "186eedb6.79ae82"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19e3fea0.d430a9",\r
+        "id": "186eedb6.79ae82",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3729.83251953125,\r
-        "y": 3543.716766357422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3518.0025329589844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cc595a48.1912e8"\r
+                "e8fee7bd.fc2ef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db4c40a7.875698",\r
+        "id": "774ecc4a.3ad124",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5066.834228515625,\r
-        "y": 3574.716796875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3549.0025634765625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7118b227.f4c97c",\r
-                "642017c6.da5f18",\r
-                "d7647a1a.599238"\r
+                "9464a805.69d21",\r
+                "af3bd9a1.948688",\r
+                "da386631.67d8c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7118b227.f4c97c",\r
+        "id": "9464a805.69d21",\r
         "type": "set",\r
         "name": "set tmp.MMstillHasUni to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",\r
         "comments": "",\r
         "x": 5306.334716796875,\r
-        "y": 3523.800048828125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3498.0858154296875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "642017c6.da5f18",\r
+        "id": "af3bd9a1.948688",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 5239.568145751953,\r
-        "y": 3596.800079345703,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3571.0858459472656,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d96806ce.d6ba3",\r
+        "id": "17da0805.f3e8a8",\r
         "type": "comment",\r
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",\r
         "info": "",\r
         "comments": "",\r
         "x": 4432.88427734375,\r
-        "y": 5131.000213623047,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5105.285980224609,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "55b631d2.803a38",\r
+        "id": "19328269.e896be",\r
         "type": "set",\r
         "name": "set tmp.leafconn.",\r
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",\r
         "comments": "",\r
         "x": 4331.317138671875,\r
-        "y": 5182.916717529297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5157.202484130859,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e084df79.80ceb8",\r
+        "id": "ffd8a757.b8a3f",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4482.317138671875,\r
-        "y": 5625.916717529297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5600.202484130859,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "624968c9.f15538",\r
+        "id": "b33560b0.1278c",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4297.317138671875,\r
-        "y": 5692.916717529297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5667.202484130859,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3ebbf801.286498",\r
-                "76ebd92f.1642a"\r
+                "e0079417.8b765",\r
+                "94134a14.38a09"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ebbf801.286498",\r
+        "id": "e0079417.8b765",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4562.317138671875,\r
-        "y": 5677.916717529297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5652.202484130859,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "37d1d73c.eecfd"\r
+                "c191059e.ace948"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76ebd92f.1642a",\r
+        "id": "94134a14.38a09",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4558.317138671875,\r
-        "y": 5725.916717529297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5700.202484130859,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "199fe1ad.b53f66"\r
+                "21c0ccb3.89b3cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37d1d73c.eecfd",\r
+        "id": "c191059e.ace948",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -4802,116 +4802,116 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4718.317138671875,\r
-        "y": 5673.916717529297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5648.202484130859,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "31a9971.ad96268"\r
+                "ea983e85.321ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "199fe1ad.b53f66",\r
+        "id": "21c0ccb3.89b3cc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
         "comments": "",\r
         "x": 4706.317138671875,\r
-        "y": 5720.916717529297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5695.202484130859,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "802c1097.dcd94",\r
+        "id": "11ee9928.b9a3cf",\r
         "type": "set",\r
         "name": "set tmp.rootconn.",\r
         "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 5138.3173828125,\r
-        "y": 5615.916717529297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5590.202484130859,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8e64de53.2c9fe8",\r
+        "id": "3a447acf.2b1f0e",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 4540.734130859375,\r
-        "y": 5212.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5186.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a2022ff9.9bc538",\r
+        "id": "93e60704.65dbd",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4311.734130859375,\r
-        "y": 5301.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5275.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8e64de53.2c9fe8",\r
-                "2a874f25.a11e68"\r
+                "3a447acf.2b1f0e",\r
+                "a0d0d144.703df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a874f25.a11e68",\r
+        "id": "a0d0d144.703df8",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4547.734130859375,\r
-        "y": 5294.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5268.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "42e4546b.7efc04",\r
-                "8902c91a.a1454",\r
-                "2a8da0f.130cae"\r
+                "93bdcc8d.eca238",\r
+                "76b31045.74e9",\r
+                "e9dc2865.72e928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42e4546b.7efc04",\r
+        "id": "93bdcc8d.eca238",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4743.2342529296875,\r
-        "y": 5246.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5220.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "374d8.3341eb28c"\r
+                "87ddaf65.395498"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8902c91a.a1454",\r
+        "id": "76b31045.74e9",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4735.2342529296875,\r
-        "y": 5301.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5275.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1ff3bcec.a42b9b"\r
+                "fe3d7591.8ed12"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "374d8.3341eb28c",\r
+        "id": "87ddaf65.395498",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -4919,219 +4919,219 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4887.6165771484375,\r
-        "y": 5245.8560791015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5220.141845703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ec0686db.c1a878"\r
+                "ad455c8f.ae00e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec0686db.c1a878",\r
+        "id": "ad455c8f.ae00e8",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5071.734130859375,\r
-        "y": 5244.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5218.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d4462e32.3100d8"\r
+                "d25e267a.3e533"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4462e32.3100d8",\r
+        "id": "d25e267a.3e533",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5266.734130859375,\r
-        "y": 5244.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5218.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3a9e0096.e3a448"\r
+                "93445f98.6a2b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a8da0f.130cae",\r
+        "id": "e9dc2865.72e928",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4740.2342529296875,\r
-        "y": 5358.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5332.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "17a678b2.952aef"\r
+                "d3c476f6.a94bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17a678b2.952aef",\r
+        "id": "d3c476f6.a94bf",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4892.2342529296875,\r
-        "y": 5359.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5333.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1ff3bcec.a42b9b",\r
+        "id": "fe3d7591.8ed12",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4903.2342529296875,\r
-        "y": 5302.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5276.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "318d00c4.ca52c",\r
+        "id": "a6955939.7a731",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5648.734130859375,\r
-        "y": 5248.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5222.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "46db4a25.4363a4",\r
-                "34953acc.5d5dc6",\r
-                "9de681b9.d85948"\r
+                "9484e895.44a448",\r
+                "50aee0a4.445958",\r
+                "f7a12344.c8bde8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3a9e0096.e3a448",\r
+        "id": "93445f98.6a2b88",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5469.734130859375,\r
-        "y": 5248.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5222.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "318d00c4.ca52c"\r
+                "a6955939.7a731"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34953acc.5d5dc6",\r
+        "id": "50aee0a4.445958",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5854.734130859375,\r
-        "y": 5261.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5235.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a1306b3e.752188",\r
-                "af1e227.d98756",\r
-                "c7dc9a0c.c1a12"\r
+                "1af8bb44.7d7ad5",\r
+                "48532c3d.63b2f4",\r
+                "af6d67e.1e33f98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "46db4a25.4363a4",\r
+        "id": "9484e895.44a448",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 5884.734130859375,\r
-        "y": 5209.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5183.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1306b3e.752188",\r
+        "id": "1af8bb44.7d7ad5",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6064.734130859375,\r
-        "y": 5252.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5226.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c17f0a30.28a8c"\r
+                "751438ac.f3ea9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af1e227.d98756",\r
+        "id": "48532c3d.63b2f4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6056.734130859375,\r
-        "y": 5307.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5281.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f59cff5b.1a7268"\r
+                "1ab525ea.2aee0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7dc9a0c.c1a12",\r
+        "id": "af6d67e.1e33f98",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6061.734130859375,\r
-        "y": 5364.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5338.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "18fa3a10.34d806"\r
+                "658bf37d.2cc724"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18fa3a10.34d806",\r
+        "id": "658bf37d.2cc724",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 6213.734130859375,\r
-        "y": 5365.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5339.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f59cff5b.1a7268",\r
+        "id": "1ab525ea.2aee0a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 6224.734130859375,\r
-        "y": 5310.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5284.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c17f0a30.28a8c",\r
+        "id": "751438ac.f3ea9",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -5139,82 +5139,82 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 6209.116455078125,\r
-        "y": 5249.8560791015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5224.141845703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7a04be69.78c07"\r
+                "3d7e0062.7d2af"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a04be69.78c07",\r
+        "id": "3d7e0062.7d2af",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 6423.734130859375,\r
-        "y": 5246.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5220.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9de681b9.d85948",\r
+        "id": "f7a12344.c8bde8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 5804.734130859375,\r
-        "y": 5325.200408935547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5299.486175537109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "702c8bba.ca32ac",\r
+        "id": "8b3d1eff.18e008",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4453.234375,\r
-        "y": 5405.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5380.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b53a2357.cb19f",\r
-                "1f266f6e.997129"\r
+                "ee0f617b.5bd02",\r
+                "8e2d6022.079658"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b53a2357.cb19f",\r
+        "id": "ee0f617b.5bd02",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4813.734130859375,\r
-        "y": 5413.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5388.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1f814603.8b079a"\r
+                "e5f9197d.04b6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f814603.8b079a",\r
+        "id": "e5f9197d.04b6c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4971.734130859375,\r
-        "y": 5413.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5388.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3ef4bb2e.ea4704",\r
+        "id": "b5f90852.29b69",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
@@ -5222,97 +5222,97 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4975.234130859375,\r
-        "y": 5453.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5428.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1f266f6e.997129",\r
+        "id": "8e2d6022.079658",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4817.734130859375,\r
-        "y": 5453.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5428.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3ef4bb2e.ea4704"\r
+                "b5f90852.29b69"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4cb994af.f28aac",\r
+        "id": "ffe0ea3.8a4d998",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5126.451171875,\r
-        "y": 5667.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5642.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "37db8c04.dcc65c",\r
-                "e00788f7.d2c01"\r
+                "6146efb2.cf13d",\r
+                "9351cf54.365048"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e00788f7.d2c01",\r
+        "id": "9351cf54.365048",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5368.450927734375,\r
-        "y": 5617.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5592.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "bd67e663.b6cc68",\r
-                "6a96c9e9.f60f08",\r
-                "24f63010.71743"\r
+                "d35be3cf.cc2028",\r
+                "74f2b735.4a4b38",\r
+                "4e1edc90.74b29c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd67e663.b6cc68",\r
+        "id": "d35be3cf.cc2028",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5563.951171875,\r
-        "y": 5551.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5526.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9c952b2f.2e4c48"\r
+                "8c6be2ce.3abef8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6a96c9e9.f60f08",\r
+        "id": "74f2b735.4a4b38",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5559.951171875,\r
-        "y": 5607.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5582.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "72760d9d.ebda64"\r
+                "17a91916.50ea6f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c952b2f.2e4c48",\r
+        "id": "8c6be2ce.3abef8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -5320,114 +5320,114 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5708.3333740234375,\r
-        "y": 5569.4556884765625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5543.741455078125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "27765347.4a6a3c"\r
+                "41f50adf.154854"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27765347.4a6a3c",\r
+        "id": "41f50adf.154854",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5892.450927734375,\r
-        "y": 5567.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5542.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cd6a7530.d2bb8"\r
+                "92f6a716.223fa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "24f63010.71743",\r
+        "id": "4e1edc90.74b29c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5569.951171875,\r
-        "y": 5652.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5627.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a1473e64.1f4fc8"\r
+                "9e924b4c.b75db"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1473e64.1f4fc8",\r
+        "id": "9e924b4c.b75db",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 5748.951171875,\r
-        "y": 5668.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5643.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "72760d9d.ebda64",\r
+        "id": "17a91916.50ea6f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 5730.951171875,\r
-        "y": 5620.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5595.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b65e14dd.2b2b98",\r
+        "id": "21c4fa1a.b93b46",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete UNI of ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5279.951171875,\r
-        "y": 5723.399627685547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5697.685394287109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f4d26e19.4a33a",\r
-                "2b318383.32132c"\r
+                "95033c2a.09c67",\r
+                "f1a877c4.a203d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f4d26e19.4a33a",\r
+        "id": "95033c2a.09c67",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5628.451171875,\r
-        "y": 5705.399627685547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5679.685394287109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cc266f68.3170a8"\r
+                "76c41eff.4cfe88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc266f68.3170a8",\r
+        "id": "76c41eff.4cfe88",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 5884.451171875,\r
-        "y": 5708.399627685547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5682.685394287109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e9302632.da2fb8",\r
+        "id": "eb3b6335.123de8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
@@ -5435,190 +5435,190 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5836.951171875,\r
-        "y": 5749.399627685547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5723.685394287109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2b318383.32132c",\r
+        "id": "f1a877c4.a203d8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5638.451171875,\r
-        "y": 5754.399627685547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5728.685394287109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e9302632.da2fb8"\r
+                "eb3b6335.123de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37db8c04.dcc65c",\r
+        "id": "6146efb2.cf13d",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 5361.450927734375,\r
-        "y": 5535.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5510.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd6a7530.d2bb8",\r
+        "id": "92f6a716.223fa8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6087.450927734375,\r
-        "y": 5567.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5542.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "40d39185.b5e49"\r
+                "bd55517c.f87f1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96e4f3b6.f5cd5",\r
+        "id": "8bf8b16.3c18f5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 6469.450927734375,\r
-        "y": 5571.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5546.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4ecdd233.2c761c",\r
-                "4b4d74a7.6aa104",\r
-                "563a66cd.e07e68"\r
+                "1bd48f8a.cba628",\r
+                "1ea10909.ec8b57",\r
+                "ecac1508.b763"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40d39185.b5e49",\r
+        "id": "bd55517c.f87f1",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6290.450927734375,\r
-        "y": 5571.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5546.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "96e4f3b6.f5cd5"\r
+                "8bf8b16.3c18f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b4d74a7.6aa104",\r
+        "id": "1ea10909.ec8b57",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6675.450927734375,\r
-        "y": 5584.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5559.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5212e394.a625ac",\r
-                "8a0a8abd.557d58",\r
-                "fe612827.fce1d"\r
+                "830127bc.8c4c18",\r
+                "adc00906.538428",\r
+                "5c009e0.e4c98e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ecdd233.2c761c",\r
+        "id": "1bd48f8a.cba628",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 6705.450927734375,\r
-        "y": 5532.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5507.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5212e394.a625ac",\r
+        "id": "830127bc.8c4c18",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6885.450927734375,\r
-        "y": 5575.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5550.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "22d6ab8e.b3d594"\r
+                "ea1d97d5.52d0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a0a8abd.557d58",\r
+        "id": "adc00906.538428",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6877.450927734375,\r
-        "y": 5630.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5605.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d2e549e.aa0e038"\r
+                "283c974a.c2fc28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe612827.fce1d",\r
+        "id": "5c009e0.e4c98e4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 6882.450927734375,\r
-        "y": 5687.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5662.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "18a7205c.94ea5"\r
+                "dbf169ab.c4c478"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18a7205c.94ea5",\r
+        "id": "dbf169ab.c4c478",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 7034.450927734375,\r
-        "y": 5688.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5663.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2e549e.aa0e038",\r
+        "id": "283c974a.c2fc28",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 7045.450927734375,\r
-        "y": 5633.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5608.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "22d6ab8e.b3d594",\r
+        "id": "ea1d97d5.52d0a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -5626,38 +5626,38 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 7029.833251953125,\r
-        "y": 5573.4556884765625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5547.741455078125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c312e16c.c44d58"\r
+                "eea057d1.d2c178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c312e16c.c44d58",\r
+        "id": "eea057d1.d2c178",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 7244.450927734375,\r
-        "y": 5569.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5544.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "563a66cd.e07e68",\r
+        "id": "ecac1508.b763",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 6625.450927734375,\r
-        "y": 5648.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5623.085784912109,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc595a48.1912e8",\r
+        "id": "e8fee7bd.fc2ef8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -5665,77 +5665,77 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 3854.88330078125,\r
-        "y": 3537.999969482422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3512.2857360839844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "eec6a040.1af03",\r
-                "d560f701.2c7f08"\r
+                "4b07eb9e.ad1084",\r
+                "449a6f75.ecc4d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eec6a040.1af03",\r
+        "id": "4b07eb9e.ad1084",\r
         "type": "set",\r
         "name": "set tmp.mmUNI-id-long",\r
         "xml": "<set>\n<parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",\r
         "comments": "",\r
         "x": 4045.466552734375,\r
-        "y": 3480.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3455.0857849121094,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d560f701.2c7f08",\r
+        "id": "449a6f75.ecc4d",\r
         "type": "switchNode",\r
         "name": "switch tmp.mmUNI-id-long != ROOT UNI",\r
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4092.466552734375,\r
-        "y": 3551.800018310547,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3526.0857849121094,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "70d2875.2f53ff8",\r
-                "b1bb56dc.337f2"\r
+                "a5622a5e.b03c68",\r
+                "1b2b72f4.a20bdd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70d2875.2f53ff8",\r
+        "id": "a5622a5e.b03c68",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4330.884033203125,\r
-        "y": 3510.999969482422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3485.2857360839844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f216f825.2991a8"\r
+                "d22a60e2.fd2778"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b1bb56dc.337f2",\r
+        "id": "1b2b72f4.a20bdd",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4337.884246826172,\r
-        "y": 3567.9999389648438,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3542.2857055664062,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "28b93260.26eace"\r
+                "b7814ecb.1580d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f216f825.2991a8",\r
+        "id": "d22a60e2.fd2778",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -5743,126 +5743,126 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4458.884521484375,\r
-        "y": 3506.999969482422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3481.2857360839844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b9e9be73.6c3be",\r
+        "id": "3c679d7f.fbbb22",\r
         "type": "set",\r
         "name": "set tmp.MMonlyHasROOT to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",\r
         "comments": "",\r
         "x": 3314.083251953125,\r
-        "y": 3465.400115966797,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3439.6858825683594,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d7647a1a.599238",\r
+        "id": "da386631.67d8c8",\r
         "type": "set",\r
         "name": "set tmp.MMonlyHasROOT to FALSE",\r
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",\r
         "comments": "",\r
         "x": 5295.91748046875,\r
-        "y": 3467.400146484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3441.6859130859375,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1414f243.3459be",\r
+        "id": "5fa67fdd.e511b8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4407.6669921875,\r
-        "y": 3987.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3961.9024353027344,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "45f92202.e9d224",\r
-                "9274acbb.bb64f"\r
+                "a814439f.bac2e",\r
+                "f8d770ba.37d44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45f92202.e9d224",\r
+        "id": "a814439f.bac2e",\r
         "type": "set",\r
         "name": "set tmp.uni.id",\r
         "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",\r
         "comments": "",\r
         "x": 4580.5498046875,\r
-        "y": 3983.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3957.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9274acbb.bb64f",\r
+        "id": "f8d770ba.37d44",\r
         "type": "save",\r
         "name": "get uni from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4583.5498046875,\r
-        "y": 4030.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4004.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4b44a73a.87e16",\r
-                "13d9fc09.409024",\r
-                "52115c05.c8dcf4"\r
+                "7fc95f5b.ec381",\r
+                "28603ae9.d6e726",\r
+                "f736ad43.136778"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b44a73a.87e16",\r
+        "id": "7fc95f5b.ec381",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4755.5498046875,\r
-        "y": 4014.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3988.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "40f66b99.edebbc"\r
+                "47e06d70.96544c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13d9fc09.409024",\r
+        "id": "28603ae9.d6e726",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4756.040771484375,\r
-        "y": 4059.850372314453,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4034.1361389160156,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "52115c05.c8dcf4",\r
+        "id": "f736ad43.136778",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4756.5498046875,\r
-        "y": 4100.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4074.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "40f66b99.edebbc",\r
+        "id": "47e06d70.96544c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -5870,165 +5870,165 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4916.5498046875,\r
-        "y": 4010.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3984.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "de7bc652.3681b8",\r
-                "eebe95d8.077038",\r
-                "efb01679.580728"\r
+                "db3d2916.05167",\r
+                "b1e93bbf.154be8",\r
+                "2727d594.264d9a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f38b6801.52bee8",\r
+        "id": "3055c73f.990de",\r
         "type": "comment",\r
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",\r
         "info": "",\r
         "comments": "",\r
         "x": 5249.5498046875,\r
-        "y": 3941.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3915.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eebe95d8.077038",\r
+        "id": "b1e93bbf.154be8",\r
         "type": "execute",\r
         "name": "execute split id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5184.5498046875,\r
-        "y": 3998.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3972.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "20f99809.a45e68",\r
-                "f98fd083.5f84c"\r
+                "8ed99d07.46ccf",\r
+                "dfad78a0.2e2798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f98fd083.5f84c",\r
+        "id": "dfad78a0.2e2798",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5407.5498046875,\r
-        "y": 3984.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3958.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e9001fe4.5ec9"\r
+                "40b7643c.aa9b44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20f99809.a45e68",\r
+        "id": "8ed99d07.46ccf",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5409.5498046875,\r
-        "y": 4017.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3991.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c4ea9853.8f7b9"\r
+                "2c3f5774.427218"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9001fe4.5ec9",\r
+        "id": "40b7643c.aa9b44",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5555.5498046875,\r
-        "y": 3977.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3951.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "efdb6ef0.5c83c"\r
+                "49b755b0.ff456c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c4ea9853.8f7b9",\r
+        "id": "2c3f5774.427218",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 5552.5498046875,\r
-        "y": 4014.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3988.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "efdb6ef0.5c83c",\r
+        "id": "49b755b0.ff456c",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 5732.5498046875,\r
-        "y": 3977.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3951.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "de7bc652.3681b8",\r
+        "id": "db3d2916.05167",\r
         "type": "switchNode",\r
         "name": "switch uni-tp-id-node-part is the same as the LEAF node",\r
         "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5228.5498046875,\r
-        "y": 4132.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4106.562103271484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7639ee60.41df3",\r
-                "7e06cc80.35387c"\r
+                "76a8963f.4621b8",\r
+                "22179ab4.cea27e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7639ee60.41df3",\r
+        "id": "76a8963f.4621b8",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5509.5498046875,\r
-        "y": 4109.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4083.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d6573f78.845c78"\r
+                "cdc60b24.0ad9a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7e06cc80.35387c",\r
+        "id": "22179ab4.cea27e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5502.5498046875,\r
-        "y": 4168.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4142.562103271484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "14bc3378.1253a5"\r
+                "5846229.a88c65c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6573f78.845c78",\r
+        "id": "cdc60b24.0ad9a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -6036,14 +6036,14 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5639.5498046875,\r
-        "y": 4113.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4087.5621032714844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "14bc3378.1253a5",\r
+        "id": "5846229.a88c65c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -6051,276 +6051,276 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5644.5498046875,\r
-        "y": 4167.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4141.562103271484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f0b195ca.19df6",\r
-                "fec7cdec.3f23"\r
+                "a9c7c427.af4688",\r
+                "fe9fa034.5cb01"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0b195ca.19df6",\r
+        "id": "a9c7c427.af4688",\r
         "type": "set",\r
         "name": "set no-pce-call",\r
         "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",\r
         "comments": "",\r
         "x": 5836.5498046875,\r
-        "y": 4134.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4108.562103271484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "14cfe3f0.60188c",\r
+        "id": "98a16c7e.29ab68",\r
         "type": "set",\r
         "name": "set middle-man-conn",\r
         "xml": "<set>\n<parameter name='middle-man-conn.' value='`$tmp.aai.all-connectivities.connectivity[$connidx].`' />\n",\r
         "comments": "",\r
         "x": 5852.5498046875,\r
-        "y": 4186.276336669922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4160.562103271484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fec7cdec.3f23",\r
+        "id": "fe9fa034.5cb01",\r
         "type": "set",\r
         "name": "set tmp.stillHasUni and tmp.keepVPNBs to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n<parameter name='tmp.keepVPNBs' value='true' />\n",\r
         "comments": "",\r
         "x": 5870.83349609375,\r
-        "y": 4255.866668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4230.152435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "efb01679.580728",\r
+        "id": "2727d594.264d9a",\r
         "type": "set",\r
         "name": "set tmp.stillHasUni to TRUE",\r
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",\r
         "comments": "",\r
         "x": 5147.533203125,\r
-        "y": 4081.766571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4056.0523376464844,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "16d898b2.82d4af",\r
+        "id": "c0a1014a.3ea75",\r
         "type": "switchNode",\r
         "name": "switch tmp.stillHasUni?",\r
         "xml": "\n<switch test=\"`$tmp.stillHasUni`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 383.7339172363281,\r
-        "y": 5351.966278076172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5326.252044677734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2ef37de6.fb696a",\r
-                "d4b46a3b.e544d"\r
+                "5bc4629f.a764e4",\r
+                "36ea940e.f6b704"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb7a24ed.4756b",\r
+        "id": "529ae160.378f78",\r
         "type": "save",\r
         "name": "get root uni from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4288.516357421875,\r
-        "y": 5515.850067138672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5490.135833740234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b93cd05c.18e338",\r
-                "28c478b5.8c3cf",\r
-                "ad4069fd.35ec2"\r
+                "e3e4b7ad.cfce5",\r
+                "2311d61f.89de52",\r
+                "cab68c6b.abd21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd789bfb.94ca8",\r
+        "id": "2b4c8a8a.8bc066",\r
         "type": "comment",\r
         "name": "Update ROOT UNI's bw -- ALREADY DONE",\r
         "info": "",\r
         "comments": "",\r
         "x": 4286.516845703125,\r
-        "y": 5467.850311279297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5442.136077880859,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f7d2d4f8.f1e648",\r
+        "id": "89e149ab.f2e7c8",\r
         "type": "save",\r
         "name": "update ROOT UNI in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4903.5166015625,\r
-        "y": 5585.850311279297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5560.136077880859,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "28c478b5.8c3cf",\r
+        "id": "2311d61f.89de52",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4506.007568359375,\r
-        "y": 5486.424285888672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5460.710052490234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4927866f.a84e1"\r
+                "983c2552.f1f49"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad4069fd.35ec2",\r
+        "id": "cab68c6b.abd21",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4501.5166015625,\r
-        "y": 5530.850250244141,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5505.136016845703,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c4a31719.674e"\r
+                "62a8aa1.663f1d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4927866f.a84e1",\r
+        "id": "983c2552.f1f49",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4668.5791015625,\r
-        "y": 5485.709991455078,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5459.995758056641,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c4a31719.674e",\r
+        "id": "62a8aa1.663f1d4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4669.5166015625,\r
-        "y": 5530.850250244141,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5505.136016845703,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f08cda49.ab7188",\r
+        "id": "d78e13a5.01de9",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4666.5166015625,\r
-        "y": 5580.850311279297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5555.136077880859,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ed324322.59277",\r
-                "f7d2d4f8.f1e648"\r
+                "7bde7792.d9b138",\r
+                "89e149ab.f2e7c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b93cd05c.18e338",\r
+        "id": "e3e4b7ad.cfce5",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4497.5166015625,\r
-        "y": 5580.850311279297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5555.136077880859,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f08cda49.ab7188"\r
+                "d78e13a5.01de9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed324322.59277",\r
+        "id": "7bde7792.d9b138",\r
         "type": "set",\r
         "name": "set new bw",\r
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",\r
         "comments": "",\r
         "x": 4859.517578125,\r
-        "y": 5505.850311279297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5480.136077880859,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "61d36925.a62e",\r
+        "id": "cf4ce975.93215",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 5288.216796875,\r
-        "y": 5443.616912841797,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5417.902679443359,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "31a9971.ad96268",\r
+        "id": "ea983e85.321ce",\r
         "type": "save",\r
         "name": "update ROOT connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5314,\r
-        "y": 5485.817108154297,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5460.102874755859,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2ef37de6.fb696a",\r
+        "id": "5bc4629f.a764e4",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 567.8836059570312,\r
-        "y": 5402.999969482422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5377.285736083984,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "97fb2b7.67063d8"\r
+                "867bdfac.94705"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4b46a3b.e544d",\r
+        "id": "36ea940e.f6b704",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 550.883544921875,\r
-        "y": 5324.999969482422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5299.285736083984,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d28cabbc.30ca5"\r
+                "ab9e57cf.8ef448"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a0919d1.fbc9d8",\r
+        "id": "eb7859d4.8fd35",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -6328,122 +6328,122 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 679.8833923339844,\r
-        "y": 4411.999694824219,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4386.285461425781,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "551f2a9f.a9466c",\r
-                "6f7adb55.d0de94",\r
-                "7279f474.ca532c",\r
-                "c28774e0.0f37e8",\r
-                "fd804c17.d00668",\r
-                "6504876a.65a0e",\r
-                "d39caf18.6babe"\r
+                "8a11a728.e1b1d8",\r
+                "7438f980.400318",\r
+                "6c2db8ea.27724",\r
+                "a48617f3.9f6e4",\r
+                "5ff63bef.c5afdc",\r
+                "78f62ea.0af84d",\r
+                "d07ac0db.fa9818"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "551f2a9f.a9466c",\r
+        "id": "8a11a728.e1b1d8",\r
         "type": "set",\r
         "name": "set tmp.leafconn.",\r
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",\r
         "comments": "",\r
         "x": 931.5667419433594,\r
-        "y": 4390.049499511719,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4364.335266113281,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1a5de4c8.98ba3b",\r
+        "id": "8aa064fb.543668",\r
         "type": "comment",\r
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",\r
         "info": "",\r
         "comments": "",\r
         "x": 1033.1338806152344,\r
-        "y": 4338.132995605469,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4312.418762207031,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "35555086.07bd08",\r
+        "id": "821af189.946d58",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 1140.9837341308594,\r
-        "y": 4419.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4393.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6f7adb55.d0de94",\r
+        "id": "7438f980.400318",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 911.9837341308594,\r
-        "y": 4508.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4482.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "35555086.07bd08",\r
-                "f6475b04.522d68"\r
+                "821af189.946d58",\r
+                "139cfd47.53e94b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6475b04.522d68",\r
+        "id": "139cfd47.53e94b",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1147.9837341308594,\r
-        "y": 4501.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4475.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d9d0b846.fc4eb",\r
-                "859bebef.e15268",\r
-                "82bf3fe2.ca776"\r
+                "df64900d.741c98",\r
+                "681e1ffc.26592",\r
+                "ab39d1b3.416b58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9d0b846.fc4eb",\r
+        "id": "df64900d.741c98",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1343.4838562011719,\r
-        "y": 4453.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4427.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "54e66745.d0a218"\r
+                "6f395e40.dc6b7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "859bebef.e15268",\r
+        "id": "681e1ffc.26592",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1335.4838562011719,\r
-        "y": 4508.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4482.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6c2244a0.55dae4"\r
+                "b25568a6.369d78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "54e66745.d0a218",\r
+        "id": "6f395e40.dc6b7",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -6451,180 +6451,180 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1487.8661804199219,\r
-        "y": 4452.988861083984,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4427.274627685547,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c5450793.0d4ff8"\r
+                "94a27fe.8c889"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5450793.0d4ff8",\r
+        "id": "94a27fe.8c889",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1671.9837341308594,\r
-        "y": 4451.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4425.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8c14dfae.797ac"\r
+                "b448ea96.4c3af8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c14dfae.797ac",\r
+        "id": "b448ea96.4c3af8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1866.9837341308594,\r
-        "y": 4451.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4425.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2cd4e727.640d2"\r
+                "77dc6e4f.3fb428"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82bf3fe2.ca776",\r
+        "id": "ab39d1b3.416b58",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1340.4838562011719,\r
-        "y": 4565.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4539.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1f28baf3.4c601d"\r
+                "42bc5c1d.fe55cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f28baf3.4c601d",\r
+        "id": "42bc5c1d.fe55cc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 1492.4838562011719,\r
-        "y": 4566.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4540.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6c2244a0.55dae4",\r
+        "id": "b25568a6.369d78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 1503.4838562011719,\r
-        "y": 4509.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4483.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c7d8a4a1.11fab",\r
+        "id": "80f1bf38.0bc68",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2248.9837341308594,\r
-        "y": 4455.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4429.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "51d3a91c.c42e68",\r
-                "d0954d9b.2799a8",\r
-                "454e24ff.d6924c"\r
+                "cad7009f.f83538",\r
+                "d1a2dd14.715a78",\r
+                "689fc80.c15b238"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cd4e727.640d2",\r
+        "id": "77dc6e4f.3fb428",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2069.9837341308594,\r
-        "y": 4455.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4429.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c7d8a4a1.11fab"\r
+                "80f1bf38.0bc68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7279f474.ca532c",\r
+        "id": "6c2db8ea.27724",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1053.4839782714844,\r
-        "y": 4612.932800292969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4587.218566894531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "63493229.c5487c",\r
-                "9b59a379.ae234"\r
+                "c3b5c5e7.57693",\r
+                "cf1b7699.e71658"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9b59a379.ae234",\r
+        "id": "cf1b7699.e71658",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1417.9837341308594,\r
-        "y": 4660.932800292969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4635.218566894531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7641260e.a4325"\r
+                "723bcced.729e54"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63493229.c5487c",\r
+        "id": "c3b5c5e7.57693",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1413.9837341308594,\r
-        "y": 4620.932800292969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4595.218566894531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3e92540.7763d2c"\r
+                "408278c5.7e5798"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e92540.7763d2c",\r
+        "id": "408278c5.7e5798",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 1571.9837341308594,\r
-        "y": 4620.932800292969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4595.218566894531,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7641260e.a4325",\r
+        "id": "723bcced.729e54",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
@@ -6632,113 +6632,113 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1575.4837341308594,\r
-        "y": 4660.932800292969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4635.218566894531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d0954d9b.2799a8",\r
+        "id": "d1a2dd14.715a78",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2454.9837341308594,\r
-        "y": 4468.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4442.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "53623639.5d8eb",\r
-                "11f800c8.cf014f",\r
-                "e0ce2e99.74a758"\r
+                "e07edffa.c89278",\r
+                "8645511b.c4b66",\r
+                "a8a5443b.9b8a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51d3a91c.c42e68",\r
+        "id": "cad7009f.f83538",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 2484.9837341308594,\r
-        "y": 4416.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4390.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "53623639.5d8eb",\r
+        "id": "e07edffa.c89278",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2664.9837341308594,\r
-        "y": 4459.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4433.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "73587898.c5bc6"\r
+                "cb5c9c8e.bb8ed8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "11f800c8.cf014f",\r
+        "id": "8645511b.c4b66",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2656.9837341308594,\r
-        "y": 4514.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4488.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7759dd63.3c0bd4"\r
+                "29fe474c.df75c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0ce2e99.74a758",\r
+        "id": "a8a5443b.9b8a2",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2661.9837341308594,\r
-        "y": 4571.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4545.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "29744fd6.f0a3"\r
+                "b28b1e53.869fb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "29744fd6.f0a3",\r
+        "id": "b28b1e53.869fb",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 2813.9837341308594,\r
-        "y": 4572.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4546.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7759dd63.3c0bd4",\r
+        "id": "29fe474c.df75c8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 2824.9837341308594,\r
-        "y": 4517.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4491.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "73587898.c5bc6",\r
+        "id": "cb5c9c8e.bb8ed8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -6746,101 +6746,101 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 2809.3660583496094,\r
-        "y": 4456.988861083984,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4431.274627685547,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2b6c0b59.4c3f54"\r
+                "a908cc9.5d7f7b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b6c0b59.4c3f54",\r
+        "id": "a908cc9.5d7f7b",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 3023.9837341308594,\r
-        "y": 4453.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4427.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "454e24ff.d6924c",\r
+        "id": "689fc80.c15b238",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 2404.9837341308594,\r
-        "y": 4532.333190917969,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4506.618957519531,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c28774e0.0f37e8",\r
+        "id": "a48617f3.9f6e4",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1082.5667419433594,\r
-        "y": 4833.049499511719,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4807.335266113281,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fd804c17.d00668",\r
+        "id": "5ff63bef.c5afdc",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 897.5667419433594,\r
-        "y": 4900.049499511719,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4874.335266113281,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c90d3790.0c31f",\r
-                "b432c8fe.988cb"\r
+                "bcfca35c.21654",\r
+                "62c7d864.119b88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c90d3790.0c31f",\r
+        "id": "bcfca35c.21654",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1162.5667419433594,\r
-        "y": 4885.049499511719,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4859.335266113281,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b12f48c6.75129"\r
+                "f4258877.5e35f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b432c8fe.988cb",\r
+        "id": "62c7d864.119b88",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1158.5667419433594,\r
-        "y": 4933.049499511719,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4907.335266113281,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7a2784c6.a60bf4"\r
+                "3fb79094.abfaa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b12f48c6.75129",\r
+        "id": "f4258877.5e35f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -6848,66 +6848,66 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1318.5667419433594,\r
-        "y": 4881.049499511719,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4855.335266113281,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b537e67c.ce751"\r
+                "2140ac57.1e83f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a2784c6.a60bf4",\r
+        "id": "3fb79094.abfaa8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
         "comments": "",\r
         "x": 1306.5667419433594,\r
-        "y": 4928.049499511719,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4902.335266113281,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b301854.48435",\r
+        "id": "8db3fd20.37f318",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 1587.4664001464844,\r
-        "y": 4831.749694824219,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4806.035461425781,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b537e67c.ce751",\r
+        "id": "2140ac57.1e83f4",\r
         "type": "save",\r
         "name": "update ROOT connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1613.2496032714844,\r
-        "y": 4873.949890136719,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4848.235656738281,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "46575909.129948",\r
+        "id": "440b33d.dbb8acc",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1026.8833923339844,\r
-        "y": 4147.316589355469,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4121.602355957031,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d28cabbc.30ca5",\r
+        "id": "ab9e57cf.8ef448",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -6915,17 +6915,17 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 632.8834228515625,\r
-        "y": 4151.999725341797,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4126.285491943359,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "46575909.129948",\r
-                "4a0919d1.fbc9d8"\r
+                "440b33d.dbb8acc",\r
+                "eb7859d4.8fd35"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "97fb2b7.67063d8",\r
+        "id": "867bdfac.94705",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -6933,175 +6933,175 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 716.3333740234375,\r
-        "y": 5404.516571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5378.802337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8c98b36e.448bc8",\r
-                "4b4a8b6f.30cb4c",\r
-                "232ef942.027ea6",\r
-                "9956c6b0.e8f5b"\r
+                "c644609d.44bce",\r
+                "e7413115.aec04",\r
+                "d006cbe4.5a677",\r
+                "c786893c.7012b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c98b36e.448bc8",\r
+        "id": "c644609d.44bce",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1077.7166748046875,\r
-        "y": 5167.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5141.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "4b4a8b6f.30cb4c",\r
+        "id": "e7413115.aec04",\r
         "type": "save",\r
         "name": "delete LEAF connectivity resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 988.7166748046875,\r
-        "y": 5236.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5210.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "232ef942.027ea6",\r
+        "id": "d006cbe4.5a677",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 879.88330078125,\r
-        "y": 5471.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5445.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3ef7ef40.ec34",\r
-                "afe6825d.3e4ed8",\r
-                "56fc7b03.ef7a34"\r
+                "614e61f8.50b5f",\r
+                "96d6a1ec.c795b",\r
+                "90aff610.9959f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f4e88cb.a2731",\r
+        "id": "7ca77be7.05ec8c",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2588.882568359375,\r
-        "y": 5396.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5370.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4a46c897.331cf",\r
-                "c619cf4e.8ea4f8",\r
-                "c904c4c1.6a362"\r
+                "a9496568.146b9",\r
+                "c5f96edd.835cb8",\r
+                "e018fe0a.acb8a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c656ce5c.18cf6",\r
+        "id": "b9815115.2c557",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 2538.882568359375,\r
-        "y": 5460.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5434.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c0938886.470a7",\r
+        "id": "d05f3809.7521c8",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 2618.882568359375,\r
-        "y": 5344.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5318.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4a46c897.331cf",\r
+        "id": "a9496568.146b9",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2906.8826904296875,\r
-        "y": 5327.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5301.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a7e4d7d8.d8bee"\r
+                "b7511521.12ea3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c619cf4e.8ea4f8",\r
+        "id": "c5f96edd.835cb8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2898.8826904296875,\r
-        "y": 5382.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5356.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8289ee53.c79808"\r
+                "d009936c.baaf78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c904c4c1.6a362",\r
+        "id": "e018fe0a.acb8a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2903.8826904296875,\r
-        "y": 5439.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5413.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6baa18e0.e89e88"\r
+                "a8c24324.12cd38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6baa18e0.e89e88",\r
+        "id": "a8c24324.12cd38",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3055.8826904296875,\r
-        "y": 5440.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5414.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8289ee53.c79808",\r
+        "id": "d009936c.baaf78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3066.8826904296875,\r
-        "y": 5385.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5359.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a7e4d7d8.d8bee",\r
+        "id": "b7511521.12ea3",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -7109,86 +7109,86 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 3051.2650146484375,\r
-        "y": 5325.172271728516,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5299.458038330078,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ec15425b.c6de8"\r
+                "87c431c3.fca34"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec15425b.c6de8",\r
+        "id": "87c431c3.fca34",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 3265.8826904296875,\r
-        "y": 5321.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5295.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3ef7ef40.ec34",\r
+        "id": "614e61f8.50b5f",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 1161.88330078125,\r
-        "y": 5340.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5314.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4339be5.b80c5",\r
+        "id": "c0a00c52.f1e878",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1372.3834228515625,\r
-        "y": 5479.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5453.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1127f42a.b3bf34"\r
+                "a9f88f76.4444c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2e74a78.3df33d8",\r
+        "id": "62d1e19f.b39a2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1375.3834228515625,\r
-        "y": 5367.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5341.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5612018f.6df8"\r
+                "957f349.e76e4c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70a06659.f7e26",\r
+        "id": "b9cbc6ac.26846",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1367.3834228515625,\r
-        "y": 5422.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5396.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f549eabc.91dae8"\r
+                "48a6f350.0417c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5612018f.6df8",\r
+        "id": "957f349.e76e4c8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -7196,182 +7196,182 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1509.765625,\r
-        "y": 5362.17236328125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5336.4581298828125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e700427f.a90ed"\r
+                "d4741dab.7b5f78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1127f42a.b3bf34",\r
+        "id": "a9f88f76.4444c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 1524.3834228515625,\r
-        "y": 5480.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5454.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f549eabc.91dae8",\r
+        "id": "48a6f350.0417c4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 1535.3834228515625,\r
-        "y": 5423.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5397.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e700427f.a90ed",\r
+        "id": "d4741dab.7b5f78",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1696.8828125,\r
-        "y": 5363.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5337.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5799adae.feee0c"\r
+                "93c0e1e7.1663a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5799adae.feee0c",\r
+        "id": "93c0e1e7.1663a8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1924.8828125,\r
-        "y": 5356.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5330.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1e23480b.f981d8"\r
+                "eb0c27f.1616058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "afe6825d.3e4ed8",\r
+        "id": "96d6a1ec.c795b",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1179.88330078125,\r
-        "y": 5415.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5389.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a4339be5.b80c5",\r
-                "2e74a78.3df33d8",\r
-                "70a06659.f7e26"\r
+                "c0a00c52.f1e878",\r
+                "62d1e19f.b39a2",\r
+                "b9cbc6ac.26846"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e23480b.f981d8",\r
+        "id": "eb0c27f.1616058",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2130.8828125,\r
-        "y": 5353.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5327.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "82b93b0b.3752a"\r
+                "63e7e6f3.2a24f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82b93b0b.3752a",\r
+        "id": "63e7e6f3.2a24f",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2345.8822021484375,\r
-        "y": 5356.5166015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5330.8023681640625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c0938886.470a7",\r
-                "8f4e88cb.a2731",\r
-                "c656ce5c.18cf6"\r
+                "d05f3809.7521c8",\r
+                "7ca77be7.05ec8c",\r
+                "b9815115.2c557"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56fc7b03.ef7a34",\r
+        "id": "90aff610.9959f8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete LEAF ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1303.6500244140625,\r
-        "y": 5564.91650390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5539.2022705078125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5de191f6.0adf08",\r
-                "8645dbc5.336bd"\r
+                "b38f67ee.531ff",\r
+                "7cc55d59.0067b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5de191f6.0adf08",\r
+        "id": "b38f67ee.531ff",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1650.1500244140625,\r
-        "y": 5557.91650390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5532.2022705078125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1d2e7b8b.bb158c"\r
+                "bec12c24.0b2378"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8645dbc5.336bd",\r
+        "id": "7cc55d59.0067b4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1654.1500244140625,\r
-        "y": 5597.91650390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5572.2022705078125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7a1f5009.c19bf"\r
+                "9701e6f5.8bd518"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1d2e7b8b.bb158c",\r
+        "id": "bec12c24.0b2378",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 1808.1500244140625,\r
-        "y": 5557.91650390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5532.2022705078125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a1f5009.c19bf",\r
+        "id": "9701e6f5.8bd518",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
@@ -7379,63 +7379,65 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1811.6500244140625,\r
-        "y": 5597.91650390625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5572.2022705078125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
-            []\r
+            [\r
+                "29311664.f24592"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "9956c6b0.e8f5b",\r
+        "id": "c786893c.7012b",\r
         "type": "switchNode",\r
         "name": "switch tmp.MMstillHasUni?",\r
         "xml": "\n<switch test=\"`$tmp.MMstillHasUni`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 913.183349609375,\r
-        "y": 5894.716766357422,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5869.002532958984,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1b3dc283.1c72c5",\r
-                "6927d979.135438"\r
+                "a3861250.d254d8",\r
+                "3c90d5bf.82245a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b3dc283.1c72c5",\r
+        "id": "a3861250.d254d8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1107.183349609375,\r
-        "y": 5721.716796875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5696.0025634765625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "90688337.4fcde8"\r
+                "6ee92ba3.68178c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6927d979.135438",\r
+        "id": "3c90d5bf.82245a",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1093.3500366210938,\r
-        "y": 6044.316864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6018.602630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "66475002.0efde8"\r
+                "31cd7353.b764a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90688337.4fcde8",\r
+        "id": "6ee92ba3.68178c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -7443,81 +7445,81 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1255.35009765625,\r
-        "y": 5721.31689453125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5695.6026611328125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "88d77fb7.cde5d8",\r
-                "89314dbf.8366b8",\r
-                "68e0d31a.2e51f4"\r
+                "94f88b26.f34ce",\r
+                "497fa775.3b5f3",\r
+                "e88fc760.9f3988"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88d77fb7.cde5d8",\r
+        "id": "94f88b26.f34ce",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1677.199951171875,\r
-        "y": 5692.716796875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5667.0025634765625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "89314dbf.8366b8",\r
+        "id": "497fa775.3b5f3",\r
         "type": "switchNode",\r
         "name": "switch found-root-connectivity",\r
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1492.199951171875,\r
-        "y": 5759.716796875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5734.0025634765625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4d863da6.047404",\r
-                "e3c67257.c0375"\r
+                "ef60935.82bca7",\r
+                "9065d9f2.54ee4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d863da6.047404",\r
+        "id": "ef60935.82bca7",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1757.199951171875,\r
-        "y": 5744.716796875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5719.0025634765625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "798adf3a.473ef"\r
+                "2819744b.f6ef4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3c67257.c0375",\r
+        "id": "9065d9f2.54ee4",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1756.199951171875,\r
-        "y": 5792.716796875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5767.0025634765625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "88e52eb1.fc93f"\r
+                "8f406878.70a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "798adf3a.473ef",\r
+        "id": "2819744b.f6ef4c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -7525,52 +7527,52 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1913.199951171875,\r
-        "y": 5740.716796875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5715.0025634765625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "733c34ed.517f9c"\r
+                "450da1ad.43b1d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88e52eb1.fc93f",\r
+        "id": "8f406878.70a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",\r
         "comments": "",\r
         "x": 1904.199951171875,\r
-        "y": 5787.716796875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5762.0025634765625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "733c34ed.517f9c",\r
+        "id": "450da1ad.43b1d",\r
         "type": "save",\r
         "name": "update ROOT connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2221.8826904296875,\r
-        "y": 5734.6171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5708.9029541015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "51bb42c1.6468fc",\r
+        "id": "af8bca67.a28908",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 2196.0994873046875,\r
-        "y": 5692.4169921875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5666.7027587890625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "66475002.0efde8",\r
+        "id": "31cd7353.b764a4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -7578,502 +7580,503 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1230.916748046875,\r
-        "y": 6043.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6017.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a0a718de.f23a",\r
-                "e9e38848.54da1"\r
+                "a74b089b.225b08",\r
+                "ce915ff5.c8d31",\r
+                "73f93f1a.1715d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0a718de.f23a",\r
+        "id": "a74b089b.225b08",\r
         "type": "for",\r
         "name": "for each relationship of middle-man-conn",\r
         "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1544.23291015625,\r
-        "y": 6037.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "x": 1536.2328491210938,\r
+        "y": 5951.1025390625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "76936a5f.84bc84"\r
+                "1bf92ac3.705cd5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76936a5f.84bc84",\r
+        "id": "1bf92ac3.705cd5",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1844.566650390625,\r
-        "y": 6032.816802978516,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6007.102569580078,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "44a7328f.e8be34"\r
+                "adff6291.99a8f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44a7328f.e8be34",\r
+        "id": "adff6291.99a8f8",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2024.2332763671875,\r
-        "y": 6032.81689453125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6007.1026611328125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "208791a0.d9f786"\r
+                "b1717f1d.d23a28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "208791a0.d9f786",\r
+        "id": "b1717f1d.d23a28",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2224.233154296875,\r
-        "y": 6032.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6007.102630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "574a6228.5b1754",\r
-                "eafb76a9.ded53",\r
-                "327d9363.1aef4c"\r
+                "1b34e983.202196",\r
+                "d97ea61c.b38298",\r
+                "b46e47b0.7a7bf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "574a6228.5b1754",\r
+        "id": "1b34e983.202196",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2431.23291015625,\r
-        "y": 6082.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6057.102630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "23760b0c.48685c"\r
+                "10e803bb.23c354"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "460767d0.d2c1b8",\r
+        "id": "f69a3337.dd69",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2408.466552734375,\r
-        "y": 6267.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6241.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "88082c33.393",\r
-                "e1f0fae1.b8f4d8",\r
-                "822aec8b.abd888"\r
+                "8e127971.6de7c",\r
+                "9a64470f.e555c",\r
+                "c5ecce15.749748"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6361e7ff.46b828",\r
+        "id": "1bd5cb93.6127c4",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1607.466552734375,\r
-        "y": 6182.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "x": 1577.4664916992188,\r
+        "y": 6284.30224609375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "75dfc93.82d2038"\r
+                "5280d91a.703f48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75dfc93.82d2038",\r
+        "id": "5280d91a.703f48",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1804.466552734375,\r
-        "y": 6196.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "x": 1774.4664916992188,\r
+        "y": 6298.30224609375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a28db7b9.a381c8",\r
-                "9f04b050.7c6fe8"\r
+                "4a3e493f.526ac",\r
+                "404c9cef.17796c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a28db7b9.a381c8",\r
+        "id": "4a3e493f.526ac",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1972.466552734375,\r
-        "y": 6189.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "x": 1978.466552734375,\r
+        "y": 6201.30224609375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "136ceea8.d9cdf9"\r
+                "e7cf2c0a.f8afd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "136ceea8.d9cdf9",\r
+        "id": "e7cf2c0a.f8afd8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2135.466552734375,\r
-        "y": 6189.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "x": 2159.466552734375,\r
+        "y": 6217.30224609375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "460767d0.d2c1b8"\r
+                "f69a3337.dd69"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f04b050.7c6fe8",\r
+        "id": "404c9cef.17796c",\r
         "type": "outcome",\r
         "name": "uni",\r
         "xml": "<outcome value='uni'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1988.466552734375,\r
-        "y": 6485.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6459.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5e0bc78d.ba716"\r
+                "55211637.c2f7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e0bc78d.ba716",\r
+        "id": "55211637.c2f7e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2151.466552734375,\r
-        "y": 6485.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6459.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2848a471.d7d3ac"\r
+                "ad51c793.473678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2848a471.d7d3ac",\r
+        "id": "ad51c793.473678",\r
         "type": "save",\r
         "name": "delete uni resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2394.466552734375,\r
-        "y": 6485.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6459.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "14cdbd34.9d5433",\r
+        "id": "76246a63.c65c94",\r
         "type": "save",\r
         "name": "delete connectivity resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1362.466552734375,\r
-        "y": 7251.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 7225.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "23760b0c.48685c",\r
+        "id": "10e803bb.23c354",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1433.466552734375,\r
-        "y": 6180.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "x": 1403.4664916992188,\r
+        "y": 6282.30224609375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6361e7ff.46b828",\r
-                "14cdbd34.9d5433",\r
-                "468cb6c4.ffb168"\r
+                "1bd5cb93.6127c4",\r
+                "76246a63.c65c94",\r
+                "99412df0.04b4f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88082c33.393",\r
+        "id": "8e127971.6de7c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2619.466552734375,\r
-        "y": 6269.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6243.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "83017d89.d2d33"\r
+                "e6c2ee89.d3aff"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1f0fae1.b8f4d8",\r
+        "id": "9a64470f.e555c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2619.95751953125,\r
-        "y": 6314.590606689453,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6288.876373291016,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ec259daf.cc4758"\r
+                "66f32499.9b808c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "822aec8b.abd888",\r
+        "id": "c5ecce15.749748",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2617.466552734375,\r
-        "y": 6358.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6332.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ba3c2552.11f0b"\r
+                "fc5f97c.17990e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "327d9363.1aef4c",\r
+        "id": "b46e47b0.7a7bf",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2455.282958984375,\r
-        "y": 5983.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5957.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "eafb76a9.ded53",\r
+        "id": "d97ea61c.b38298",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2452.7919921875,\r
-        "y": 6027.042633056641,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6001.328399658203,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e9e38848.54da1",\r
+        "id": "ce915ff5.c8d31",\r
         "type": "save",\r
         "name": "delete middle-man-conn resource in AAI",\r
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1531.400146484375,\r
-        "y": 6112.416473388672,\r
-        "z": "8bd89607.6248d8",\r
+        "x": 1533.4000854492188,\r
+        "y": 6012.7021484375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "83017d89.d2d33",\r
+        "id": "e6c2ee89.d3aff",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2785.466552734375,\r
-        "y": 6259.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6233.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c9d43f06.0d115",\r
-                "b37c19e0.f8f32",\r
-                "60da6725.d98bd8",\r
-                "be2af461.e005a",\r
-                "cbf01fd8.d058c"\r
+                "95de1448.b3be38",\r
+                "c13cc07f.32d48",\r
+                "89fea46.2857558",\r
+                "8c5b9c51.4573e8",\r
+                "a58a3e55.44161"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ba3c2552.11f0b",\r
+        "id": "fc5f97c.17990e8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 2784.466552734375,\r
-        "y": 6357.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6331.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ec259daf.cc4758",\r
+        "id": "66f32499.9b808c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 2782.5289306640625,\r
-        "y": 6314.8763427734375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6289.162109375,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9d43f06.0d115",\r
+        "id": "95de1448.b3be38",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 3007.466552734375,\r
-        "y": 5977.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5951.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b37c19e0.f8f32",\r
+        "id": "c13cc07f.32d48",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3033.466552734375,\r
-        "y": 6094.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6068.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "410583dd.d8121c",\r
-                "88eb934e.2f5b08",\r
-                "a865a4a5.d4df78"\r
+                "2f82e357.0b1ab4",\r
+                "be465fa4.6aba18",\r
+                "877ec4f6.c7b7a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "60da6725.d98bd8",\r
+        "id": "89fea46.2857558",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3136.466552734375,\r
-        "y": 6361.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6335.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "72b47bea.9a0f24",\r
-                "66f0d6b4.eb7008"\r
+                "2931cfbe.d3d97",\r
+                "162b2290.6fc605"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be2af461.e005a",\r
+        "id": "8c5b9c51.4573e8",\r
         "type": "switchNode",\r
         "name": "switch connectivity has ethernet service",\r
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3074.466552734375,\r
-        "y": 6496.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6470.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2f67e97f.141fd6",\r
-                "7b5fd505.3b0694"\r
+                "df16efa0.bafe28",\r
+                "bc60ff9d.7739e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cbf01fd8.d058c",\r
+        "id": "a58a3e55.44161",\r
         "type": "save",\r
         "name": "delete vpn-binding resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3055.466552734375,\r
-        "y": 6612.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6586.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "410583dd.d8121c",\r
+        "id": "2f82e357.0b1ab4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3228.9666748046875,\r
-        "y": 6046.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6020.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4a83ae1e.07b578"\r
+                "640fd481.180004"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "88eb934e.2f5b08",\r
+        "id": "be465fa4.6aba18",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3220.9666748046875,\r
-        "y": 6101.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6075.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "282085b8.0d4512"\r
+                "ecd8a620.92b268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a83ae1e.07b578",\r
+        "id": "640fd481.180004",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -8081,176 +8084,176 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 3363.348876953125,\r
-        "y": 6040.672332763672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6014.958099365234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "33baf8b0.f059c8"\r
+                "d1896cdb.8141"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a865a4a5.d4df78",\r
+        "id": "877ec4f6.c7b7a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3225.9666748046875,\r
-        "y": 6158.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6132.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "63323518.7bcbac"\r
+                "f05d5e82.949cd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63323518.7bcbac",\r
+        "id": "f05d5e82.949cd",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3377.9666748046875,\r
-        "y": 6159.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6133.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "282085b8.0d4512",\r
+        "id": "ecd8a620.92b268",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3388.9666748046875,\r
-        "y": 6102.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6076.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7b5fd505.3b0694",\r
+        "id": "bc60ff9d.7739e8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3327.466552734375,\r
-        "y": 6474.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6448.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "948366f4.fec95"\r
+                "7d696f2d.0f345"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f67e97f.141fd6",\r
+        "id": "df16efa0.bafe28",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3327.466552734375,\r
-        "y": 6530.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6504.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "33baf8b0.f059c8",\r
+        "id": "d1896cdb.8141",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3550.466064453125,\r
-        "y": 6042.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6016.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e2cf1880.b9d7c"\r
+                "a3649162.b60c9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e2cf1880.b9d7c",\r
+        "id": "a3649162.b60c9",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3791.466064453125,\r
-        "y": 6033.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6007.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "bc484497.a79ff8"\r
+                "fd0af8f3.25299"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "948366f4.fec95",\r
+        "id": "7d696f2d.0f345",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3677.466064453125,\r
-        "y": 6464.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6438.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c37cd95d.368e7",\r
-                "92455633.bf0ee8"\r
+                "82ac773c.5adbc",\r
+                "f41b429.87576c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72b47bea.9a0f24",\r
+        "id": "2931cfbe.d3d97",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3443.966064453125,\r
-        "y": 6386.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6360.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f1048a1f.996e4"\r
+                "41ca7b34.32b314"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66f0d6b4.eb7008",\r
+        "id": "162b2290.6fc605",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3444.966064453125,\r
-        "y": 6331.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6305.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "314550b5.0a064"\r
+                "6e74c50f.6753f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f1048a1f.996e4",\r
+        "id": "41ca7b34.32b314",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3615.966064453125,\r
-        "y": 6384.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6358.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "314550b5.0a064",\r
+        "id": "6e74c50f.6753f4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
@@ -8258,80 +8261,80 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 3612.466064453125,\r
-        "y": 6333.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6307.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "926cd0b8.871b1",\r
+        "id": "d394aeb8.1e7718",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4148.4658203125,\r
-        "y": 5982.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5956.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e5e99dd1.35ed8",\r
-                "977d12a.f8bd9f",\r
-                "b449b2c0.535c38"\r
+                "5381b334.945d34",\r
+                "5cfd9c1e.9cd7fc",\r
+                "293f88.0669c878"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc484497.a79ff8",\r
+        "id": "fd0af8f3.25299",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3997.466064453125,\r
-        "y": 6030.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6004.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "926cd0b8.871b1"\r
+                "d394aeb8.1e7718"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c37cd95d.368e7",\r
+        "id": "82ac773c.5adbc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4009.966064453125,\r
-        "y": 6438.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6412.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b162e50d.7cae58"\r
+                "ecb5b8cc.eeda88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92455633.bf0ee8",\r
+        "id": "f41b429.87576c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4013.966064453125,\r
-        "y": 6478.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6452.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2199ad10.a55eda"\r
+                "308650c2.e2482"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2199ad10.a55eda",\r
+        "id": "308650c2.e2482",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
@@ -8339,135 +8342,135 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4201.466064453125,\r
-        "y": 6482.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6456.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "b162e50d.7cae58",\r
+        "id": "ecb5b8cc.eeda88",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4197.966064453125,\r
-        "y": 6442.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6416.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "977d12a.f8bd9f",\r
+        "id": "5cfd9c1e.9cd7fc",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4354.4658203125,\r
-        "y": 5995.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5969.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7f661594.98b80c",\r
-                "b4244919.5b3fa8",\r
-                "fd8c4c61.cc25e8"\r
+                "c9280772.2e056",\r
+                "da69dce1.3d1cc8",\r
+                "c843a21f.72703"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5e99dd1.35ed8",\r
+        "id": "5381b334.945d34",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 4384.4658203125,\r
-        "y": 5943.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5917.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7f661594.98b80c",\r
+        "id": "c9280772.2e056",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4564.4658203125,\r
-        "y": 5986.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5960.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b64e3b3c.b2614"\r
+                "1c355cab.e00983"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4244919.5b3fa8",\r
+        "id": "da69dce1.3d1cc8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4556.4658203125,\r
-        "y": 6041.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6015.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "13dd75f8.aa1f6a"\r
+                "e5e939f4.c8003"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd8c4c61.cc25e8",\r
+        "id": "c843a21f.72703",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4561.4658203125,\r
-        "y": 6098.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6072.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "67c0a219.8d5f1c"\r
+                "29282b3d.cdea3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b449b2c0.535c38",\r
+        "id": "293f88.0669c878",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4304.4658203125,\r
-        "y": 6059.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6033.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67c0a219.8d5f1c",\r
+        "id": "29282b3d.cdea3c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4713.4658203125,\r
-        "y": 6099.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6073.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "13dd75f8.aa1f6a",\r
+        "id": "e5e939f4.c8003",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4724.4658203125,\r
-        "y": 6044.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6018.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b64e3b3c.b2614",\r
+        "id": "1c355cab.e00983",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -8475,88 +8478,88 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4708.84814453125,\r
-        "y": 5983.6722412109375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5957.9580078125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a6322085.6bb328"\r
+                "31ead1aa.38700e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6322085.6bb328",\r
+        "id": "31ead1aa.38700e",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 4923.4658203125,\r
-        "y": 5980.016571044922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5954.302337646484,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "90358f7a.3bc868",\r
+        "id": "6da29c89.3512ec",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 1659.2332763671875,\r
-        "y": 6777.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6751.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a442da27.96a27",\r
+        "id": "23a2345e.db2bfc",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1685.2332763671875,\r
-        "y": 6894.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6868.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5457374d.6393a8",\r
-                "c43cf1bd.3a9c48",\r
-                "aafe4c92.ab6148"\r
+                "287bda60.70f306",\r
+                "564bb39c.806684",\r
+                "f782c941.aa2bd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5457374d.6393a8",\r
+        "id": "287bda60.70f306",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1880.7333984375,\r
-        "y": 6846.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6820.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "53717e38.4ed96"\r
+                "5eea5356.2a418c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c43cf1bd.3a9c48",\r
+        "id": "564bb39c.806684",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1872.7333984375,\r
-        "y": 6901.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6875.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f440d45f.e2c3b"\r
+                "918bf051.2e35e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53717e38.4ed96",\r
+        "id": "5eea5356.2a418c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -8564,230 +8567,230 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 2015.1156005859375,\r
-        "y": 6841.272430419922,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6815.558197021484,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "237db843.e1a28"\r
+                "a66aff1d.02ebd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aafe4c92.ab6148",\r
+        "id": "f782c941.aa2bd8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1877.7333984375,\r
-        "y": 6958.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6932.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f21c5384.45f0a8"\r
+                "ea358a06.2ba7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f21c5384.45f0a8",\r
+        "id": "ea358a06.2ba7c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 2029.7333984375,\r
-        "y": 6959.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6933.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f440d45f.e2c3b",\r
+        "id": "918bf051.2e35e8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 2040.7333984375,\r
-        "y": 6902.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6876.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "237db843.e1a28",\r
+        "id": "a66aff1d.02ebd",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2202.2327880859375,\r
-        "y": 6842.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6816.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "df53e846.0627d8"\r
+                "dd540d27.8a572"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df53e846.0627d8",\r
+        "id": "dd540d27.8a572",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2443.2327880859375,\r
-        "y": 6833.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6807.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1dea4397.4ddefc"\r
+                "9d1b03ac.68f1d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ddd8f461.6b9a28",\r
+        "id": "e61d9898.b700f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 2800.2325439453125,\r
-        "y": 6782.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6756.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "da1d6ae3.19a4a",\r
-                "f17b263b.0b92b8",\r
-                "e6be1026.0fc218"\r
+                "1b4a271c.3007c1",\r
+                "a4a420aa.eed92",\r
+                "5a15942c.1c868c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1dea4397.4ddefc",\r
+        "id": "9d1b03ac.68f1d",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2649.2327880859375,\r
-        "y": 6830.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6804.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ddd8f461.6b9a28"\r
+                "e61d9898.b700f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f17b263b.0b92b8",\r
+        "id": "a4a420aa.eed92",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3006.2325439453125,\r
-        "y": 6795.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6769.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "93d3ae4.c48255",\r
-                "a8b7b61a.880ff",\r
-                "1b334b23.690f3d"\r
+                "e70e66a4.f92e28",\r
+                "3b5db284.72d976",\r
+                "a90d6b8f.8e3a5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e6be1026.0fc218",\r
+        "id": "5a15942c.1c868c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 2956.2325439453125,\r
-        "y": 6859.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6833.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "da1d6ae3.19a4a",\r
+        "id": "1b4a271c.3007c1",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
         "x": 3036.2325439453125,\r
-        "y": 6743.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6717.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "93d3ae4.c48255",\r
+        "id": "e70e66a4.f92e28",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3216.2325439453125,\r
-        "y": 6786.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6760.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "38012aaa.4db4be"\r
+                "2205be3e.8c882a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8b7b61a.880ff",\r
+        "id": "3b5db284.72d976",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3208.2325439453125,\r
-        "y": 6841.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6815.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3b0a565e.7b9b52"\r
+                "d93cd156.9d02f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1b334b23.690f3d",\r
+        "id": "a90d6b8f.8e3a5",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3213.2325439453125,\r
-        "y": 6898.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6872.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a42eaf3a.6fbc5"\r
+                "b772a1ff.e97338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a42eaf3a.6fbc5",\r
+        "id": "b772a1ff.e97338",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3365.2325439453125,\r
-        "y": 6899.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6873.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3b0a565e.7b9b52",\r
+        "id": "d93cd156.9d02f8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 3376.2325439453125,\r
-        "y": 6844.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6818.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "38012aaa.4db4be",\r
+        "id": "2205be3e.8c882a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -8795,141 +8798,141 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 3360.6148681640625,\r
-        "y": 6784.2723388671875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6758.55810546875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2c7d526d.80fc76"\r
+                "9b8cbfdb.496af"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c7d526d.80fc76",\r
+        "id": "9b8cbfdb.496af",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
         "x": 3575.2325439453125,\r
-        "y": 6780.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6754.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "468cb6c4.ffb168",\r
+        "id": "99412df0.04b4f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 1451.2332763671875,\r
-        "y": 6905.616668701172,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6879.902435302734,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "90358f7a.3bc868",\r
-                "a442da27.96a27",\r
-                "12fc611d.1c5a0f"\r
+                "6da29c89.3512ec",\r
+                "23a2345e.db2bfc",\r
+                "4ea496a3.5a8a68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12fc611d.1c5a0f",\r
+        "id": "4ea496a3.5a8a68",\r
         "type": "switchNode",\r
         "name": "switch connectivity has ethernet service",\r
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1733.433349609375,\r
-        "y": 7046.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 7021.102630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "fd3fa457.558cb8",\r
-                "5e9ee12a.d5b628"\r
+                "fd259c6c.134fa8",\r
+                "9bf814bd.aca8b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5e9ee12a.d5b628",\r
+        "id": "9bf814bd.aca8b8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1986.433349609375,\r
-        "y": 7024.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6999.102630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c43e864.6fdea78"\r
+                "10bd46c.7fcbe39"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fd3fa457.558cb8",\r
+        "id": "fd259c6c.134fa8",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1986.433349609375,\r
-        "y": 7080.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 7055.102630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c43e864.6fdea78",\r
+        "id": "10bd46c.7fcbe39",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2336.432861328125,\r
-        "y": 7014.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6989.102630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d8cf4668.e6bf58",\r
-                "fc9a7200.07e08"\r
+                "cc57d141.f3e88",\r
+                "6b29798.5078f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8cf4668.e6bf58",\r
+        "id": "cc57d141.f3e88",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2668.932861328125,\r
-        "y": 6988.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6963.102630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "fa6e7b78.6ccd98"\r
+                "e4bf775a.d74c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc9a7200.07e08",\r
+        "id": "6b29798.5078f08",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2672.932861328125,\r
-        "y": 7028.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 7003.102630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f96cab06.f1bd18"\r
+                "9dbbe180.4c39c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f96cab06.f1bd18",\r
+        "id": "9dbbe180.4c39c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
@@ -8937,85 +8940,85 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 2860.432861328125,\r
-        "y": 7032.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 7007.102630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "fa6e7b78.6ccd98",\r
+        "id": "e4bf775a.d74c18",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 2856.932861328125,\r
-        "y": 6992.816864013672,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 6967.102630615234,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6504876a.65a0e",\r
+        "id": "78f62ea.0af84d",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete Underlay OTN tunnel from the LEAF ethernet Service",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1089.25,\r
-        "y": 4732.39990234375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4706.6856689453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2f2c7d69.04a202",\r
-                "749e3757.254fd8"\r
+                "51c55595.1dd8cc",\r
+                "c498093d.59e4c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f2c7d69.04a202",\r
+        "id": "51c55595.1dd8cc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1517.749755859375,\r
-        "y": 4720.39990234375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4694.6856689453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e83630dc.e1ba"\r
+                "bc110a38.b317b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "749e3757.254fd8",\r
+        "id": "c498093d.59e4c8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1521.749755859375,\r
-        "y": 4760.39990234375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4734.6856689453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "28010736.1a772"\r
+                "5805f739.dc8f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e83630dc.e1ba",\r
+        "id": "bc110a38.b317b",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 1675.749755859375,\r
-        "y": 4720.39990234375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4694.6856689453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "28010736.1a772",\r
+        "id": "5805f739.dc8f9",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
@@ -9023,14 +9026,14 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1679.249755859375,\r
-        "y": 4760.39990234375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4734.6856689453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2f2661a7.5dc1e6",\r
+        "id": "6f96293b.020fc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic='true'>",\r
@@ -9038,184 +9041,184 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5113,\r
-        "y": 5053,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5027.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ae15e960.f1e88",\r
-                "28b0c0f7.1a36d8",\r
-                "8a83aff9.8ddf38"\r
+                "aad45f58.fbf018",\r
+                "2530767d.abaa5a",\r
+                "b9bc9e8d.66a4b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8a83aff9.8ddf38",\r
+        "id": "b9bc9e8d.66a4b8",\r
         "type": "set",\r
         "name": "set vpnNameToSearch",\r
         "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",\r
         "comments": "",\r
         "x": 5340,\r
-        "y": 4998,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4972.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ae15e960.f1e88",\r
+        "id": "aad45f58.fbf018",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5494,\r
-        "y": 5050,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5024.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "28b0c0f7.1a36d8",\r
+        "id": "2530767d.abaa5a",\r
         "type": "switchNode",\r
         "name": "switch $foundVpnName",\r
         "xml": "<switch test=\"`$foundVpnName`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5339,\r
-        "y": 5105,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5079.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "48fdd2f1.2b095c"\r
+                "5fd0edea.97a1fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48fdd2f1.2b095c",\r
+        "id": "5fd0edea.97a1fc",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5518,\r
-        "y": 5104,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5078.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a26e073.3ca98f8"\r
+                "48fa24ff.a12f6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3b4a4d3.b60598",\r
+        "id": "79dba259.2612cc",\r
         "type": "set",\r
         "name": "unset secondary related variables",\r
         "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",\r
         "comments": "",\r
         "x": 3380.249969482422,\r
-        "y": 459,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 433.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "22dcd918.a9e88e",\r
+        "id": "11c024cf.1cb7db",\r
         "type": "set",\r
         "name": "set network-route-three",\r
         "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",\r
         "comments": "",\r
         "x": 3344.249969482422,\r
-        "y": 709,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 683.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1743864d.d3d2f2",\r
+        "id": "8bfce836.dcd148",\r
         "type": "switchNode",\r
         "name": "switch secondary empty?",\r
         "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3347.666473388672,\r
-        "y": 751.2499694824219,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 725.5357360839844,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a9f40bfb.e2369",\r
-                "3b2a9389.6292cc"\r
+                "2011ad7a.50e2d2",\r
+                "3e343af8.ce24be"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a9f40bfb.e2369",\r
+        "id": "2011ad7a.50e2d2",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3586.6663513183594,\r
-        "y": 587.25,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 561.5357666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "143a1a38.4be736"\r
+                "1f12a88c.b01c37"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b2a9389.6292cc",\r
+        "id": "3e343af8.ce24be",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3595.6663513183594,\r
-        "y": 634.25,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 608.5357666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "90836078.d811b"\r
+                "d6d1ae0e.a40e7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90836078.d811b",\r
+        "id": "d6d1ae0e.a40e7",\r
         "type": "set",\r
         "name": "set hasSecondary true",\r
         "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",\r
         "comments": "",\r
         "x": 3809.6663513183594,\r
-        "y": 628.25,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 602.5357666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "143a1a38.4be736",\r
+        "id": "1f12a88c.b01c37",\r
         "type": "set",\r
         "name": "set hasSecondary false",\r
         "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",\r
         "comments": "",\r
         "x": 3813.6663513183594,\r
-        "y": 584.25,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 558.5357666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c2039341.ed7fe",\r
+        "id": "41d8ce05.5caae",\r
         "type": "outcome",\r
         "name": "SECONDARY-ROOT",\r
         "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4175.700408935547,\r
-        "y": 537.699951171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 511.9857177734375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8f42381e.256918"\r
+                "57b53193.85d2e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f42381e.256918",\r
+        "id": "57b53193.85d2e8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -9223,55 +9226,55 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4349.700408935547,\r
-        "y": 532.699951171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 506.9857177734375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2dfbe8eb.6df208",\r
-                "ae5efca5.b13ee"\r
+                "2292f0ec.6f9e9",\r
+                "f8b394d0.6213f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2dfbe8eb.6df208",\r
+        "id": "2292f0ec.6f9e9",\r
         "type": "set",\r
         "name": "set network-route-SECONDARY-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4593.700653076172,\r
-        "y": 524.699951171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 498.9857177734375,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ae5efca5.b13ee",\r
+        "id": "f8b394d0.6213f",\r
         "type": "set",\r
         "name": "set network-route-C",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4539.700653076172,\r
-        "y": 564.699951171875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 538.9857177734375,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49cd1e6.2c21e6",\r
+        "id": "4bc67983.47c6f",\r
         "type": "outcome",\r
         "name": "SECONDARY-ROOT",\r
         "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4144.700408935547,\r
-        "y": 767.0999755859375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 741.3857421875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "37d7c141.43238e"\r
+                "ca96ae7a.f7e118"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37d7c141.43238e",\r
+        "id": "ca96ae7a.f7e118",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -9279,167 +9282,167 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4302.700164794922,\r
-        "y": 810.0997924804688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 784.3855590820312,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3e1881a7.808dae",\r
-                "e3ee5030.818c18"\r
+                "bdef3637.91db48",\r
+                "b84fc7dd.a088f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e1881a7.808dae",\r
+        "id": "bdef3637.91db48",\r
         "type": "set",\r
         "name": "set network-route-SECONDARY-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4524.700164794922,\r
-        "y": 796.0999145507812,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 770.3856811523438,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e3ee5030.818c18",\r
+        "id": "b84fc7dd.a088f8",\r
         "type": "set",\r
         "name": "set network-route-C",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4470.700164794922,\r
-        "y": 836.0999145507812,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 810.3856811523438,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "898efbe9.b7aab8",\r
+        "id": "ec6aad53.7d628",\r
         "type": "save",\r
         "name": "get network-route-three from aai",\r
         "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\">",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3356.133270263672,\r
-        "y": 1003.333251953125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 977.6190185546875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "648675ef.25d1f4",\r
-                "2e60c86e.fc1c08",\r
-                "80896ca0.c29cc8"\r
+                "60b6baf9.326c5c",\r
+                "fffcc6ce.01cc38",\r
+                "232b371a.13f76"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "648675ef.25d1f4",\r
+        "id": "60b6baf9.326c5c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3596.133270263672,\r
-        "y": 986.333251953125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 960.6190185546875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2e60c86e.fc1c08",\r
+        "id": "fffcc6ce.01cc38",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3591.642333984375,\r
-        "y": 1028.7593078613281,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1003.0450744628906,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "80896ca0.c29cc8",\r
+        "id": "232b371a.13f76",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3595.642303466797,\r
-        "y": 1076.75927734375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1051.0450439453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1a4bd447.a95bf4"\r
+                "b996a975.9f4ee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1a4bd447.a95bf4",\r
+        "id": "b996a975.9f4ee8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3751.133270263672,\r
-        "y": 1046.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1020.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "caee9e1d.8e2348"\r
+                "2df3eeae.ae260a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "caee9e1d.8e2348",\r
+        "id": "2df3eeae.ae260a",\r
         "type": "switchNode",\r
         "name": "switch nr type",\r
         "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3873.133270263672,\r
-        "y": 993.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 967.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "63dc4834.c55f2",\r
-                "861e97a1.4a94",\r
-                "50fdf697.5f0398"\r
+                "30af5545.05a802",\r
+                "294528ca.16e348",\r
+                "fdf4c0e0.5eff08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63dc4834.c55f2",\r
+        "id": "30af5545.05a802",\r
         "type": "outcome",\r
         "name": "ROOT",\r
         "xml": "<outcome value='ROOT'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4109.133270263672,\r
-        "y": 843.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 817.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "15fc5ae7.def135"\r
+                "58899b33.3d8864"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "861e97a1.4a94",\r
+        "id": "294528ca.16e348",\r
         "type": "outcome",\r
         "name": "LEAF",\r
         "xml": "<outcome value='LEAF'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4105.133270263672,\r
-        "y": 899.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 873.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "de3f550a.e65dd8"\r
+                "2016713.cf9120e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15fc5ae7.def135",\r
+        "id": "58899b33.3d8864",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -9447,17 +9450,17 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4235.133270263672,\r
-        "y": 851.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 825.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a2d4f205.05df18",\r
-                "97e552b.298d73"\r
+                "23e1076f.823948",\r
+                "e01e107b.4a322"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de3f550a.e65dd8",\r
+        "id": "2016713.cf9120e",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -9465,33 +9468,33 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4238.133270263672,\r
-        "y": 904.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 878.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "77158a83.3502bc",\r
-                "fb7ab28b.9d9ce8"\r
+                "42b53bab.59e5ec",\r
+                "9f9141a1.5b5a98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50fdf697.5f0398",\r
+        "id": "fdf4c0e0.5eff08",\r
         "type": "outcome",\r
         "name": "SECONDARY-ROOT",\r
         "xml": "<outcome value='SECONDARY-ROOT'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4098.133270263672,\r
-        "y": 977.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 951.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4a03238e.72a4b4"\r
+                "7151cb9d.fcc3b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a03238e.72a4b4",\r
+        "id": "7151cb9d.fcc3b4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -9499,406 +9502,406 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4254.133270263672,\r
-        "y": 998.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 972.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8f9b7ac9.e6c508",\r
-                "4399bcd6.51e06c"\r
+                "16090c67.366d8c",\r
+                "877ec323.7c8b08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2d4f205.05df18",\r
+        "id": "23e1076f.823948",\r
         "type": "set",\r
         "name": "set network-route-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4482.133270263672,\r
-        "y": 881.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 855.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97e552b.298d73",\r
+        "id": "e01e107b.4a322",\r
         "type": "set",\r
         "name": "set network-route-B",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4474.133270263672,\r
-        "y": 923.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 897.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "77158a83.3502bc",\r
+        "id": "42b53bab.59e5ec",\r
         "type": "set",\r
         "name": "set network-route-LEAF",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4475.133270263672,\r
-        "y": 975.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 949.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fb7ab28b.9d9ce8",\r
+        "id": "9f9141a1.5b5a98",\r
         "type": "set",\r
         "name": "set network-route-A",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4462.133270263672,\r
-        "y": 1015.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 989.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4399bcd6.51e06c",\r
+        "id": "877ec323.7c8b08",\r
         "type": "set",\r
         "name": "set network-route-C",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4436.133270263672,\r
-        "y": 1109.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1083.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f9b7ac9.e6c508",\r
+        "id": "16090c67.366d8c",\r
         "type": "set",\r
         "name": "set network-route-SECONDARY-ROOT",\r
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",\r
         "comments": "",\r
         "x": 4498.133270263672,\r
-        "y": 1065.3331909179688,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 1039.6189575195312,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ac53fadb.549658",\r
+        "id": "2a307068.85126",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3700.13330078125,\r
-        "y": 2249,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2223.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a75c6a9f.cbf01",\r
-                "92c4a208.e0cb28"\r
+                "5e91bdef.ec251c",\r
+                "edfa6b23.11ec28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c76e7c83.8acf1",\r
+        "id": "268e9ec4.4facea",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3527.466796875,\r
-        "y": 2250,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2224.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ac53fadb.549658"\r
+                "2a307068.85126"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac317b44.b3b988",\r
+        "id": "15820d3a.1e0693",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3536.957763671875,\r
-        "y": 2292.5740356445312,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2266.8598022460938,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a866b4cc.e0caa",\r
+        "id": "5a5c2368.a7e5dc",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3525.466796875,\r
-        "y": 2339,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2313.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a75c6a9f.cbf01",\r
+        "id": "5e91bdef.ec251c",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3990.466796875,\r
-        "y": 2265,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2239.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "af57ae08.dd681",\r
-                "e5cbeb5f.6e9468"\r
+                "fab0baab.63daf",\r
+                "4fbe9a1d.f89b1c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5cbeb5f.6e9468",\r
+        "id": "4fbe9a1d.f89b1c",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4213.466796875,\r
-        "y": 2220,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2194.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "5a256296.5bc59c"\r
+                "e7a6f67c.223ba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "af57ae08.dd681",\r
+        "id": "fab0baab.63daf",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4215.466796875,\r
-        "y": 2284,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2258.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c3ad5792.8dfac"\r
+                "e4fc9765.fde21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7bdbced.e4e6e",\r
+        "id": "ad2e0fde.b44de8",\r
         "type": "save",\r
         "name": "get p-interface-dst from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3321.466796875,\r
-        "y": 2271,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2245.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c76e7c83.8acf1",\r
-                "ac317b44.b3b988",\r
-                "a866b4cc.e0caa"\r
+                "268e9ec4.4facea",\r
+                "15820d3a.1e0693",\r
+                "5a5c2368.a7e5dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d6bf9fc.2af3d8",\r
+        "id": "8876fe3a.88e278",\r
         "type": "comment",\r
         "name": "Question?",\r
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",\r
         "comments": "",\r
         "x": 3260.466796875,\r
-        "y": 2229,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2203.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3ddfa25a.4bc3f6",\r
+        "id": "c02bc34.16c814",\r
         "type": "execute",\r
         "name": "execute split tp-id to get pnf-name",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3341.466796875,\r
-        "y": 2119,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2093.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1f8f213c.23a987",\r
-                "723c86fe.b2129"\r
+                "85d9fc70.3a0b8",\r
+                "63a7add0.8255ec"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "723c86fe.b2129",\r
+        "id": "63a7add0.8255ec",\r
         "type": "failure",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3564.466796875,\r
-        "y": 2105,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2079.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2b76ade7.37f3aa"\r
+                "39d5594f.5d224e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f8f213c.23a987",\r
+        "id": "85d9fc70.3a0b8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3566.466796875,\r
-        "y": 2138,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2112.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2b76ade7.37f3aa",\r
+        "id": "39d5594f.5d224e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 3712.466796875,\r
-        "y": 2098,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2072.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a96a9fab.149bd",\r
-                "6bae074d.4cc69"\r
+                "cf9e5f0.1f2092",\r
+                "6b6736af.eb70a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a96a9fab.149bd",\r
+        "id": "cf9e5f0.1f2092",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
         "x": 3904.4666748046875,\r
-        "y": 2035,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2009.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "92c4a208.e0cb28",\r
+        "id": "edfa6b23.11ec28",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3971.466796875,\r
-        "y": 2396,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2370.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "fb667e00.cdee38"\r
+                "c80278c9.710488"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb667e00.cdee38",\r
+        "id": "c80278c9.710488",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4177.466796875,\r
-        "y": 2396,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2370.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7f231a25.219aec"\r
+                "7e2cf131.a58a08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6bae074d.4cc69",\r
+        "id": "6b6736af.eb70a",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3926.4666748046875,\r
-        "y": 2103,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2077.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6f9fafbd.595338",\r
-                "5fece99f.57a078",\r
-                "53c7941c.fd6f84"\r
+                "9d1ec1c.6f0f9c",\r
+                "f4e7e55c.530698",\r
+                "d7c76719.0fc4b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f9fafbd.595338",\r
+        "id": "9d1ec1c.6f0f9c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4121.966796875,\r
-        "y": 2055,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2029.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1ef2a52f.ce58c3"\r
+                "13bd6284.e3089d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5fece99f.57a078",\r
+        "id": "f4e7e55c.530698",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4113.966796875,\r
-        "y": 2110,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2084.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d353a27e.170a88"\r
+                "56e4b2a7.59d05c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53c7941c.fd6f84",\r
+        "id": "d7c76719.0fc4b",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4118.966796875,\r
-        "y": 2167,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2141.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "815f83cf.c9ecf"\r
+                "67615599.b73f0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "815f83cf.c9ecf",\r
+        "id": "67615599.b73f0c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4270.966796875,\r
-        "y": 2168,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2142.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1ef2a52f.ce58c3",\r
+        "id": "13bd6284.e3089d",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -9906,433 +9909,433 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4266.34912109375,\r
-        "y": 2052.6556701660156,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2026.9414367675781,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "df579443.2dfaa"\r
+                "3bd0a776.cdf68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b2f7d29a.c36bc8",\r
+        "id": "d87e7a94.9bda08",\r
         "type": "set",\r
         "name": "set SECONDARY-ROOT stuff",\r
         "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",\r
         "comments": "",\r
         "x": 3322.13330078125,\r
-        "y": 2364,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2338.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29a75985.a4b2ae",\r
+        "id": "3b2ac73.1b40638",\r
         "type": "comment",\r
         "name": "NOT NEEDED ANYMORE?",\r
         "info": "",\r
         "comments": "",\r
         "x": 4001.133270263672,\r
-        "y": 2339.9998474121094,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2314.285614013672,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c3ad5792.8dfac",\r
+        "id": "e4fc9765.fde21",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",\r
         "comments": "",\r
         "x": 4374.466796875,\r
-        "y": 2303,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2277.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5a256296.5bc59c",\r
+        "id": "e7a6f67c.223ba8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4378.466796875,\r
-        "y": 2217,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2191.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a0a57c60.9feaa",\r
-                "8f9217bc.ce51e"\r
+                "ab9c8c2d.c18e8",\r
+                "2a323f5f.e64b7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7f231a25.219aec",\r
+        "id": "7e2cf131.a58a08",\r
         "type": "outcome",\r
         "name": "tunnel-termination-point",\r
         "xml": "<outcome value='tunnel-termination-point'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4394.75244140625,\r
-        "y": 2394.82177734375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2369.1075439453125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "f1964530.52cb1"\r
+                "cefe725b.0f41e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d353a27e.170a88",\r
+        "id": "56e4b2a7.59d05c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4281.966796875,\r
-        "y": 2113,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2087.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a0a57c60.9feaa",\r
+        "id": "ab9c8c2d.c18e8",\r
         "type": "set",\r
         "name": "set ltpId",\r
         "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",\r
         "comments": "",\r
         "x": 4548.466796875,\r
-        "y": 2178,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2152.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f9217bc.ce51e",\r
+        "id": "2a323f5f.e64b7",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",\r
         "comments": "",\r
         "x": 4549.466796875,\r
-        "y": 2283,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2257.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1ea5e7d3.f23f9",\r
+        "id": "89cd5649.143b88",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "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",\r
         "comments": "",\r
         "x": 4544.466796875,\r
-        "y": 2232,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2206.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f1964530.52cb1",\r
+        "id": "cefe725b.0f41e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4601.583984375,\r
-        "y": 2384.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2358.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cbbeb825.19f92",\r
-                "b0c2600a.46c7c",\r
-                "511030eb.63bcc8"\r
+                "a03cf587.06cef8",\r
+                "a11cf500.909288",\r
+                "7b4cfab6.8e3e3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cbbeb825.19f92",\r
+        "id": "a03cf587.06cef8",\r
         "type": "set",\r
         "name": "set destination ttp-id",\r
         "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",\r
         "comments": "",\r
         "x": 4816.583984375,\r
-        "y": 2346.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2320.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b0c2600a.46c7c",\r
+        "id": "a11cf500.909288",\r
         "type": "get-resource",\r
         "name": "get-resource src TTP",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4813.583984375,\r
-        "y": 2385.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2359.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ce425175.45de18"\r
+                "1d4bbcf2.4e364b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "511030eb.63bcc8",\r
+        "id": "7b4cfab6.8e3e3c",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
         "x": 4769.083984375,\r
-        "y": 2427.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2401.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b757d82d.12f65",\r
+        "id": "5a11b9ac.0be8e",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4850.466796875,\r
-        "y": 2137.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2111.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "8ab896d8.87229"\r
+                "9451ac43.685578"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "df579443.2dfaa",\r
+        "id": "3bd0a776.cdf68",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4450.4666748046875,\r
-        "y": 2067,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2041.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "51046da7.24d494"\r
+                "baa608db.a0fe08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51046da7.24d494",\r
+        "id": "baa608db.a0fe08",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4647.466796875,\r
-        "y": 2133.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2107.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b757d82d.12f65",\r
-                "4ad69efc.b2bd68"\r
+                "5a11b9ac.0be8e",\r
+                "41776d15.aa3ae4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4ad69efc.b2bd68",\r
+        "id": "41776d15.aa3ae4",\r
         "type": "outcome",\r
         "name": "network-resource",\r
         "xml": "<outcome value='network-resource'>",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4852.466796875,\r
-        "y": 2210.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2184.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a0ad2556.3951b8"\r
+                "e63bdf76.82117"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce425175.45de18",\r
+        "id": "1d4bbcf2.4e364b",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4994.083984375,\r
-        "y": 2384.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2358.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "822b3c7.3a67ac"\r
+                "65012ff0.bac99"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "822b3c7.3a67ac",\r
+        "id": "65012ff0.bac99",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5152.083984375,\r
-        "y": 2384.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2358.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "71be1479.f150cc"\r
+                "8f16bdf7.24b18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71be1479.f150cc",\r
+        "id": "8f16bdf7.24b18",\r
         "type": "set",\r
         "name": "set destination tunnel tp ip",\r
         "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",\r
         "comments": "",\r
         "x": 5359.083984375,\r
-        "y": 2384.3404541015625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2358.626220703125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ab896d8.87229",\r
+        "id": "9451ac43.685578",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5027.466796875,\r
-        "y": 2129.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2103.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d7fa69fb.085438",\r
-                "ce745876.37fbb"\r
+                "801b98ce.90edc",\r
+                "5fb93bf0.4b325c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce745876.37fbb",\r
+        "id": "5fb93bf0.4b325c",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5235.466796875,\r
-        "y": 2136.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2110.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "10a5091f.ce791f",\r
-                "70c5216d.20762",\r
-                "eee03948.c8ee08"\r
+                "44bfb2a0.4cab3c",\r
+                "f1164e18.e0f19",\r
+                "7ca3e4f2.88fb4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0ad2556.3951b8",\r
+        "id": "e63bdf76.82117",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 5029.466796875,\r
-        "y": 2202.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2176.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "dba8eb8b.b7ea7"\r
+                "de27c7f7.c9276"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7fa69fb.085438",\r
+        "id": "801b98ce.90edc",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainC id",\r
         "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",\r
         "comments": "",\r
         "x": 5265.466796875,\r
-        "y": 2084.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2058.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dba8eb8b.b7ea7",\r
+        "id": "de27c7f7.c9276",\r
         "type": "set",\r
         "name": "set domainC ethernet layer network-id",\r
         "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",\r
         "comments": "",\r
         "x": 5264.466796875,\r
-        "y": 2326.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2300.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "10a5091f.ce791f",\r
+        "id": "44bfb2a0.4cab3c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5445.466796875,\r
-        "y": 2127.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2101.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d091f788.e8c778"\r
+                "e82fded9.073898"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70c5216d.20762",\r
+        "id": "f1164e18.e0f19",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5437.466796875,\r
-        "y": 2182.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2156.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "52797bd8.2181a4"\r
+                "85250ba4.806898"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eee03948.c8ee08",\r
+        "id": "7ca3e4f2.88fb4c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5442.466796875,\r
-        "y": 2239.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2213.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a5f87747.8903"\r
+                "7d5613c0.f5f4cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5f87747.8903",\r
+        "id": "7d5613c0.f5f4cc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 5594.466796875,\r
-        "y": 2240.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2214.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "52797bd8.2181a4",\r
+        "id": "85250ba4.806898",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 5605.466796875,\r
-        "y": 2185.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2159.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d091f788.e8c778",\r
+        "id": "e82fded9.073898",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -10340,59 +10343,59 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5589.84912109375,\r
-        "y": 2124.655792236328,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2098.9415588378906,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4f5aa4ec.a9ba44"\r
+                "7c8249af.5ed848"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f5aa4ec.a9ba44",\r
+        "id": "7c8249af.5ed848",\r
         "type": "set",\r
         "name": "set controller domainC data",\r
         "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",\r
         "comments": "",\r
         "x": 5804.466796875,\r
-        "y": 2121.0001220703125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2095.285888671875,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b98aea07.4499",\r
+        "id": "1e88543b.84a814",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 3836.13330078125,\r
-        "y": 2733,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2707.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7d724c43.dd872c"\r
+                "4bbf44dd.c34104"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7d724c43.dd872c",\r
+        "id": "4bbf44dd.c34104",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4027.13330078125,\r
-        "y": 2737,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2711.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "c26943ed.871ed8"\r
+                "ca18cabf.134c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c26943ed.871ed8",\r
+        "id": "ca18cabf.134c3",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -10400,210 +10403,210 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4154.13330078125,\r
-        "y": 2736,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2710.2857666015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a43135d6.d32b28"\r
+                "ef98dd66.570548"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a43135d6.d32b28",\r
+        "id": "ef98dd66.570548",\r
         "type": "save",\r
         "name": "get secondary root uni from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4380.467041015625,\r
-        "y": 2729.3336181640625,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2703.619384765625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "a8ebbe95.3f6e4",\r
-                "38e80218.b5d4ce",\r
-                "b6cd2169.c74bc8"\r
+                "c3cc04e3.9995e8",\r
+                "96ef8840.c20b2",\r
+                "50ef7648.d143f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8ebbe95.3f6e4",\r
+        "id": "c3cc04e3.9995e8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4747.466796875,\r
-        "y": 2623.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2597.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "e22da322.d0127"\r
+                "625acc3d.d4dd04"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38e80218.b5d4ce",\r
+        "id": "96ef8840.c20b2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4742.975830078125,\r
-        "y": 2667.7594604492188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2642.0452270507812,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "cc355488.cae9f"\r
+                "b87c29ed.e7a1d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6cd2169.c74bc8",\r
+        "id": "50ef7648.d143f",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4738.975830078125,\r
-        "y": 2717.759521484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2692.0452880859375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "78c42cb1.03bbb4"\r
+                "2796810b.682956"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61178516.955b94",\r
+        "id": "96d93656.6958b8",\r
         "type": "save",\r
         "name": "update SECONDARY-ROOT UNI in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5186.976318359375,\r
-        "y": 2712.7596435546875,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2687.04541015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e22da322.d0127",\r
+        "id": "625acc3d.d4dd04",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "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",\r
         "comments": "",\r
         "x": 4910.038330078125,\r
-        "y": 2622.6192016601562,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2596.9049682617188,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cc355488.cae9f",\r
+        "id": "b87c29ed.e7a1d8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
         "x": 4910.975830078125,\r
-        "y": 2667.7594604492188,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2642.0452270507812,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "78c42cb1.03bbb4",\r
+        "id": "2796810b.682956",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
         "x": 4907.975830078125,\r
-        "y": 2717.759521484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2692.0452880859375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "67900f7a.aee708",\r
-                "61178516.955b94"\r
+                "5a769bdf.551e9c",\r
+                "96d93656.6958b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67900f7a.aee708",\r
+        "id": "5a769bdf.551e9c",\r
         "type": "set",\r
         "name": "set new bw",\r
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />\n",\r
         "comments": "",\r
         "x": 5089.9765625,\r
-        "y": 2659.759521484375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 2634.0452880859375,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "28b93260.26eace",\r
+        "id": "b7814ecb.1580d",\r
         "type": "switchNode",\r
         "name": "switch tmp.mmUNI-id-long != SECONDARY-ROOT UNI",\r
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.SECONDARY-ROOT.uni-p-interface-long`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4624.467041015625,\r
-        "y": 3573.333251953125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3547.6190185546875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "462ac15.49ec0c"\r
+                "cf2467a.3e0e698"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "462ac15.49ec0c",\r
+        "id": "cf2467a.3e0e698",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4914.467041015625,\r
-        "y": 3575.333251953125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 3549.6190185546875,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "db4c40a7.875698"\r
+                "774ecc4a.3ad124"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abf74f44.8bd74",\r
+        "id": "fc616200.2baf58",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4277,\r
-        "y": 5803.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5777.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b3e521a4.a97f4"\r
+                "b0c64a0a.29dee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3e521a4.a97f4",\r
+        "id": "b0c64a0a.29dee8",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4468,\r
-        "y": 5807.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5781.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "aa154017.d63388"\r
+                "b39a4675.08bbf"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa154017.d63388",\r
+        "id": "b39a4675.08bbf",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -10611,65 +10614,65 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 4595,\r
-        "y": 5806.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5780.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "ea396a9e.94917"\r
+                "6b59d25.075b22c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea396a9e.94917",\r
+        "id": "6b59d25.075b22c",\r
         "type": "switchNode",\r
         "name": "switch 2-ROOTS in same domain?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 4820.3330078125,\r
-        "y": 5808.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5782.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4aa7a407.8eccb4",\r
-                "90951777.87e61"\r
+                "84c8a22.08a86e",\r
+                "8ae9054d.68fd08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4aa7a407.8eccb4",\r
+        "id": "84c8a22.08a86e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5030.3330078125,\r
-        "y": 5785.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5759.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "6131b803.ead228"\r
+                "93a0772f.9be09"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90951777.87e61",\r
+        "id": "8ae9054d.68fd08",\r
         "type": "outcomeTrue",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5035.3330078125,\r
-        "y": 5834.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5808.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "9203f8f4.976da"\r
+                "2db83bd3.7a132c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6131b803.ead228",\r
+        "id": "93a0772f.9be09",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -10677,14 +10680,14 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5156.3330078125,\r
-        "y": 5785.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5759.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9203f8f4.976da",\r
+        "id": "2db83bd3.7a132c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -10692,88 +10695,88 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 5153.3330078125,\r
-        "y": 5841.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5815.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "252aad6f.949002",\r
-                "2be015ab.396d82"\r
+                "81928378.5f469",\r
+                "9b2406e3.5e7a08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "252aad6f.949002",\r
+        "id": "81928378.5f469",\r
         "type": "save",\r
         "name": "update SECONDARY-ROOT connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5467.3330078125,\r
-        "y": 5900.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5874.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1524ee99.1e1cd1",\r
+        "id": "6888e6dc.67e04",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 5399.550048828125,\r
-        "y": 5852.13330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5826.4190673828125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2be015ab.396d82",\r
+        "id": "9b2406e3.5e7a08",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 5598,\r
-        "y": 5810.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5784.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d39caf18.6babe",\r
+        "id": "d07ac0db.fa9818",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 868,\r
-        "y": 5000.3330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4974.6187744140625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "bb5f541b.ab1a88"\r
+                "a4f6e106.afc2d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bb5f541b.ab1a88",\r
+        "id": "a4f6e106.afc2d",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1059,\r
-        "y": 5004.3330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4978.6187744140625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "d475fb98.0c79f"\r
+                "617b198c.79c0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d475fb98.0c79f",\r
+        "id": "617b198c.79c0a",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -10781,65 +10784,65 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1186,\r
-        "y": 5003.3330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4977.6187744140625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "4975d2d3.1f477c"\r
+                "f89a9d64.adeb98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4975d2d3.1f477c",\r
+        "id": "f89a9d64.adeb98",\r
         "type": "switchNode",\r
         "name": "switch 2-ROOTS in same domain?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1411.3330078125,\r
-        "y": 5005.3330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4979.6187744140625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "78d676eb.347948",\r
-                "b9cebfbe.3a16d8"\r
+                "6035813d.1e7338",\r
+                "b4705906.43572"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "78d676eb.347948",\r
+        "id": "6035813d.1e7338",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1621.3330078125,\r
-        "y": 4982.3330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4956.6187744140625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "be0beff9.053b6"\r
+                "b1155932.92831"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9cebfbe.3a16d8",\r
+        "id": "b4705906.43572",\r
         "type": "outcomeTrue",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1626.3330078125,\r
-        "y": 5031.3330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5005.6187744140625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "1ec18968.883e37"\r
+                "62407b64.a07c9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "be0beff9.053b6",\r
+        "id": "b1155932.92831",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -10847,14 +10850,14 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1747.3330078125,\r
-        "y": 4982.3330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4956.6187744140625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1ec18968.883e37",\r
+        "id": "62407b64.a07c9c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -10862,88 +10865,88 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1744.3330078125,\r
-        "y": 5038.3330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5012.6187744140625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "3f1c1ffb.4cacd8",\r
-                "643240ac.3a15a"\r
+                "d0271ecc.53e168",\r
+                "83be22a.f7cdb6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "643240ac.3a15a",\r
+        "id": "83be22a.f7cdb6",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2189,\r
-        "y": 5007.3330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 4981.6187744140625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "16675ac.2ba7ba5",\r
+        "id": "d29b17e9.2cbf8",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 1990.550048828125,\r
-        "y": 5049.1328125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5023.4185791015625,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3f1c1ffb.4cacd8",\r
+        "id": "d0271ecc.53e168",\r
         "type": "save",\r
         "name": "update SECONDARY-ROOT connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2058.3330078125,\r
-        "y": 5097.3330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5071.6187744140625,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "68e0d31a.2e51f4",\r
+        "id": "e88fc760.9f3988",\r
         "type": "switchNode",\r
         "name": "switch $hasSecondary",\r
         "xml": "<switch test='`$hasSecondary`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1470.3333740234375,\r
-        "y": 5841.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5815.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2c8509f2.c5786e"\r
+                "c0695dac.6b173"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c8509f2.c5786e",\r
+        "id": "c0695dac.6b173",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 1661.3333740234375,\r
-        "y": 5845.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5819.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "30f6f14a.076056"\r
+                "a704fbb5.caa0b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "30f6f14a.076056",\r
+        "id": "a704fbb5.caa0b",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -10951,65 +10954,65 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 1788.3333740234375,\r
-        "y": 5844.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5818.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "b9a2493.fce2438"\r
+                "bc272657.983128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b9a2493.fce2438",\r
+        "id": "bc272657.983128",\r
         "type": "switchNode",\r
         "name": "switch 2-ROOTS in same domain?",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2013.6663818359375,\r
-        "y": 5846.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5820.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7c5427a0.bfcb2",\r
-                "2b71ce9a.05df6a"\r
+                "31bdfa25.d18a2e",\r
+                "c242900c.77afd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c5427a0.bfcb2",\r
+        "id": "31bdfa25.d18a2e",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2223.6663818359375,\r
-        "y": 5823.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5797.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "7c8ca33d.b99804"\r
+                "9d78f5ef.5cf228"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b71ce9a.05df6a",\r
+        "id": "c242900c.77afd8",\r
         "type": "outcomeTrue",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2228.6663818359375,\r
-        "y": 5872.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5846.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "af2e72.47de599"\r
+                "d542d85e.71ea7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c8ca33d.b99804",\r
+        "id": "9d78f5ef.5cf228",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -11017,14 +11020,14 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 2349.6663818359375,\r
-        "y": 5823.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5797.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "af2e72.47de599",\r
+        "id": "d542d85e.71ea7",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
@@ -11032,50 +11035,89 @@
         "comments": "",\r
         "outputs": 1,\r
         "x": 2346.6663818359375,\r
-        "y": 5879.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5853.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             [\r
-                "2f308234.b92f6e",\r
-                "e716a684.8ec94"\r
+                "d23f59ed.73bc4",\r
+                "2e5ee108.277b9e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e716a684.8ec94",\r
+        "id": "2e5ee108.277b9e",\r
         "type": "call",\r
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2791.3333740234375,\r
-        "y": 5848.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5822.6192626953125,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "1f18634c.d886cd",\r
+        "id": "868b21d1.a7652",\r
         "type": "comment",\r
         "name": "Update connectivity status to modified",\r
         "info": "",\r
         "comments": "",\r
         "x": 2592.8834228515625,\r
-        "y": 5890.13330078125,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5864.4190673828125,\r
+        "z": "1806503a.76a7a",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f308234.b92f6e",\r
+        "id": "d23f59ed.73bc4",\r
         "type": "save",\r
         "name": "update SECONDARY-ROOT connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
         "x": 2660.6663818359375,\r
-        "y": 5938.33349609375,\r
-        "z": "8bd89607.6248d8",\r
+        "y": 5912.6192626953125,\r
+        "z": "1806503a.76a7a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "73f93f1a.1715d8",\r
+        "type": "execute",\r
+        "name": "execute Terminate SSE Connection",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 1520.7666625976562,\r
+        "y": 6121,\r
+        "z": "1806503a.76a7a",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "5f7e37aa.0d2258",\r
+        "type": "set",\r
+        "name": "set parameters",\r
+        "xml": "<set>\n<parameter name='subscriptionId' value='`$rcvd-bandwidth-value`' />\n",\r
+        "comments": "",\r
+        "x": 1452.800048828125,\r
+        "y": 6062.39990234375,\r
+        "z": "1806503a.76a7a",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "29311664.f24592",\r
+        "type": "execute",\r
+        "name": "execute Terminate SSE Connection",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 2069.433349609375,\r
+        "y": 5569.2333984375,\r
+        "z": "1806503a.76a7a",\r
         "wires": [\r
             []\r
         ]\r

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 fec2db1..12bb260 100755 (executable)
--- 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 97b7246..4f20a3f 100644 (file)
--- 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 662c46a..142ea56 100644 (file)
--- 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 (file)
index 0000000..c71b7aa
--- /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 1fee37b..259691f 100644 (file)
--- 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 (file)
index 0000000..0074c34
--- /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 (file)
index 0000000..101e9b9
--- /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 b058169..24968f7 100644 (file)
--- 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 (file)
index 0000000..02fd8a5
--- /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 (file)
index 0000000..1b407a3
--- /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