From 934becd6c3b0ecce44b1652820c6b4960ed5636f Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Wed, 27 Apr 2022 17:36:26 -0400
Subject: A few bug fixes for CLL closed-loop operation.

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

Former-commit-id: 08db4a2f5bf262ff34061a046ec7afada3ea802c
---
 ...cll-vnf-topology-operation-cll-F1-Activate.json | 2640 +++----
 ...URCE-API_cll-vnf-topology-operation-cll-F1.json | 2082 +++---
 ...logy-operation-cll-callbackdg-notification.json |  177 +-
 ...ll-vnf-topology-operation-cll-create-clean.json | 5348 +++++++-------
 ...-API_cll-vnf-topology-operation-cll-delete.json | 7490 ++++++++++----------
 ...-API_cll-vnf-topology-operation-cll-modify.json | 7122 +++++++++----------
 .../src/main/resources/graph.versions              |    2 +-
 ...OURCE-API_cll-vnf-topology-operation-cll-F1.xml |   36 +-
 ...ology-operation-cll-callbackdg-notification.xml |  105 +-
 ...cll-vnf-topology-operation-cll-create-clean.xml |   30 +-
 ...E-API_cll-vnf-topology-operation-cll-modify.xml |   32 +-
 11 files changed, 12555 insertions(+), 12509 deletions(-)

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

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 b318a731..9697f148 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.json
@@ -1,199 +1,199 @@
 [
     {
-        "id": "190659b8.bcae0e",
+        "id": "a7aee3f0.b04268",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 353.566650390625,
-        "y": 335,
-        "z": "8603b63b.c1c358",
+        "x": 400.566650390625,
+        "y": 374,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "b2e66c4e.a3d2f8",
-                "35dfe125.6c620e",
-                "69d67799.ffee68"
+                "96c8722a.b993c",
+                "e5061783.573db8",
+                "6a27552b.ad1ba4"
             ]
         ]
     },
     {
-        "id": "b2e66c4e.a3d2f8",
+        "id": "96c8722a.b993c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 541.566650390625,
-        "y": 348,
-        "z": "8603b63b.c1c358",
+        "x": 588.566650390625,
+        "y": 387,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "a7669132.5699f8"
+                "41e4d89f.ed1468"
             ]
         ]
     },
     {
-        "id": "35dfe125.6c620e",
+        "id": "e5061783.573db8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 549.0575866699219,
-        "y": 390.57403564453125,
-        "z": "8603b63b.c1c358",
+        "x": 596.0575866699219,
+        "y": 429.57403564453125,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "69d67799.ffee68",
+        "id": "6a27552b.ad1ba4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 539.566650390625,
-        "y": 437,
-        "z": "8603b63b.c1c358",
+        "x": 586.566650390625,
+        "y": 476,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7627d017.e729d8"
+                "a92b97b8.4129e8"
             ]
         ]
     },
     {
-        "id": "a7669132.5699f8",
+        "id": "41e4d89f.ed1468",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 714.566650390625,
-        "y": 346,
-        "z": "8603b63b.c1c358",
+        "x": 761.566650390625,
+        "y": 385,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "efea1cd6.23d6f8"
+                "cbc7d636.2def18"
             ]
         ]
     },
     {
-        "id": "efea1cd6.23d6f8",
+        "id": "cbc7d636.2def18",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 943.566650390625,
-        "y": 347,
-        "z": "8603b63b.c1c358",
+        "x": 990.566650390625,
+        "y": 386,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "afe63db8.26dbd8"
+                "39ab6bfa.74801c"
             ]
         ]
     },
     {
-        "id": "afe63db8.26dbd8",
+        "id": "39ab6bfa.74801c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1158.566650390625,
-        "y": 348,
-        "z": "8603b63b.c1c358",
+        "x": 1205.566650390625,
+        "y": 387,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "46ace79f.7f246"
+                "e124b2ef.0bfdc8"
             ]
         ]
     },
     {
-        "id": "356939c7.7d339e",
+        "id": "f6144c8.446efb",
         "type": "switchNode",
         "name": "switch vpnuuid is for this slice",
         "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1412.566650390625,
-        "y": 270,
-        "z": "8603b63b.c1c358",
+        "x": 1459.566650390625,
+        "y": 309,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "a076eac6.b4101",
-                "488c763c.46cdf"
+                "dc53b823.c6e998",
+                "b2e345a3.6b81"
             ]
         ]
     },
     {
-        "id": "a076eac6.b4101",
+        "id": "dc53b823.c6e998",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1629.566650390625,
-        "y": 249,
-        "z": "8603b63b.c1c358",
+        "x": 1676.566650390625,
+        "y": 288,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "46ace79f.7f246"
+                "e124b2ef.0bfdc8"
             ]
         ]
     },
     {
-        "id": "488c763c.46cdf",
+        "id": "b2e345a3.6b81",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1629.566650390625,
-        "y": 298,
-        "z": "8603b63b.c1c358",
+        "x": 1676.566650390625,
+        "y": 337,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "46ace79f.7f246",
+        "id": "e124b2ef.0bfdc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1813.566650390625,
-        "y": 335,
-        "z": "8603b63b.c1c358",
+        "x": 1860.566650390625,
+        "y": 374,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "5d0d530d.21fb2c",
-                "d6a4c941.f116b8",
-                "84203861.d12558"
+                "2ac81333.5163cc",
+                "ce04a89c.bde61",
+                "b01d3963.8ea8b8"
             ]
         ]
     },
     {
-        "id": "578597dc.f76518",
+        "id": "daba1b59.df55a",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 172.566650390625,
-        "y": 76,
-        "z": "8603b63b.c1c358",
+        "x": 219.566650390625,
+        "y": 115,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3273c1f.6d67d3e"
+                "53bce33c.ae731c"
             ]
         ]
     },
     {
-        "id": "3273c1f.6d67d3e",
+        "id": "53bce33c.ae731c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3711 +201,3711 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 456.8523406982422,
-        "y": 137.23810863494873,
-        "z": "8603b63b.c1c358",
+        "x": 503.8523406982422,
+        "y": 176.23810863494873,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "bc88585a.07ae"
+                "13dd53c4.ce4fbc"
             ]
         ]
     },
     {
-        "id": "bc88585a.07ae",
+        "id": "13dd53c4.ce4fbc",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-F1-Activate",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1-Activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 462.99525451660156,
-        "y": 222.00003051757812,
-        "z": "8603b63b.c1c358",
+        "x": 509.99525451660156,
+        "y": 261.0000305175781,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "c722c351.6c9218"
+                "60b5835f.a436c4"
             ]
         ]
     },
     {
-        "id": "c722c351.6c9218",
+        "id": "60b5835f.a436c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 772.8046875,
-        "y": 213.66668701171875,
-        "z": "8603b63b.c1c358",
+        "x": 819.8046875,
+        "y": 252.66668701171875,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "190659b8.bcae0e",
-                "faef4429.aa2c8",
-                "54215ea2.f0c928",
-                "8ba173b9.e36f",
-                "e82defb9.e02d8"
+                "a7aee3f0.b04268",
+                "6d17c7fb.4906d8",
+                "7de7f253.4369ac",
+                "731e9165.7bfe5",
+                "c3d34fd5.00b8e8"
             ]
         ]
     },
     {
-        "id": "5d0d530d.21fb2c",
+        "id": "2ac81333.5163cc",
         "type": "set",
         "name": "set tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
         "comments": "",
-        "x": 2030.566650390625,
-        "y": 273,
-        "z": "8603b63b.c1c358",
+        "x": 2077.566650390625,
+        "y": 312,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "6fabd371.f1d30c",
+        "id": "581b9833.ca5308",
         "type": "set",
         "name": "set attachment_param for OTN A",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
         "comments": "",
-        "x": 4199.566650390625,
-        "y": 159,
-        "z": "8603b63b.c1c358",
+        "x": 4246.566650390625,
+        "y": 198,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "aa17cc43.b708b",
+        "id": "c57ed1b4.089b78",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4280.566650390625,
-        "y": 474,
-        "z": "8603b63b.c1c358",
+        "x": 4327.566650390625,
+        "y": 513,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "709fb1ba.ca1bd",
-                "a7a19ece.dc1ae"
+                "6866347a.b34054",
+                "d9ef66bb.b2e3a"
             ]
         ]
     },
     {
-        "id": "709fb1ba.ca1bd",
+        "id": "6866347a.b34054",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4590.066650390625,
-        "y": 443,
-        "z": "8603b63b.c1c358",
+        "x": 4637.066650390625,
+        "y": 482,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "5cd036bd.ebcf28"
+                "351f2ca1.efff8c"
             ]
         ]
     },
     {
-        "id": "a7a19ece.dc1ae",
+        "id": "d9ef66bb.b2e3a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4595.066650390625,
-        "y": 508,
-        "z": "8603b63b.c1c358",
+        "x": 4642.066650390625,
+        "y": 547,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "fddf1c47.d3871"
+                "7ec1daf0.49ebbc"
             ]
         ]
     },
     {
-        "id": "5cd036bd.ebcf28",
+        "id": "351f2ca1.efff8c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4766.066650390625,
-        "y": 443,
-        "z": "8603b63b.c1c358",
+        "x": 4813.066650390625,
+        "y": 482,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "fddf1c47.d3871",
+        "id": "7ec1daf0.49ebbc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4761.566650390625,
-        "y": 508,
-        "z": "8603b63b.c1c358",
+        "x": 4808.566650390625,
+        "y": 547,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "41b8dfa5.7b07b8",
+        "id": "fe354f09.d7eaa",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
         "comments": "",
-        "x": 4145.066650390625,
-        "y": 728,
-        "z": "8603b63b.c1c358",
+        "x": 4192.066650390625,
+        "y": 767,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "a2bed09b.bd073",
+        "id": "f82c7890.c5a3a",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4299.066650390625,
-        "y": 776,
-        "z": "8603b63b.c1c358",
+        "x": 4346.066650390625,
+        "y": 815,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8f1feb66.a203a8",
-                "bdea130f.d138e8"
+                "66ca2f72.5d0ea",
+                "384ae824.cd397"
             ]
         ]
     },
     {
-        "id": "8f1feb66.a203a8",
+        "id": "66ca2f72.5d0ea",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4644.566650390625,
-        "y": 757,
-        "z": "8603b63b.c1c358",
+        "x": 4691.566650390625,
+        "y": 796,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2db058d.5e37da8"
+                "8897aa30.2d04c"
             ]
         ]
     },
     {
-        "id": "bdea130f.d138e8",
+        "id": "384ae824.cd397",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4648.566650390625,
-        "y": 797,
-        "z": "8603b63b.c1c358",
+        "x": 4695.566650390625,
+        "y": 836,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "bfbb3301.3c3"
+                "e98f7531.5d07d8"
             ]
         ]
     },
     {
-        "id": "2db058d.5e37da8",
+        "id": "8897aa30.2d04c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4802.566650390625,
-        "y": 757,
-        "z": "8603b63b.c1c358",
+        "x": 4849.566650390625,
+        "y": 796,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "bfbb3301.3c3",
+        "id": "e98f7531.5d07d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4806.066650390625,
-        "y": 797,
-        "z": "8603b63b.c1c358",
+        "x": 4853.066650390625,
+        "y": 836,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "737d402b.600cc",
-                "9643556e.80a7d8"
+                "3b168b09.265424",
+                "f9e9fb1f.d5d228"
             ]
         ]
     },
     {
-        "id": "737d402b.600cc",
+        "id": "3b168b09.265424",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5136.566650390625,
-        "y": 762,
-        "z": "8603b63b.c1c358",
+        "x": 5183.566650390625,
+        "y": 801,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "340d03c1.bc10a4",
+        "id": "293d08cf.5ba9b",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 5000.566650390625,
-        "y": 721,
-        "z": "8603b63b.c1c358",
+        "x": 5047.566650390625,
+        "y": 760,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "9643556e.80a7d8",
+        "id": "f9e9fb1f.d5d228",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5063.566650390625,
-        "y": 808,
-        "z": "8603b63b.c1c358",
+        "x": 5110.566650390625,
+        "y": 847,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3e996a09.c24c1e",
+        "id": "5b448e3f.d6f97",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4137.566650390625,
-        "y": 207,
-        "z": "8603b63b.c1c358",
+        "x": 4184.566650390625,
+        "y": 246,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "73cd2276.fc690c",
+        "id": "11357d7a.7ec893",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4163.566650390625,
-        "y": 324,
-        "z": "8603b63b.c1c358",
+        "x": 4210.566650390625,
+        "y": 363,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2ce54c47.fa0e34",
-                "f2bf065e.86763",
-                "a6105f6e.dd58c"
+                "9cee4545.4afd2",
+                "c87207dc.1fc4c8",
+                "a541f904.08a73"
             ]
         ]
     },
     {
-        "id": "2ce54c47.fa0e34",
+        "id": "9cee4545.4afd2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4359.0667724609375,
-        "y": 276,
-        "z": "8603b63b.c1c358",
+        "x": 4406.0667724609375,
+        "y": 315,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ed0df0d0.842f2"
+                "174041c6.ef00ae"
             ]
         ]
     },
     {
-        "id": "f2bf065e.86763",
+        "id": "c87207dc.1fc4c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4351.0667724609375,
-        "y": 331,
-        "z": "8603b63b.c1c358",
+        "x": 4398.0667724609375,
+        "y": 370,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "40cafd9.39fe684"
+                "2578a714.32fd88"
             ]
         ]
     },
     {
-        "id": "ed0df0d0.842f2",
+        "id": "174041c6.ef00ae",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4503.4490966796875,
-        "y": 275.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 4550.4490966796875,
+        "y": 314.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "404c86f.cf51c78"
+                "44c47bf6.544e84"
             ]
         ]
     },
     {
-        "id": "4841f833.0282b8",
+        "id": "416e074e.1652a8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5085.566650390625,
-        "y": 278,
-        "z": "8603b63b.c1c358",
+        "x": 5132.566650390625,
+        "y": 317,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "13a4c0ae.89b21f"
+                "77699d71.cb9cbc"
             ]
         ]
     },
     {
-        "id": "404c86f.cf51c78",
+        "id": "44c47bf6.544e84",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4687.566650390625,
-        "y": 274,
-        "z": "8603b63b.c1c358",
+        "x": 4734.566650390625,
+        "y": 313,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "b62cc523.462948"
+                "ec3ad4d7.e6b51"
             ]
         ]
     },
     {
-        "id": "b62cc523.462948",
+        "id": "ec3ad4d7.e6b51",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4882.566650390625,
-        "y": 274,
-        "z": "8603b63b.c1c358",
+        "x": 4929.566650390625,
+        "y": 313,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "4841f833.0282b8"
+                "416e074e.1652a8"
             ]
         ]
     },
     {
-        "id": "a6105f6e.dd58c",
+        "id": "a541f904.08a73",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4356.0667724609375,
-        "y": 388,
-        "z": "8603b63b.c1c358",
+        "x": 4403.0667724609375,
+        "y": 427,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "62b98530.ba575c"
+                "44c8faa6.17201c"
             ]
         ]
     },
     {
-        "id": "62b98530.ba575c",
+        "id": "44c8faa6.17201c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4508.0667724609375,
-        "y": 389,
-        "z": "8603b63b.c1c358",
+        "x": 4555.0667724609375,
+        "y": 428,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "40cafd9.39fe684",
+        "id": "2578a714.32fd88",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4519.0667724609375,
-        "y": 332,
-        "z": "8603b63b.c1c358",
+        "x": 4566.0667724609375,
+        "y": 371,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "ac0364e.0ddc498",
+        "id": "157b4f1e.ec4409",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5470.566650390625,
-        "y": 291,
-        "z": "8603b63b.c1c358",
+        "x": 5517.566650390625,
+        "y": 330,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "52afc77f.66ed58",
-                "690d4481.5a01f4",
-                "561d9e01.bb6af8"
+                "5eb578c.a510488",
+                "646e1345.d32534",
+                "d2cac0b5.69fe18"
             ]
         ]
     },
     {
-        "id": "13a4c0ae.89b21f",
+        "id": "77699d71.cb9cbc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5264.566650390625,
-        "y": 278,
-        "z": "8603b63b.c1c358",
+        "x": 5311.566650390625,
+        "y": 317,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3f0e652f.aee95a",
-                "ac0364e.0ddc498"
+                "e5b6fb7a.6fa868",
+                "157b4f1e.ec4409"
             ]
         ]
     },
     {
-        "id": "3f0e652f.aee95a",
+        "id": "e5b6fb7a.6fa868",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5500.566650390625,
-        "y": 239,
-        "z": "8603b63b.c1c358",
+        "x": 5547.566650390625,
+        "y": 278,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "52afc77f.66ed58",
+        "id": "5eb578c.a510488",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5680.566650390625,
-        "y": 282,
-        "z": "8603b63b.c1c358",
+        "x": 5727.566650390625,
+        "y": 321,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2a8d9ba9.4de844"
+                "e92c3ae0.67c78"
             ]
         ]
     },
     {
-        "id": "690d4481.5a01f4",
+        "id": "646e1345.d32534",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5672.566650390625,
-        "y": 337,
-        "z": "8603b63b.c1c358",
+        "x": 5719.566650390625,
+        "y": 376,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "54eb498f.c93a58"
+                "bbc83f99.73f6"
             ]
         ]
     },
     {
-        "id": "561d9e01.bb6af8",
+        "id": "d2cac0b5.69fe18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5677.566650390625,
-        "y": 394,
-        "z": "8603b63b.c1c358",
+        "x": 5724.566650390625,
+        "y": 433,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ab202d02.2d5188"
+                "2b4662b0.39c236"
             ]
         ]
     },
     {
-        "id": "ab202d02.2d5188",
+        "id": "2b4662b0.39c236",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5829.566650390625,
-        "y": 395,
-        "z": "8603b63b.c1c358",
+        "x": 5876.566650390625,
+        "y": 434,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "54eb498f.c93a58",
+        "id": "bbc83f99.73f6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5840.566650390625,
-        "y": 340,
-        "z": "8603b63b.c1c358",
+        "x": 5887.566650390625,
+        "y": 379,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2a8d9ba9.4de844",
+        "id": "e92c3ae0.67c78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5824.948974609375,
-        "y": 279.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 5871.948974609375,
+        "y": 318.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "fdb43e15.dd2458"
+                "79f8358f.b45374"
             ]
         ]
     },
     {
-        "id": "fdb43e15.dd2458",
+        "id": "79f8358f.b45374",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 6039.566650390625,
-        "y": 276,
-        "z": "8603b63b.c1c358",
+        "x": 6086.566650390625,
+        "y": 315,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "ad465d2.36cfe2",
+        "id": "ffd19574.4197a8",
         "type": "set",
         "name": "set attachment_param for OTN B",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
-        "x": 3606.566650390625,
-        "y": 1616,
-        "z": "8603b63b.c1c358",
+        "x": 3653.566650390625,
+        "y": 1655,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "1622f07d.ae60d",
+        "id": "bd3c5166.6aead",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3669.566650390625,
-        "y": 1945,
-        "z": "8603b63b.c1c358",
+        "x": 3716.566650390625,
+        "y": 1984,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "e470471b.4d3ef",
-                "8ee5f8b0.1b5738"
+                "85a267fb.c74d5",
+                "1abf40e9.7b1f1f"
             ]
         ]
     },
     {
-        "id": "e470471b.4d3ef",
+        "id": "85a267fb.c74d5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3965.066650390625,
-        "y": 1912,
-        "z": "8603b63b.c1c358",
+        "x": 4012.066650390625,
+        "y": 1951,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "fbda4868.d5b3c"
+                "8944bada.8beb4"
             ]
         ]
     },
     {
-        "id": "8ee5f8b0.1b5738",
+        "id": "1abf40e9.7b1f1f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3970.066650390625,
-        "y": 1977,
-        "z": "8603b63b.c1c358",
+        "x": 4017.066650390625,
+        "y": 2016,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "13ccd918.a15e2f"
+                "fa8bf7ac.5ecf28"
             ]
         ]
     },
     {
-        "id": "fbda4868.d5b3c",
+        "id": "8944bada.8beb4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4133.066650390625,
-        "y": 1912,
-        "z": "8603b63b.c1c358",
+        "x": 4180.066650390625,
+        "y": 1951,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "13ccd918.a15e2f",
+        "id": "fa8bf7ac.5ecf28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4143.566650390625,
-        "y": 1977,
-        "z": "8603b63b.c1c358",
+        "x": 4190.566650390625,
+        "y": 2016,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6aa679a5.fc13d8",
+        "id": "e3d71f0.616b0e",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
         "comments": "",
-        "x": 3545.566650390625,
-        "y": 1673,
-        "z": "8603b63b.c1c358",
+        "x": 3592.566650390625,
+        "y": 1712,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "63f314c3.d2093c",
+        "id": "5f81a64c.5bf2a",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3565.566650390625,
-        "y": 1770,
-        "z": "8603b63b.c1c358",
+        "x": 3612.566650390625,
+        "y": 1809,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "cb2cd4ea.b10f5",
-                "da2dd809.2eaba8",
-                "b7e5de7f.bd9438"
+                "1781a1bd.0348ce",
+                "e03bcd54.697738",
+                "94b9ef51.5409d"
             ]
         ]
     },
     {
-        "id": "cb2cd4ea.b10f5",
+        "id": "1781a1bd.0348ce",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3768.0667724609375,
-        "y": 1723,
-        "z": "8603b63b.c1c358",
+        "x": 3815.0667724609375,
+        "y": 1762,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "92ce9c5d.eb149"
+                "a95165c1.f614f8"
             ]
         ]
     },
     {
-        "id": "da2dd809.2eaba8",
+        "id": "e03bcd54.697738",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3760.0667724609375,
-        "y": 1778,
-        "z": "8603b63b.c1c358",
+        "x": 3807.0667724609375,
+        "y": 1817,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d2833ad2.c8fbd8"
+                "b5b6c797.75de6"
             ]
         ]
     },
     {
-        "id": "92ce9c5d.eb149",
+        "id": "a95165c1.f614f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3912.4490966796875,
-        "y": 1720.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 3959.4490966796875,
+        "y": 1759.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7c59c7e4.737078"
+                "5bb225c8.c4c70c"
             ]
         ]
     },
     {
-        "id": "7c59c7e4.737078",
+        "id": "5bb225c8.c4c70c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4096.566650390625,
-        "y": 1735,
-        "z": "8603b63b.c1c358",
+        "x": 4143.566650390625,
+        "y": 1774,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "4a60b77a.b003e"
+                "7747e85a.705d5"
             ]
         ]
     },
     {
-        "id": "b7e5de7f.bd9438",
+        "id": "94b9ef51.5409d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3765.0667724609375,
-        "y": 1835,
-        "z": "8603b63b.c1c358",
+        "x": 3812.0667724609375,
+        "y": 1874,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "482f9215.08666c"
+                "9d4f33d7.c972d"
             ]
         ]
     },
     {
-        "id": "482f9215.08666c",
+        "id": "9d4f33d7.c972d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3917.0667724609375,
-        "y": 1836,
-        "z": "8603b63b.c1c358",
+        "x": 3964.0667724609375,
+        "y": 1875,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d2833ad2.c8fbd8",
+        "id": "b5b6c797.75de6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3928.0667724609375,
-        "y": 1781,
-        "z": "8603b63b.c1c358",
+        "x": 3975.0667724609375,
+        "y": 1820,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8251a2fe.8b6a98",
+        "id": "7641eade.641374",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4494.566650390625,
-        "y": 1739,
-        "z": "8603b63b.c1c358",
+        "x": 4541.566650390625,
+        "y": 1778,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3fea75ef.6caa7a"
+                "745d7190.9cf208"
             ]
         ]
     },
     {
-        "id": "4a60b77a.b003e",
+        "id": "7747e85a.705d5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4291.566650390625,
-        "y": 1735,
-        "z": "8603b63b.c1c358",
+        "x": 4338.566650390625,
+        "y": 1774,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8251a2fe.8b6a98"
+                "7641eade.641374"
             ]
         ]
     },
     {
-        "id": "49b53839.01783",
+        "id": "95464c66.d9ff8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4879.566650390625,
-        "y": 1738,
-        "z": "8603b63b.c1c358",
+        "x": 4926.566650390625,
+        "y": 1777,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "b2b3032.264fd8",
-                "373b81c5.683f3e",
-                "869370b9.925f48"
+                "bb6dbaba.ff1548",
+                "a59e3175.15a9b",
+                "4bc34556.41323c"
             ]
         ]
     },
     {
-        "id": "3fea75ef.6caa7a",
+        "id": "745d7190.9cf208",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4671.566650390625,
-        "y": 1731,
-        "z": "8603b63b.c1c358",
+        "x": 4718.566650390625,
+        "y": 1770,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "dd88623a.123e",
-                "49b53839.01783"
+                "80afd84e.d6bdd8",
+                "95464c66.d9ff8"
             ]
         ]
     },
     {
-        "id": "dd88623a.123e",
+        "id": "80afd84e.d6bdd8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4909.566650390625,
-        "y": 1686,
-        "z": "8603b63b.c1c358",
+        "x": 4956.566650390625,
+        "y": 1725,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8fb4dcc3.25c568",
+        "id": "42edd12e.5451d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5238.566650390625,
-        "y": 1842,
-        "z": "8603b63b.c1c358",
+        "x": 5285.566650390625,
+        "y": 1881,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "95a386c5.a58638",
+        "id": "ea697aed.d1f358",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5249.566650390625,
-        "y": 1787,
-        "z": "8603b63b.c1c358",
+        "x": 5296.566650390625,
+        "y": 1826,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "738801a1.4d047",
+        "id": "edcb3571.8c6728",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5233.948974609375,
-        "y": 1726.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 5280.948974609375,
+        "y": 1765.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "710bce1a.dc395"
+                "6d55462a.8f8fa8"
             ]
         ]
     },
     {
-        "id": "710bce1a.dc395",
+        "id": "6d55462a.8f8fa8",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5448.566650390625,
-        "y": 1723,
-        "z": "8603b63b.c1c358",
+        "x": 5495.566650390625,
+        "y": 1762,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "b2b3032.264fd8",
+        "id": "bb6dbaba.ff1548",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5089.566650390625,
-        "y": 1729,
-        "z": "8603b63b.c1c358",
+        "x": 5136.566650390625,
+        "y": 1768,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "738801a1.4d047"
+                "edcb3571.8c6728"
             ]
         ]
     },
     {
-        "id": "373b81c5.683f3e",
+        "id": "a59e3175.15a9b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5081.566650390625,
-        "y": 1784,
-        "z": "8603b63b.c1c358",
+        "x": 5128.566650390625,
+        "y": 1823,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "95a386c5.a58638"
+                "ea697aed.d1f358"
             ]
         ]
     },
     {
-        "id": "869370b9.925f48",
+        "id": "4bc34556.41323c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5086.566650390625,
-        "y": 1841,
-        "z": "8603b63b.c1c358",
+        "x": 5133.566650390625,
+        "y": 1880,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8fb4dcc3.25c568"
+                "42edd12e.5451d"
             ]
         ]
     },
     {
-        "id": "60036337.4eba24",
+        "id": "64ebcb8e.6a273c",
         "type": "switchNode",
         "name": "switch vpn-binding has dst-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3120.566650390625,
-        "y": 687,
-        "z": "8603b63b.c1c358",
+        "x": 3167.566650390625,
+        "y": 726,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3dc5eab6.536eee",
-                "c84ae496.428be8"
+                "635bfedd.0eff1",
+                "4466b072.e153e8"
             ]
         ]
     },
     {
-        "id": "3dc5eab6.536eee",
+        "id": "635bfedd.0eff1",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3334.566650390625,
-        "y": 724,
-        "z": "8603b63b.c1c358",
+        "x": 3381.566650390625,
+        "y": 763,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "20d6afb2.5423d"
+                "f20f4b09.4270d8"
             ]
         ]
     },
     {
-        "id": "c84ae496.428be8",
+        "id": "4466b072.e153e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3336.566650390625,
-        "y": 662,
-        "z": "8603b63b.c1c358",
+        "x": 3383.566650390625,
+        "y": 701,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "c6c4710b.3b446"
+                "388a019b.9b73c6"
             ]
         ]
     },
     {
-        "id": "20d6afb2.5423d",
+        "id": "f20f4b09.4270d8",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2914.566650390625,
-        "y": 1967,
-        "z": "8603b63b.c1c358",
+        "x": 2961.566650390625,
+        "y": 2006,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "f7e1076.b120ff8",
-                "38975d3e.e2ea2a"
+                "69af1ba1.41260c",
+                "13b2b9f.1f67dc6"
             ]
         ]
     },
     {
-        "id": "f7e1076.b120ff8",
+        "id": "69af1ba1.41260c",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3167.566650390625,
-        "y": 2001,
-        "z": "8603b63b.c1c358",
+        "x": 3214.566650390625,
+        "y": 2040,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "6af8dbb6.a59b4c"
+                "c8858f37.c3f05"
             ]
         ]
     },
     {
-        "id": "38975d3e.e2ea2a",
+        "id": "13b2b9f.1f67dc6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3167.566650390625,
-        "y": 1945,
-        "z": "8603b63b.c1c358",
+        "x": 3214.566650390625,
+        "y": 1984,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2e5f8334.fd5e8c"
+                "be4790f9.3bf898"
             ]
         ]
     },
     {
-        "id": "6af8dbb6.a59b4c",
+        "id": "c8858f37.c3f05",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3318.566650390625,
-        "y": 2001,
-        "z": "8603b63b.c1c358",
+        "x": 3365.566650390625,
+        "y": 2040,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d2d4d90e.2fae",
+        "id": "7a5e210e.9e5d48",
         "type": "set",
         "name": "set vpn-bindingA and connectivityA",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4194.566650390625,
-        "y": 99,
-        "z": "8603b63b.c1c358",
+        "x": 4241.566650390625,
+        "y": 138,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "33cb0d0f.4dfe6a",
+        "id": "163461bd.87a87e",
         "type": "set",
         "name": "set vpn-bindingB and connectivityB",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
         "comments": "",
-        "x": 3602.566650390625,
-        "y": 1558,
-        "z": "8603b63b.c1c358",
+        "x": 3649.566650390625,
+        "y": 1597,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d855f72b.7e86a8",
+        "id": "354c57ea.e71ee8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3885.566650390625,
-        "y": 356,
-        "z": "8603b63b.c1c358",
+        "x": 3932.566650390625,
+        "y": 395,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d2d4d90e.2fae",
-                "6fabd371.f1d30c",
-                "3e996a09.c24c1e",
-                "73cd2276.fc690c",
-                "aa17cc43.b708b",
-                "2774aa91.aa9f06",
-                "8954306d.3c458",
-                "d41278c1.0e8268"
+                "7a5e210e.9e5d48",
+                "581b9833.ca5308",
+                "5b448e3f.d6f97",
+                "11357d7a.7ec893",
+                "c57ed1b4.089b78",
+                "5d6e99f5.a1e2d",
+                "1771c9d3.36c546",
+                "d9cf64bd.4ed12"
             ]
         ]
     },
     {
-        "id": "2e5f8334.fd5e8c",
+        "id": "be4790f9.3bf898",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3318.566650390625,
-        "y": 1944,
-        "z": "8603b63b.c1c358",
+        "x": 3365.566650390625,
+        "y": 1983,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "33cb0d0f.4dfe6a",
-                "ad465d2.36cfe2",
-                "6aa679a5.fc13d8",
-                "63f314c3.d2093c",
-                "1622f07d.ae60d",
-                "2d0bf44f.d7a87c",
-                "745353ea.a7c82c",
-                "a43e9ba4.30fe8"
+                "163461bd.87a87e",
+                "ffd19574.4197a8",
+                "e3d71f0.616b0e",
+                "5f81a64c.5bf2a",
+                "bd3c5166.6aead",
+                "b596d9f.c7daaa8",
+                "2308c235.08d20e",
+                "5a0cb184.9cdf98"
             ]
         ]
     },
     {
-        "id": "ea6929ec.54f7c8",
+        "id": "12d5b667.53ec1a",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
-        "x": 3556.566650390625,
-        "y": 2243,
-        "z": "8603b63b.c1c358",
+        "x": 3603.566650390625,
+        "y": 2282,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "5471fe10.85fa48",
+        "id": "b0af817e.3df5c",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3710.566650390625,
-        "y": 2291,
-        "z": "8603b63b.c1c358",
+        "x": 3757.566650390625,
+        "y": 2330,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "709844dc.12b89c",
-                "36a6ddd8.c214a2"
+                "8bd672ae.f97518",
+                "171382a6.de96c5"
             ]
         ]
     },
     {
-        "id": "709844dc.12b89c",
+        "id": "8bd672ae.f97518",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4056.066650390625,
-        "y": 2272,
-        "z": "8603b63b.c1c358",
+        "x": 4103.066650390625,
+        "y": 2311,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "b6a9b933.1ec16"
+                "26f501a4.aaf356"
             ]
         ]
     },
     {
-        "id": "36a6ddd8.c214a2",
+        "id": "171382a6.de96c5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4060.066650390625,
-        "y": 2312,
-        "z": "8603b63b.c1c358",
+        "x": 4107.066650390625,
+        "y": 2351,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ef6de723.b6fb38"
+                "81506f95.53e78"
             ]
         ]
     },
     {
-        "id": "b6a9b933.1ec16",
+        "id": "26f501a4.aaf356",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4214.066650390625,
-        "y": 2272,
-        "z": "8603b63b.c1c358",
+        "x": 4261.066650390625,
+        "y": 2311,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "ef6de723.b6fb38",
+        "id": "81506f95.53e78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4217.566650390625,
-        "y": 2312,
-        "z": "8603b63b.c1c358",
+        "x": 4264.566650390625,
+        "y": 2351,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "dffbfe56.944988",
-                "8e76351f.3450b"
+                "8a72bd7f.2b673",
+                "2efc6876.725c8"
             ]
         ]
     },
     {
-        "id": "dffbfe56.944988",
+        "id": "8a72bd7f.2b673",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4557.566650390625,
-        "y": 2311,
-        "z": "8603b63b.c1c358",
+        "x": 4604.566650390625,
+        "y": 2350,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a2006b0c.836e18",
+        "id": "52aaed09.836384",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4415.566650390625,
-        "y": 2269,
-        "z": "8603b63b.c1c358",
+        "x": 4462.566650390625,
+        "y": 2308,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8e76351f.3450b",
+        "id": "2efc6876.725c8",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4486.566650390625,
-        "y": 2360,
-        "z": "8603b63b.c1c358",
+        "x": 4533.566650390625,
+        "y": 2399,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "43b4f3be.c07abc",
+        "id": "601ee7c2.7cf4c8",
         "type": "set",
         "name": "set attachment_param (gfp-n) for OTN",
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
         "comments": "",
-        "x": 3111.566650390625,
-        "y": 627,
-        "z": "8603b63b.c1c358",
+        "x": 3158.566650390625,
+        "y": 666,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "a5929ea4.d560e8",
+        "id": "f8b99cf2.a93e78",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3706.566650390625,
-        "y": 313,
-        "z": "8603b63b.c1c358",
+        "x": 3753.566650390625,
+        "y": 352,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "40338a80.0ff774",
+        "id": "ba2b5c4f.29126",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3263.566650390625,
-        "y": 1891,
-        "z": "8603b63b.c1c358",
+        "x": 3310.566650390625,
+        "y": 1930,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "c6c4710b.3b446",
+        "id": "388a019b.9b73c6",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3442.566650390625,
-        "y": 475,
-        "z": "8603b63b.c1c358",
+        "x": 3489.566650390625,
+        "y": 514,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8c077d56.2d05a8",
-                "47f9e9e4.4ae948"
+                "60287d21.a15fac",
+                "e673bc57.d2c08"
             ]
         ]
     },
     {
-        "id": "47f9e9e4.4ae948",
+        "id": "e673bc57.d2c08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3684.566650390625,
-        "y": 1064,
-        "z": "8603b63b.c1c358",
+        "x": 3731.566650390625,
+        "y": 1103,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "32d70917.41b9b6"
+                "8e141356.94256"
             ]
         ]
     },
     {
-        "id": "8c077d56.2d05a8",
+        "id": "60287d21.a15fac",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3678.566650390625,
-        "y": 355,
-        "z": "8603b63b.c1c358",
+        "x": 3725.566650390625,
+        "y": 394,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d855f72b.7e86a8"
+                "354c57ea.e71ee8"
             ]
         ]
     },
     {
-        "id": "32d70917.41b9b6",
+        "id": "8e141356.94256",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3842.566650390625,
-        "y": 1063,
-        "z": "8603b63b.c1c358",
+        "x": 3889.566650390625,
+        "y": 1102,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ab9c9477.87e1",
-                "16a44de.db79032",
-                "42cda8d6.66eab8",
-                "aab7a1d7.f682c8",
-                "43e0f21e.8328e4",
-                "173252a4.3c7835"
+                "660dd4a0.d8f1f4",
+                "bd6ec24f.7d2838",
+                "2d50a497.118c24",
+                "60d7ef05.f89ff8",
+                "feec0e79.04d7e8",
+                "6270f9ff.6a6b4"
             ]
         ]
     },
     {
-        "id": "16a44de.db79032",
+        "id": "bd6ec24f.7d2838",
         "type": "set",
         "name": "set attachment_param for OTN G",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
         "comments": "",
-        "x": 4106.566650390625,
-        "y": 946,
-        "z": "8603b63b.c1c358",
+        "x": 4153.566650390625,
+        "y": 985,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "43e0f21e.8328e4",
+        "id": "feec0e79.04d7e8",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4187.566650390625,
-        "y": 1261,
-        "z": "8603b63b.c1c358",
+        "x": 4234.566650390625,
+        "y": 1300,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ecdb1dc3.601aa",
-                "9e4afd98.6cdb48"
+                "1829c13e.6c182f",
+                "cdc3e429.be6fa"
             ]
         ]
     },
     {
-        "id": "ecdb1dc3.601aa",
+        "id": "1829c13e.6c182f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4497.066650390625,
-        "y": 1230,
-        "z": "8603b63b.c1c358",
+        "x": 4544.066650390625,
+        "y": 1269,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "111350dc.469227"
+                "5b91a7ec.2e4658"
             ]
         ]
     },
     {
-        "id": "9e4afd98.6cdb48",
+        "id": "cdc3e429.be6fa",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4502.066650390625,
-        "y": 1295,
-        "z": "8603b63b.c1c358",
+        "x": 4549.066650390625,
+        "y": 1334,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "c6b74dac.622de"
+                "8046aee4.83e438"
             ]
         ]
     },
     {
-        "id": "111350dc.469227",
+        "id": "5b91a7ec.2e4658",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4673.066650390625,
-        "y": 1230,
-        "z": "8603b63b.c1c358",
+        "x": 4720.066650390625,
+        "y": 1269,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "c6b74dac.622de",
+        "id": "8046aee4.83e438",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4668.566650390625,
-        "y": 1295,
-        "z": "8603b63b.c1c358",
+        "x": 4715.566650390625,
+        "y": 1334,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "42cda8d6.66eab8",
+        "id": "2d50a497.118c24",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4044.566650390625,
-        "y": 994,
-        "z": "8603b63b.c1c358",
+        "x": 4091.566650390625,
+        "y": 1033,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "aab7a1d7.f682c8",
+        "id": "60d7ef05.f89ff8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4070.566650390625,
-        "y": 1111,
-        "z": "8603b63b.c1c358",
+        "x": 4117.566650390625,
+        "y": 1150,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "fc77fdb3.27d7c",
-                "3d52c0ff.052c58",
-                "d66dde94.6fdfd8"
+                "684da58c.28fc44",
+                "7420bdce.6aab1c",
+                "21d55314.ed559c"
             ]
         ]
     },
     {
-        "id": "fc77fdb3.27d7c",
+        "id": "684da58c.28fc44",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4266.0667724609375,
-        "y": 1063,
-        "z": "8603b63b.c1c358",
+        "x": 4313.0667724609375,
+        "y": 1102,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "6a6dadc5.106a64"
+                "64489fc6.c8241"
             ]
         ]
     },
     {
-        "id": "3d52c0ff.052c58",
+        "id": "7420bdce.6aab1c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4258.0667724609375,
-        "y": 1118,
-        "z": "8603b63b.c1c358",
+        "x": 4305.0667724609375,
+        "y": 1157,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "6a18bc26.5dd68c"
+                "92f1b89c.1ab69"
             ]
         ]
     },
     {
-        "id": "6a6dadc5.106a64",
+        "id": "64489fc6.c8241",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4410.4490966796875,
-        "y": 1062.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 4457.4490966796875,
+        "y": 1101.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "abd6aa97.319628"
+                "48d2ac4e.25f6b4"
             ]
         ]
     },
     {
-        "id": "abd6aa97.319628",
+        "id": "48d2ac4e.25f6b4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4594.566650390625,
-        "y": 1061,
-        "z": "8603b63b.c1c358",
+        "x": 4641.566650390625,
+        "y": 1100,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d45837ad.7cfdd"
+                "714ce556.4f2fcc"
             ]
         ]
     },
     {
-        "id": "d45837ad.7cfdd",
+        "id": "714ce556.4f2fcc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4789.566650390625,
-        "y": 1061,
-        "z": "8603b63b.c1c358",
+        "x": 4836.566650390625,
+        "y": 1100,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "56faad34.523464"
+                "2076535.8c263ac"
             ]
         ]
     },
     {
-        "id": "d66dde94.6fdfd8",
+        "id": "21d55314.ed559c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4263.0667724609375,
-        "y": 1175,
-        "z": "8603b63b.c1c358",
+        "x": 4310.0667724609375,
+        "y": 1214,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "da706f47.bc937"
+                "45f37411.31ce94"
             ]
         ]
     },
     {
-        "id": "da706f47.bc937",
+        "id": "45f37411.31ce94",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4415.0667724609375,
-        "y": 1176,
-        "z": "8603b63b.c1c358",
+        "x": 4462.0667724609375,
+        "y": 1215,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "6a18bc26.5dd68c",
+        "id": "92f1b89c.1ab69",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4426.0667724609375,
-        "y": 1119,
-        "z": "8603b63b.c1c358",
+        "x": 4473.0667724609375,
+        "y": 1158,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "ab9c9477.87e1",
+        "id": "660dd4a0.d8f1f4",
         "type": "set",
         "name": "set vpn-bindingG and connectivityG",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4101.566650390625,
-        "y": 886,
-        "z": "8603b63b.c1c358",
+        "x": 4148.566650390625,
+        "y": 925,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "56faad34.523464",
+        "id": "2076535.8c263ac",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4992.566650390625,
-        "y": 1065,
-        "z": "8603b63b.c1c358",
+        "x": 5039.566650390625,
+        "y": 1104,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "30b949db.4c7a16"
+                "f782ae02.7309d8"
             ]
         ]
     },
     {
-        "id": "df7b95f6.393d48",
+        "id": "4c7d2512.5b4fb4",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5377.566650390625,
-        "y": 1078,
-        "z": "8603b63b.c1c358",
+        "x": 5424.566650390625,
+        "y": 1117,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "166f182a.55dd48",
-                "e1871eda.62c8a8",
-                "b691673d.bc8c3"
+                "f27cc561.589478",
+                "533a9a4e.562074",
+                "f04fcd62.bdef1"
             ]
         ]
     },
     {
-        "id": "30b949db.4c7a16",
+        "id": "f782ae02.7309d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5171.566650390625,
-        "y": 1065,
-        "z": "8603b63b.c1c358",
+        "x": 5218.566650390625,
+        "y": 1104,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "5671583d.41ed78",
-                "df7b95f6.393d48"
+                "eec3155e.2bcec8",
+                "4c7d2512.5b4fb4"
             ]
         ]
     },
     {
-        "id": "5671583d.41ed78",
+        "id": "eec3155e.2bcec8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5407.566650390625,
-        "y": 1026,
-        "z": "8603b63b.c1c358",
+        "x": 5454.566650390625,
+        "y": 1065,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "166f182a.55dd48",
+        "id": "f27cc561.589478",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5587.566650390625,
-        "y": 1069,
-        "z": "8603b63b.c1c358",
+        "x": 5634.566650390625,
+        "y": 1108,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "61f2e54a.d8bfcc"
+                "20cc7528.d35caa"
             ]
         ]
     },
     {
-        "id": "e1871eda.62c8a8",
+        "id": "533a9a4e.562074",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5579.566650390625,
-        "y": 1124,
-        "z": "8603b63b.c1c358",
+        "x": 5626.566650390625,
+        "y": 1163,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "95391466.b0fdc8"
+                "a99b13d6.7a5b4"
             ]
         ]
     },
     {
-        "id": "b691673d.bc8c3",
+        "id": "f04fcd62.bdef1",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5584.566650390625,
-        "y": 1181,
-        "z": "8603b63b.c1c358",
+        "x": 5631.566650390625,
+        "y": 1220,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "eaaeed8c.dbf45"
+                "76e3f44a.1be574"
             ]
         ]
     },
     {
-        "id": "eaaeed8c.dbf45",
+        "id": "76e3f44a.1be574",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5736.566650390625,
-        "y": 1182,
-        "z": "8603b63b.c1c358",
+        "x": 5783.566650390625,
+        "y": 1221,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "95391466.b0fdc8",
+        "id": "a99b13d6.7a5b4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5747.566650390625,
-        "y": 1127,
-        "z": "8603b63b.c1c358",
+        "x": 5794.566650390625,
+        "y": 1166,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "61f2e54a.d8bfcc",
+        "id": "20cc7528.d35caa",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5731.948974609375,
-        "y": 1066.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 5778.948974609375,
+        "y": 1105.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "573ef3d8.3e7cf4"
+                "52e6acc9.c6278c"
             ]
         ]
     },
     {
-        "id": "573ef3d8.3e7cf4",
+        "id": "52e6acc9.c6278c",
         "type": "set",
         "name": "set controller domainG data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5946.566650390625,
-        "y": 1063,
-        "z": "8603b63b.c1c358",
+        "x": 5993.566650390625,
+        "y": 1102,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2171f884.ea7ea8",
+        "id": "7dd287b6.719d08",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3720.566650390625,
-        "y": 1004,
-        "z": "8603b63b.c1c358",
+        "x": 3767.566650390625,
+        "y": 1043,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d6a4c941.f116b8",
+        "id": "ce04a89c.bde61",
         "type": "switchNode",
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2282.566650390625,
-        "y": 731,
-        "z": "8603b63b.c1c358",
+        "x": 2329.566650390625,
+        "y": 770,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "49267234.da4bac",
-                "c034393e.41c88"
+                "f4c77699.53d898",
+                "9865c4e0.3bcc6"
             ]
         ]
     },
     {
-        "id": "c034393e.41c88",
+        "id": "9865c4e0.3bcc6",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2689.566650390625,
-        "y": 749,
-        "z": "8603b63b.c1c358",
+        "x": 2736.566650390625,
+        "y": 788,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "bc6b2cdd.907e6"
+                "ad8883f5.8e3298"
             ]
         ]
     },
     {
-        "id": "49267234.da4bac",
+        "id": "f4c77699.53d898",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2689.566650390625,
-        "y": 694,
-        "z": "8603b63b.c1c358",
+        "x": 2736.566650390625,
+        "y": 733,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "1c258f4d.ef4741"
+                "e8f3ed6f.2eafd"
             ]
         ]
     },
     {
-        "id": "1c258f4d.ef4741",
+        "id": "e8f3ed6f.2eafd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2845.566650390625,
-        "y": 692,
-        "z": "8603b63b.c1c358",
+        "x": 2892.566650390625,
+        "y": 731,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "43b4f3be.c07abc",
-                "60036337.4eba24"
+                "601ee7c2.7cf4c8",
+                "64ebcb8e.6a273c"
             ]
         ]
     },
     {
-        "id": "bc6b2cdd.907e6",
+        "id": "ad8883f5.8e3298",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2822.566650390625,
-        "y": 750,
-        "z": "8603b63b.c1c358",
+        "x": 2869.566650390625,
+        "y": 789,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "faef4429.aa2c8",
+        "id": "6d17c7fb.4906d8",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 999.566650390625,
-        "y": 166,
-        "z": "8603b63b.c1c358",
+        "x": 1046.566650390625,
+        "y": 205,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "cda219ec.f988b",
+        "id": "c6c6f64f.fccbe8",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 4116.566650390625,
-        "y": 584,
-        "z": "8603b63b.c1c358",
+        "x": 4163.566650390625,
+        "y": 623,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2774aa91.aa9f06",
+        "id": "5d6e99f5.a1e2d",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4176.566650390625,
-        "y": 623,
-        "z": "8603b63b.c1c358",
+        "x": 4223.566650390625,
+        "y": 662,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "54215ea2.f0c928",
+        "id": "7de7f253.4369ac",
         "type": "set",
         "name": "unset leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaf-tunnels-list.`' value='' />\n<parameter name='`leaf-tunnels-list_length`' value='0' />\n<parameter name='`leaftunsidx`' value='0' />\n",
         "comments": "",
-        "x": 992.566650390625,
-        "y": 74,
-        "z": "8603b63b.c1c358",
+        "x": 1039.566650390625,
+        "y": 113,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "96b9a282.e630c",
+        "id": "9d19ef7b.02af28",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 3528.566650390625,
-        "y": 2100,
-        "z": "8603b63b.c1c358",
+        "x": 3575.566650390625,
+        "y": 2139,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2d0bf44f.d7a87c",
+        "id": "b596d9f.c7daaa8",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3584.566650390625,
-        "y": 2149,
-        "z": "8603b63b.c1c358",
+        "x": 3631.566650390625,
+        "y": 2188,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "5152a0e6.713128",
+        "id": "aeebae01.261168",
         "type": "set",
         "name": "unset root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`root-tunnels-list.`' value='' />\n<parameter name='`root-tunnels-list_length`' value='0' />\n<parameter name='`roottunsidx`' value='0' />\n",
         "comments": "",
-        "x": 992.566650390625,
-        "y": 113,
-        "z": "8603b63b.c1c358",
+        "x": 1039.566650390625,
+        "y": 152,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8ba173b9.e36f",
+        "id": "731e9165.7bfe5",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1023.566650390625,
-        "y": 214,
-        "z": "8603b63b.c1c358",
+        "x": 1070.566650390625,
+        "y": 253,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e82defb9.e02d8",
+        "id": "c3d34fd5.00b8e8",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--$vnf-topology-operation-input.service-information.service-instance-id-->",
         "comments": "",
         "outputs": 1,
-        "x": 233.566650390625,
-        "y": 689,
-        "z": "8603b63b.c1c358",
+        "x": 280.566650390625,
+        "y": 728,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2d5a1d5b.838492",
-                "889991f3.032d8",
-                "b5db494f.57cef8"
+                "39350f2.499cf7",
+                "6ce2e49e.7b3484",
+                "5333638f.7ecf8c"
             ]
         ]
     },
     {
-        "id": "2d5a1d5b.838492",
+        "id": "39350f2.499cf7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 452.566650390625,
-        "y": 627,
-        "z": "8603b63b.c1c358",
+        "x": 499.566650390625,
+        "y": 666,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "438119f5.89426"
+                "36841c29.6decdc"
             ]
         ]
     },
     {
-        "id": "889991f3.032d8",
+        "id": "6ce2e49e.7b3484",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 462.0576171875,
-        "y": 669.5740356445312,
-        "z": "8603b63b.c1c358",
+        "x": 509.0576171875,
+        "y": 708.5740356445312,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5db494f.57cef8",
+        "id": "5333638f.7ecf8c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 450.566650390625,
-        "y": 716,
-        "z": "8603b63b.c1c358",
+        "x": 497.566650390625,
+        "y": 755,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "debce4b9.8571d"
+                "3e93247c.aebb34"
             ]
         ]
     },
     {
-        "id": "438119f5.89426",
+        "id": "36841c29.6decdc",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 649.566650390625,
-        "y": 623,
-        "z": "8603b63b.c1c358",
+        "x": 696.566650390625,
+        "y": 662,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "e1b02bed.ab2ac8"
+                "1f2c86c7.cadda9"
             ]
         ]
     },
     {
-        "id": "debce4b9.8571d",
+        "id": "3e93247c.aebb34",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 619.566650390625,
-        "y": 717,
-        "z": "8603b63b.c1c358",
+        "x": 666.566650390625,
+        "y": 756,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "e1b02bed.ab2ac8",
+        "id": "1f2c86c7.cadda9",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 872.900146484375,
-        "y": 622.9999389648438,
-        "z": "8603b63b.c1c358",
+        "x": 919.900146484375,
+        "y": 661.9999389648438,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "e03ee0c1.da854"
+                "a1cbb7bd.24594"
             ]
         ]
     },
     {
-        "id": "e03ee0c1.da854",
+        "id": "a1cbb7bd.24594",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1073.5667839050293,
-        "y": 624.000020980835,
-        "z": "8603b63b.c1c358",
+        "x": 1120.5667839050293,
+        "y": 663.000020980835,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "c4a6ee39.d82118"
+                "1f60fbe4.6df234"
             ]
         ]
     },
     {
-        "id": "c4a6ee39.d82118",
+        "id": "1f60fbe4.6df234",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 203.566650390625,
-        "y": 886,
-        "z": "8603b63b.c1c358",
+        "x": 250.566650390625,
+        "y": 925,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7634ec98.e6038c",
-                "916099a4.9dccf",
-                "c850e0b6.e35a68"
+                "63c00e4f.b84e58",
+                "13815c78.95eb5c",
+                "e5780368.e11db"
             ]
         ]
     },
     {
-        "id": "7634ec98.e6038c",
+        "id": "63c00e4f.b84e58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 411.566650390625,
-        "y": 850,
-        "z": "8603b63b.c1c358",
+        "x": 458.566650390625,
+        "y": 889,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "33f1fe4a.c9d6f2"
+                "c1076b8e.81d988"
             ]
         ]
     },
     {
-        "id": "916099a4.9dccf",
+        "id": "13815c78.95eb5c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 412.0576171875,
-        "y": 895.5740356445312,
-        "z": "8603b63b.c1c358",
+        "x": 459.0576171875,
+        "y": 934.5740356445312,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c850e0b6.e35a68",
+        "id": "e5780368.e11db",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 409.566650390625,
-        "y": 939,
-        "z": "8603b63b.c1c358",
+        "x": 456.566650390625,
+        "y": 978,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "76c84cf.6c8b334"
+                "96cea788.4bc5b"
             ]
         ]
     },
     {
-        "id": "76c84cf.6c8b334",
+        "id": "96cea788.4bc5b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 578.566650390625,
-        "y": 940,
-        "z": "8603b63b.c1c358",
+        "x": 625.566650390625,
+        "y": 979,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d82baf7f.56b2f",
+        "id": "ec5bb05c.091188",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 550.566650390625,
-        "y": 1434,
-        "z": "8603b63b.c1c358",
+        "x": 597.566650390625,
+        "y": 1473,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3c41a0c0.d2817"
+                "19a0d254.b680d6"
             ]
         ]
     },
     {
-        "id": "3c41a0c0.d2817",
+        "id": "19a0d254.b680d6",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 753.566650390625,
-        "y": 1446,
-        "z": "8603b63b.c1c358",
+        "x": 800.566650390625,
+        "y": 1485,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "24edffac.eaf52"
+                "5cf33a37.92a98c"
             ]
         ]
     },
     {
-        "id": "24edffac.eaf52",
+        "id": "5cf33a37.92a98c",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 919.566650390625,
-        "y": 1443,
-        "z": "8603b63b.c1c358",
+        "x": 966.566650390625,
+        "y": 1482,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8767ddb8.be5188"
+                "60d055a9.95f0c4"
             ]
         ]
     },
     {
-        "id": "8767ddb8.be5188",
+        "id": "60d055a9.95f0c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1080.566650390625,
-        "y": 1440,
-        "z": "8603b63b.c1c358",
+        "x": 1127.566650390625,
+        "y": 1479,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "acad8b74.fa56d8",
-                "31574f1b.e35268",
-                "9a0e95d9.2f80c",
-                "559bb9d.67d2e48",
-                "d55a6f33.2c1388",
-                "bc764283.2e9fd8"
+                "325c2337.f5bbac",
+                "282c70ac.7ebb8",
+                "790547b3.03e69",
+                "be332a4a.d8db58",
+                "88b6396e.dee88",
+                "3f4654a9.b7d9fc"
             ]
         ]
     },
     {
-        "id": "31574f1b.e35268",
+        "id": "282c70ac.7ebb8",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1286.566650390625,
-        "y": 1039.9999389648438,
-        "z": "8603b63b.c1c358",
+        "x": 1333.566650390625,
+        "y": 1078.9999389648438,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "acad8b74.fa56d8",
+        "id": "325c2337.f5bbac",
         "type": "save",
         "name": "get uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1283.566650390625,
-        "y": 1084.9999389648438,
-        "z": "8603b63b.c1c358",
+        "x": 1330.566650390625,
+        "y": 1123.9999389648438,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "1904c12b.d430cf",
-                "4ab95198.c6613",
-                "5a08d5cf.278d24"
+                "5ebf3dd3.403df4",
+                "df8620f2.fcde78",
+                "4f82abb0.8dd704"
             ]
         ]
     },
     {
-        "id": "4ab95198.c6613",
+        "id": "df8620f2.fcde78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1479.0576171875,
-        "y": 1058.5739135742188,
-        "z": "8603b63b.c1c358",
+        "x": 1526.0576171875,
+        "y": 1097.5739135742188,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ba7aa021.45bdf8"
+                "f317bbdf.6454e"
             ]
         ]
     },
     {
-        "id": "5a08d5cf.278d24",
+        "id": "4f82abb0.8dd704",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1474.566650390625,
-        "y": 1102.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1521.566650390625,
+        "y": 1141.9998779296875,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "785f1788.92249"
+                "ba985891.b5d178"
             ]
         ]
     },
     {
-        "id": "ba7aa021.45bdf8",
+        "id": "f317bbdf.6454e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1641.629150390625,
-        "y": 1057.859619140625,
-        "z": "8603b63b.c1c358",
+        "x": 1688.629150390625,
+        "y": 1096.859619140625,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "785f1788.92249",
+        "id": "ba985891.b5d178",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1642.566650390625,
-        "y": 1102.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1689.566650390625,
+        "y": 1141.9998779296875,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "cc679883.b7f1b8",
+        "id": "d594aca6.9a4aa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1644.566650390625,
-        "y": 1149.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1691.566650390625,
+        "y": 1188.9998779296875,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1904c12b.d430cf",
+        "id": "5ebf3dd3.403df4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1475.566650390625,
-        "y": 1149.9998779296875,
-        "z": "8603b63b.c1c358",
+        "x": 1522.566650390625,
+        "y": 1188.9998779296875,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "cc679883.b7f1b8"
+                "d594aca6.9a4aa"
             ]
         ]
     },
     {
-        "id": "1a421455.86d86c",
+        "id": "f22d69be.3697f8",
         "type": "comment",
         "name": "CLL new",
         "info": "construct two array structures like these:\n\n${otn-tunnels-name-list[${1}].otn-tunnel-name}\n\n----------------\n${ethernet-srv-end-points-list[${1}].ethernet-end-point-name}\n${ethernet-srv-end-points-list[${1}].index-number},\n${ethernet-srv-end-points-list[${1}].eth-node-id},\n${ethernet-srv-end-points-list[${1}].eth-node-tp-id},\n${ethernet-srv-end-points-list[${1}].leafOrRootAccess}\n${ethernet-srv-end-points-list[${1}].cvlan}\n${ethernet-srv-end-points-list[${1}].CIR}\n${ethernet-srv-end-points-list[${1}].EIR}",
         "comments": "",
-        "x": 1257.566650390625,
-        "y": 1671,
-        "z": "8603b63b.c1c358",
+        "x": 1304.566650390625,
+        "y": 1710,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "9a0e95d9.2f80c",
+        "id": "790547b3.03e69",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1348.566650390625,
-        "y": 1725,
-        "z": "8603b63b.c1c358",
+        "x": 1395.566650390625,
+        "y": 1764,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "62fb7c08.30d35c",
+        "id": "a6f0acc2.4c1e8",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2025.066650390625,
-        "y": 1138,
-        "z": "8603b63b.c1c358",
+        "x": 2072.066650390625,
+        "y": 1177,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "b56049ef.636ab",
+        "id": "ff492e23.69ead8",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2030.066650390625,
-        "y": 1240,
-        "z": "8603b63b.c1c358",
+        "x": 2077.066650390625,
+        "y": 1279,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "513cbd5b.994ffc",
+        "id": "f2cd3854.ada88",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 513.566650390625,
-        "y": 1690,
-        "z": "8603b63b.c1c358",
+        "x": 560.566650390625,
+        "y": 1729,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "a14556b2.428608"
+                "6040df7.067df2"
             ]
         ]
     },
     {
-        "id": "a14556b2.428608",
+        "id": "6040df7.067df2",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 745.566650390625,
-        "y": 1689,
-        "z": "8603b63b.c1c358",
+        "x": 792.566650390625,
+        "y": 1728,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "e5395881.3f95e"
+                "f4813036.0e422"
             ]
         ]
     },
     {
-        "id": "e5395881.3f95e",
+        "id": "f4813036.0e422",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 957.566650390625,
-        "y": 1690,
-        "z": "8603b63b.c1c358",
+        "x": 1004.566650390625,
+        "y": 1729,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ee871fda.29052"
+                "21d7816d.cb9a2e"
             ]
         ]
     },
     {
-        "id": "ee871fda.29052",
+        "id": "21d7816d.cb9a2e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 213.566650390625,
-        "y": 1846,
-        "z": "8603b63b.c1c358",
+        "x": 260.566650390625,
+        "y": 1885,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d07450f8.7cfbd8",
-                "c80ac602.107b6"
+                "99bd9d6a.34096",
+                "25dea7fd.0f37b"
             ]
         ]
     },
     {
-        "id": "c80ac602.107b6",
+        "id": "25dea7fd.0f37b",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 448.566650390625,
-        "y": 1833,
-        "z": "8603b63b.c1c358",
+        "x": 495.566650390625,
+        "y": 1872,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d07450f8.7cfbd8",
+        "id": "99bd9d6a.34096",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 438.566650390625,
-        "y": 1894,
-        "z": "8603b63b.c1c358",
+        "x": 485.566650390625,
+        "y": 1933,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "3c9f89f1.b2d72e",
-                "7eb3712.5c8929",
-                "ab93aafa.12aed"
+                "74a706a.d47d878",
+                "7274c8e3.f8fec8",
+                "b6208f6.4c1eb7"
             ]
         ]
     },
     {
-        "id": "7eb3712.5c8929",
+        "id": "7274c8e3.f8fec8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 652.0576171875,
-        "y": 1878.5740356445312,
-        "z": "8603b63b.c1c358",
+        "x": 699.0576171875,
+        "y": 1917.5740356445312,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "abd0cdd.d934eb"
+                "7f886391.998a1c"
             ]
         ]
     },
     {
-        "id": "ab93aafa.12aed",
+        "id": "b6208f6.4c1eb7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 647.566650390625,
-        "y": 1923,
-        "z": "8603b63b.c1c358",
+        "x": 694.566650390625,
+        "y": 1962,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "b79502c7.acaad8"
+                "3f233556.698682"
             ]
         ]
     },
     {
-        "id": "3c9f89f1.b2d72e",
+        "id": "74a706a.d47d878",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 649.566650390625,
-        "y": 1983,
-        "z": "8603b63b.c1c358",
+        "x": 696.566650390625,
+        "y": 2022,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "509a448f.bd538c"
+                "721ed34e.4f1714"
             ]
         ]
     },
     {
-        "id": "abd0cdd.d934eb",
+        "id": "7f886391.998a1c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 814.629150390625,
-        "y": 1877.8597412109375,
-        "z": "8603b63b.c1c358",
+        "x": 861.629150390625,
+        "y": 1916.8597412109375,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "b79502c7.acaad8",
+        "id": "3f233556.698682",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 815.566650390625,
-        "y": 1923,
-        "z": "8603b63b.c1c358",
+        "x": 862.566650390625,
+        "y": 1962,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "509a448f.bd538c",
+        "id": "721ed34e.4f1714",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 818.566650390625,
-        "y": 1982,
-        "z": "8603b63b.c1c358",
+        "x": 865.566650390625,
+        "y": 2021,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "fd6f29b3.e5c99",
-                "f26de900.3c25f8"
+                "fb6c612a.831f28",
+                "af0310e2.931fe8"
             ]
         ]
     },
     {
-        "id": "3501776f.2dad38",
+        "id": "a05b5003.46c7e8",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<parameter name='service-instance-id-or-cll-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
         "comments": "",
-        "x": 238.566650390625,
-        "y": 2484,
-        "z": "8603b63b.c1c358",
+        "x": 285.566650390625,
+        "y": 2523,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "ae9e098e.f50fb",
+        "id": "c5885881.921d18",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 360.566650390625,
-        "y": 2541,
-        "z": "8603b63b.c1c358",
+        "x": 407.566650390625,
+        "y": 2580,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "be334cda.e25598",
-                "43d4ffc9.f69dc"
+                "1736d2be.a7f385",
+                "11bf3fb5.747c4"
             ]
         ]
     },
     {
-        "id": "be334cda.e25598",
+        "id": "1736d2be.a7f385",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 673.066650390625,
-        "y": 2518,
-        "z": "8603b63b.c1c358",
+        "x": 720.066650390625,
+        "y": 2557,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "43d4ffc9.f69dc",
+        "id": "11bf3fb5.747c4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 677.066650390625,
-        "y": 2558,
-        "z": "8603b63b.c1c358",
+        "x": 724.066650390625,
+        "y": 2597,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "f38c34e4.0af87"
+                "9fa6731e.bfdda"
             ]
         ]
     },
     {
-        "id": "1415cbe4.3643cc",
+        "id": "d975bee8.cbb1b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 853.066650390625,
-        "y": 2522,
-        "z": "8603b63b.c1c358",
+        "x": 900.066650390625,
+        "y": 2561,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "f38c34e4.0af87",
+        "id": "9fa6731e.bfdda",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 868.566650390625,
-        "y": 2576,
-        "z": "8603b63b.c1c358",
+        "x": 915.566650390625,
+        "y": 2615,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "38f98e31.2df7c2",
-                "2709d484.f39df4",
-                "708149ff.3b7b8",
-                "40e18201.7f31fc"
+                "26102eb4.5bf9d2",
+                "a5cf86e7.fd2ae8",
+                "94107493.94d3e8",
+                "c85f3994.bd81f"
             ]
         ]
     },
     {
-        "id": "4fb2f1f7.44fff8",
+        "id": "3a7c38a3.d1311",
         "type": "save",
         "name": "update vpn-binding resource (aka. OTN ) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1164.066650390625,
-        "y": 2545,
-        "z": "8603b63b.c1c358",
+        "x": 1211.066650390625,
+        "y": 2584,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8d799ed5.7c896",
+        "id": "d5ebfe0.284f7",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 2631.066650390625,
-        "y": 1896,
-        "z": "8603b63b.c1c358",
+        "x": 2678.066650390625,
+        "y": 1935,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "38f98e31.2df7c2",
+        "id": "26102eb4.5bf9d2",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1126.066650390625,
-        "y": 2587,
-        "z": "8603b63b.c1c358",
+        "x": 1173.066650390625,
+        "y": 2626,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "421d14d0.8fa8dc",
+        "id": "eaf51112.30b59",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 1991.066650390625,
-        "y": 1176,
-        "z": "8603b63b.c1c358",
+        "x": 2038.066650390625,
+        "y": 1215,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "f196d566.5b274",
+        "id": "77e27285.394bfc",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 1992.066650390625,
-        "y": 1280,
-        "z": "8603b63b.c1c358",
+        "x": 2039.066650390625,
+        "y": 1319,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8954306d.3c458",
+        "id": "1771c9d3.36c546",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4285.566650390625,
-        "y": 537,
-        "z": "8603b63b.c1c358",
+        "x": 4332.566650390625,
+        "y": 576,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "173252a4.3c7835",
+        "id": "6270f9ff.6a6b4",
         "type": "save",
         "name": "update vpn-binding G resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4188.566650390625,
-        "y": 1356,
-        "z": "8603b63b.c1c358",
+        "x": 4235.566650390625,
+        "y": 1395,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "745353ea.a7c82c",
+        "id": "2308c235.08d20e",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3682.566650390625,
-        "y": 2028,
-        "z": "8603b63b.c1c358",
+        "x": 3729.566650390625,
+        "y": 2067,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "33f1fe4a.c9d6f2",
+        "id": "c1076b8e.81d988",
         "type": "switchNode",
         "name": "switch connectivity is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.connectivity.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 783.566650390625,
-        "y": 836,
-        "z": "8603b63b.c1c358",
+        "x": 830.566650390625,
+        "y": 875,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "c7ca69b2.c33e8",
-                "dbefa186.4d7f68"
+                "451a757.6fc508c",
+                "8b0542af.2f9d78"
             ]
         ]
     },
     {
-        "id": "c7ca69b2.c33e8",
+        "id": "451a757.6fc508c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1146.566650390625,
-        "y": 859,
-        "z": "8603b63b.c1c358",
+        "x": 1193.566650390625,
+        "y": 898,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "100503a.a2b7efc"
+                "f1ea0737.b79178"
             ]
         ]
     },
     {
-        "id": "dbefa186.4d7f68",
+        "id": "8b0542af.2f9d78",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1146.566650390625,
-        "y": 808,
-        "z": "8603b63b.c1c358",
+        "x": 1193.566650390625,
+        "y": 847,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "5ea3a0fe.77a12"
+                "3e6bbe33.acc602"
             ]
         ]
     },
     {
-        "id": "100503a.a2b7efc",
+        "id": "f1ea0737.b79178",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1302.566650390625,
-        "y": 857,
-        "z": "8603b63b.c1c358",
+        "x": 1349.566650390625,
+        "y": 896,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "8fcbaf21.052888"
+                "cb3a4052.881008"
             ]
         ]
     },
     {
-        "id": "5ea3a0fe.77a12",
+        "id": "3e6bbe33.acc602",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1279.566650390625,
-        "y": 809,
-        "z": "8603b63b.c1c358",
+        "x": 1326.566650390625,
+        "y": 848,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "84203861.d12558",
+        "id": "b01d3963.8ea8b8",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2039.566650390625,
-        "y": 207,
-        "z": "8603b63b.c1c358",
+        "x": 2086.566650390625,
+        "y": 246,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "a43e9ba4.30fe8",
+        "id": "5a0cb184.9cdf98",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3581.566650390625,
-        "y": 2188,
-        "z": "8603b63b.c1c358",
+        "x": 3628.566650390625,
+        "y": 2227,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "d41278c1.0e8268",
+        "id": "d9cf64bd.4ed12",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4171.566650390625,
-        "y": 661,
-        "z": "8603b63b.c1c358",
+        "x": 4218.566650390625,
+        "y": 700,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "559bb9d.67d2e48",
+        "id": "be332a4a.d8db58",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1345.566650390625,
-        "y": 1767,
-        "z": "8603b63b.c1c358",
+        "x": 1392.566650390625,
+        "y": 1806,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "11998164.d0953f",
+        "id": "3501da3.a014526",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 524.566650390625,
-        "y": 1501,
-        "z": "8603b63b.c1c358",
+        "x": 571.566650390625,
+        "y": 1540,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "3fbbcb97.f97994",
+        "id": "2c2649c2.53ac7e",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenameclleths`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 555.566650390625,
-        "y": 1541,
-        "z": "8603b63b.c1c358",
+        "x": 602.566650390625,
+        "y": 1580,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fd6f29b3.e5c99",
+        "id": "fb6c612a.831f28",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />\n<parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1103.566650390625,
-        "y": 1949,
-        "z": "8603b63b.c1c358",
+        "x": 1150.566650390625,
+        "y": 1988,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "f26de900.3c25f8",
+        "id": "af0310e2.931fe8",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1106.566650390625,
-        "y": 1991,
-        "z": "8603b63b.c1c358",
+        "x": 1153.566650390625,
+        "y": 2030,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "10dd7514.d835b3",
+        "id": "694d6c2f.8edccc",
         "type": "set",
         "name": "unset otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otn-tunnels-name-list.`' value='' />\n<parameter name='`otn-tunnels-name-list_length`' value='0' />\n<parameter name='`otntunsidx`' value='0' />\n",
         "comments": "",
-        "x": 549.566650390625,
-        "y": 1631,
-        "z": "8603b63b.c1c358",
+        "x": 596.566650390625,
+        "y": 1670,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "9cbc66e4.acef28",
+        "id": "4b32fbef.652bc4",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 304.566650390625,
-        "y": 2010,
-        "z": "8603b63b.c1c358",
+        "x": 351.566650390625,
+        "y": 2049,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2ee73d5.0d9a4c2",
+        "id": "caa8a64f.1936",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamecllotns`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 312.566650390625,
-        "y": 2067,
-        "z": "8603b63b.c1c358",
+        "x": 359.566650390625,
+        "y": 2106,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d55a6f33.2c1388",
+        "id": "88b6396e.dee88",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1323.566650390625,
-        "y": 1616,
-        "z": "8603b63b.c1c358",
+        "x": 1370.566650390625,
+        "y": 1655,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "9cf30931.2c59c8",
-                "da4af294.46477"
+                "45e3fdbe.201574",
+                "86940004.bfdd7"
             ]
         ]
     },
     {
-        "id": "da4af294.46477",
+        "id": "86940004.bfdd7",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1546.566650390625,
-        "y": 1571,
-        "z": "8603b63b.c1c358",
+        "x": 1593.566650390625,
+        "y": 1610,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "66fe36a9.5f3c98"
+                "c31b8cce.808f08"
             ]
         ]
     },
     {
-        "id": "9cf30931.2c59c8",
+        "id": "45e3fdbe.201574",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1548.566650390625,
-        "y": 1635,
-        "z": "8603b63b.c1c358",
+        "x": 1595.566650390625,
+        "y": 1674,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "204d74d2.252cac"
+                "1cc861e4.834c36"
             ]
         ]
     },
     {
-        "id": "66fe36a9.5f3c98",
+        "id": "c31b8cce.808f08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1711.566650390625,
-        "y": 1568,
-        "z": "8603b63b.c1c358",
+        "x": 1758.566650390625,
+        "y": 1607,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "4c93c317.b90e14"
+                "b2423aca.7a4fa8"
             ]
         ]
     },
     {
-        "id": "204d74d2.252cac",
+        "id": "1cc861e4.834c36",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 1710.566650390625,
-        "y": 1631,
-        "z": "8603b63b.c1c358",
+        "x": 1757.566650390625,
+        "y": 1670,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "4c93c317.b90e14",
+        "id": "b2423aca.7a4fa8",
         "type": "set",
         "name": "set tmp.uni-node-id-short",
         "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",
         "comments": "",
-        "x": 1931.566650390625,
-        "y": 1582,
-        "z": "8603b63b.c1c358",
+        "x": 1978.566650390625,
+        "y": 1621,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "83593740.e4ddd",
+        "id": "45f30159.842648",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1476.566650390625,
-        "y": 2307,
-        "z": "8603b63b.c1c358",
+        "x": 1523.566650390625,
+        "y": 2346,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "bc0ef8cb.38db18"
+                "195465ca.996e92"
             ]
         ]
     },
     {
-        "id": "a1ab9a32.41426",
+        "id": "ac9df433.f2c8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 1861.566650390625,
-        "y": 2320,
-        "z": "8603b63b.c1c358",
+        "x": 1908.566650390625,
+        "y": 2359,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "eafaddf4.4288",
-                "a1c53fdc.e94408",
-                "b9669b07.a51828"
+                "565cac1f.04fa64",
+                "e43b7ac1.fcb9e",
+                "7ad49b0d.e0614c"
             ]
         ]
     },
     {
-        "id": "bc0ef8cb.38db18",
+        "id": "195465ca.996e92",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1655.566650390625,
-        "y": 2307,
-        "z": "8603b63b.c1c358",
+        "x": 1702.566650390625,
+        "y": 2346,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2580690.f3eb118",
-                "a1ab9a32.41426"
+                "94dbb559.adb488",
+                "ac9df433.f2c8"
             ]
         ]
     },
     {
-        "id": "2580690.f3eb118",
+        "id": "94dbb559.adb488",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainConn id",
         "xml": "<set>\n<parameter name='tmp.domainConn.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 1891.566650390625,
-        "y": 2268,
-        "z": "8603b63b.c1c358",
+        "x": 1938.566650390625,
+        "y": 2307,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "eafaddf4.4288",
+        "id": "565cac1f.04fa64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2071.566650390625,
-        "y": 2311,
-        "z": "8603b63b.c1c358",
+        "x": 2118.566650390625,
+        "y": 2350,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "13cd3d1.ffcccc3"
+                "b1dc084c.7cde9"
             ]
         ]
     },
     {
-        "id": "a1c53fdc.e94408",
+        "id": "e43b7ac1.fcb9e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2063.566650390625,
-        "y": 2366,
-        "z": "8603b63b.c1c358",
+        "x": 2110.566650390625,
+        "y": 2405,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7da7ccee.d6972c"
+                "385c483c.3ef568"
             ]
         ]
     },
     {
-        "id": "b9669b07.a51828",
+        "id": "7ad49b0d.e0614c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2068.566650390625,
-        "y": 2423,
-        "z": "8603b63b.c1c358",
+        "x": 2115.566650390625,
+        "y": 2462,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2930329b.329efe"
+                "35f4b5a3.f8aa4a"
             ]
         ]
     },
     {
-        "id": "2930329b.329efe",
+        "id": "35f4b5a3.f8aa4a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2220.566650390625,
-        "y": 2424,
-        "z": "8603b63b.c1c358",
+        "x": 2267.566650390625,
+        "y": 2463,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "7da7ccee.d6972c",
+        "id": "385c483c.3ef568",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2231.566650390625,
-        "y": 2369,
-        "z": "8603b63b.c1c358",
+        "x": 2278.566650390625,
+        "y": 2408,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "13cd3d1.ffcccc3",
+        "id": "b1dc084c.7cde9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2215.948974609375,
-        "y": 2308.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 2262.948974609375,
+        "y": 2347.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "febf727.ffe5c9"
+                "5d32a434.f7be54"
             ]
         ]
     },
     {
-        "id": "febf727.ffe5c9",
+        "id": "5d32a434.f7be54",
         "type": "set",
         "name": "set controller domainConn data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value=\"`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 2430.566650390625,
-        "y": 2305,
-        "z": "8603b63b.c1c358",
+        "x": 2477.566650390625,
+        "y": 2344,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "2716544d.2e4214",
+        "id": "51bc490a.0719c",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.pnf-name-forUrl\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 554.566650390625,
-        "y": 2353,
-        "z": "8603b63b.c1c358",
+        "x": 601.566650390625,
+        "y": 2392,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "a2a1891d.4d5168",
-                "9cd28e00.2567d",
-                "a8c6a166.3984e"
+                "9a98fb41.58116",
+                "d11dcfed.810438",
+                "f803d5ab.85238"
             ]
         ]
     },
     {
-        "id": "a2a1891d.4d5168",
+        "id": "9a98fb41.58116",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 750.0667724609375,
-        "y": 2305,
-        "z": "8603b63b.c1c358",
+        "x": 797.0667724609375,
+        "y": 2344,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "6cfc839f.58b674"
+                "98bce7a3.da5e"
             ]
         ]
     },
     {
-        "id": "9cd28e00.2567d",
+        "id": "d11dcfed.810438",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 742.0667724609375,
-        "y": 2360,
-        "z": "8603b63b.c1c358",
+        "x": 789.0667724609375,
+        "y": 2399,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7eb3886b.0a9b58"
+                "71f2762f.659628"
             ]
         ]
     },
     {
-        "id": "6cfc839f.58b674",
+        "id": "98bce7a3.da5e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 894.4490966796875,
-        "y": 2304.6556701660156,
-        "z": "8603b63b.c1c358",
+        "x": 941.4490966796875,
+        "y": 2343.6556701660156,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "cd8dae32.8ecf2"
+                "c67046c0.c64788"
             ]
         ]
     },
     {
-        "id": "cd8dae32.8ecf2",
+        "id": "c67046c0.c64788",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1078.566650390625,
-        "y": 2303,
-        "z": "8603b63b.c1c358",
+        "x": 1125.566650390625,
+        "y": 2342,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "2f1b8cbe.c629a4"
+                "5f0a1eb2.b2273"
             ]
         ]
     },
     {
-        "id": "2f1b8cbe.c629a4",
+        "id": "5f0a1eb2.b2273",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1273.566650390625,
-        "y": 2303,
-        "z": "8603b63b.c1c358",
+        "x": 1320.566650390625,
+        "y": 2342,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "83593740.e4ddd"
+                "45f30159.842648"
             ]
         ]
     },
     {
-        "id": "a8c6a166.3984e",
+        "id": "f803d5ab.85238",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 747.0667724609375,
-        "y": 2417,
-        "z": "8603b63b.c1c358",
+        "x": 794.0667724609375,
+        "y": 2456,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "1a3f5fd3.7d7ca8"
+                "33262ba5.8d682c"
             ]
         ]
     },
     {
-        "id": "1a3f5fd3.7d7ca8",
+        "id": "33262ba5.8d682c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 899.0667724609375,
-        "y": 2418,
-        "z": "8603b63b.c1c358",
+        "x": 946.0667724609375,
+        "y": 2457,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "7eb3886b.0a9b58",
+        "id": "71f2762f.659628",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 910.0667724609375,
-        "y": 2361,
-        "z": "8603b63b.c1c358",
+        "x": 957.0667724609375,
+        "y": 2400,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "7c9a9ea1.e0f0b",
+        "id": "808535b.d0bfd48",
         "type": "set",
         "name": "set tmp.pnf-name-forUrl",
         "xml": "<set>\n\n<parameter name='tmp.pnf-name-forUrl' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
         "comments": "",
-        "x": 544.566650390625,
-        "y": 2265,
-        "z": "8603b63b.c1c358",
+        "x": 591.566650390625,
+        "y": 2304,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "c2f9529c.5f262",
+        "id": "6e3ab27b.a7f37c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 289.566650390625,
-        "y": 2396,
-        "z": "8603b63b.c1c358",
+        "x": 336.566650390625,
+        "y": 2435,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "7c9a9ea1.e0f0b",
-                "2716544d.2e4214"
+                "808535b.d0bfd48",
+                "51bc490a.0719c"
             ]
         ]
     },
     {
-        "id": "57a26dc0.1ee23c",
+        "id": "dc357fe5.d2f6d8",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1504.5333251953125,
-        "y": 213.88333129882812,
-        "z": "8603b63b.c1c358",
+        "x": 1551.5333251953125,
+        "y": 252.88333129882812,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "7627d017.e729d8",
+        "id": "a92b97b8.4129e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 706.566650390625,
-        "y": 436,
-        "z": "8603b63b.c1c358",
+        "x": 753.566650390625,
+        "y": 475,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "40266792.930ff8",
+        "id": "baa368e2.d0057",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 266.066650390625,
-        "y": 1405,
-        "z": "8603b63b.c1c358",
+        "x": 313.066650390625,
+        "y": 1444,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "d82baf7f.56b2f",
-                "513cbd5b.994ffc",
-                "11998164.d0953f",
-                "3fbbcb97.f97994",
-                "3501776f.2dad38",
-                "ae9e098e.f50fb",
-                "10dd7514.d835b3",
-                "9cbc66e4.acef28",
-                "2ee73d5.0d9a4c2",
-                "c2f9529c.5f262",
-                "cf851282.1a25c8"
+                "ec5bb05c.091188",
+                "f2cd3854.ada88",
+                "3501da3.a014526",
+                "2c2649c2.53ac7e",
+                "a05b5003.46c7e8",
+                "c5885881.921d18",
+                "694d6c2f.8edccc",
+                "4b32fbef.652bc4",
+                "caa8a64f.1936",
+                "6e3ab27b.a7f37c",
+                "5a72a2f9.fe54bc"
             ]
         ]
     },
     {
-        "id": "bc764283.2e9fd8",
+        "id": "3f4654a9.b7d9fc",
         "type": "switchNode",
         "name": "switch uni type",
         "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1296.566650390625,
-        "y": 1243,
-        "z": "8603b63b.c1c358",
+        "x": 1343.566650390625,
+        "y": 1282,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "4133a5fe.bd0afc",
-                "cb7bb63e.a271e8",
-                "9b203a87.8531b",
-                "86f7d9c6.6cceb8"
+                "118223c9.ee1e8c",
+                "5e72886e.16b82",
+                "9ad14e96.a683a8",
+                "b20e668c.49e0a"
             ]
         ]
     },
     {
-        "id": "4133a5fe.bd0afc",
+        "id": "118223c9.ee1e8c",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1461.566650390625,
-        "y": 1225,
-        "z": "8603b63b.c1c358",
+        "x": 1508.566650390625,
+        "y": 1264,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "34effc93.508fc4"
+                "4829f132.924c9"
             ]
         ]
     },
     {
-        "id": "cb7bb63e.a271e8",
+        "id": "5e72886e.16b82",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1464.566650390625,
-        "y": 1264,
-        "z": "8603b63b.c1c358",
+        "x": 1511.566650390625,
+        "y": 1303,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "ceed6ba9.27c0d"
+                "1b6bbf84.2b9b8"
             ]
         ]
     },
     {
-        "id": "86f7d9c6.6cceb8",
+        "id": "b20e668c.49e0a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1458.566650390625,
-        "y": 1342,
-        "z": "8603b63b.c1c358",
+        "x": 1505.566650390625,
+        "y": 1381,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "971b0d55.da5e"
+                "23f70279.3c530e"
             ]
         ]
     },
     {
-        "id": "9b203a87.8531b",
+        "id": "9ad14e96.a683a8",
         "type": "outcome",
         "name": "root-secondary",
         "xml": "<outcome value='root-secondary'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1481.566650390625,
-        "y": 1305,
-        "z": "8603b63b.c1c358",
+        "x": 1528.566650390625,
+        "y": 1344,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "f1880c82.5bc33"
+                "690a7c3c.e28bc4"
             ]
         ]
     },
     {
-        "id": "f85814f1.078ec8",
+        "id": "34596fcc.944e58",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 2027.566650390625,
-        "y": 1338,
-        "z": "8603b63b.c1c358",
+        "x": 2074.566650390625,
+        "y": 1377,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "17372550.7b802b",
+        "id": "36c4b896.3cd558",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
         "comments": "",
-        "x": 1989.566650390625,
-        "y": 1378,
-        "z": "8603b63b.c1c358",
+        "x": 2036.566650390625,
+        "y": 1417,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "971b0d55.da5e",
+        "id": "23f70279.3c530e",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1610.566650390625,
-        "y": 1363,
-        "z": "8603b63b.c1c358",
+        "x": 1657.566650390625,
+        "y": 1402,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2709d484.f39df4",
+        "id": "a5cf86e7.fd2ae8",
         "type": "execute",
         "name": "execute RestApiCallNode Create Performance Monitoring Data",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-create-pm-data.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-service-pm:performance-monitoring'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1200.1500244140625,
-        "y": 2662.3336181640625,
-        "z": "8603b63b.c1c358",
+        "x": 1247.1500244140625,
+        "y": 2701.3336181640625,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "34effc93.508fc4",
+        "id": "4829f132.924c9",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1596.4832763671875,
-        "y": 1221.333251953125,
-        "z": "8603b63b.c1c358",
+        "x": 1643.4832763671875,
+        "y": 1260.333251953125,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "421d14d0.8fa8dc"
+                "eaf51112.30b59"
             ]
         ]
     },
     {
-        "id": "ceed6ba9.27c0d",
+        "id": "1b6bbf84.2b9b8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1598.4832763671875,
-        "y": 1259.333251953125,
-        "z": "8603b63b.c1c358",
+        "x": 1645.4832763671875,
+        "y": 1298.333251953125,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "f196d566.5b274"
+                "77e27285.394bfc"
             ]
         ]
     },
     {
-        "id": "f1880c82.5bc33",
+        "id": "690a7c3c.e28bc4",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1641.4832763671875,
-        "y": 1306.333251953125,
-        "z": "8603b63b.c1c358",
+        "x": 1688.4832763671875,
+        "y": 1345.333251953125,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "17372550.7b802b"
+                "36c4b896.3cd558"
             ]
         ]
     },
     {
-        "id": "708149ff.3b7b8",
+        "id": "94107493.94d3e8",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishSubscription",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscriptionOnly' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<!--<parameter name=\"deviceIp\" value=\"192.168.198.6\" />-->\n<!--<parameter name=\"devicePort\" value=\"18181\" />-->\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1168.1500244140625,
-        "y": 2734.33349609375,
-        "z": "8603b63b.c1c358",
+        "x": 1215.1500244140625,
+        "y": 2773.33349609375,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "40e18201.7f31fc",
+        "id": "c85f3994.bd81f",
         "type": "execute",
         "name": "execute RestconfDiscoveryNode establishPersistentConnection",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishPersistentSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-subscribe-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"get\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"777\" />\n<parameter name=\"mode\" value=\"sync\" />\n<!--<parameter name=\"version\" value=\"sync\" />-->\n<!--<parameter name=\"mode\" value=\"777\" />-->\n<parameter name=\"responsePrefix\" value=\"notification-get-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1198.1500244140625,
-        "y": 2796.33349609375,
-        "z": "8603b63b.c1c358",
+        "x": 1245.1500244140625,
+        "y": 2835.33349609375,
+        "z": "b25656d7.85a8a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf851282.1a25c8",
+        "id": "5a72a2f9.fe54bc",
         "type": "set",
         "name": "unset ethernet-srv-end-points-list",
         "xml": "<set>\n<parameter name='`ethernet-srv-end-points-list.`' value='' />\n<parameter name='`ethernet-srv-end-points-list_length`' value='0' />\n<parameter name='`epidx`' value='0' />",
         "comments": "",
-        "x": 591.566650390625,
-        "y": 1343.166748046875,
-        "z": "8603b63b.c1c358",
+        "x": 638.566650390625,
+        "y": 1382.166748046875,
+        "z": "b25656d7.85a8a8",
         "wires": []
     },
     {
-        "id": "8fcbaf21.052888",
+        "id": "cb3a4052.881008",
         "type": "switchNode",
         "name": "switch conn type",
         "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 132.56666564941406,
-        "y": 1054.1666259765625,
-        "z": "8603b63b.c1c358",
+        "x": 179.56666564941406,
+        "y": 1093.1666259765625,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "5e5b0dce.955fb4",
-                "7fcb1378.0439ec"
+                "f5718cb9.775688",
+                "eaa991b9.45489"
             ]
         ]
     },
     {
-        "id": "7fcb1378.0439ec",
+        "id": "eaa991b9.45489",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 317.566650390625,
-        "y": 1228.1666259765625,
-        "z": "8603b63b.c1c358",
+        "x": 364.566650390625,
+        "y": 1267.1666259765625,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "40266792.930ff8"
+                "baa368e2.d0057"
             ]
         ]
     },
     {
-        "id": "5e5b0dce.955fb4",
+        "id": "f5718cb9.775688",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 320.566650390625,
-        "y": 1183.1666259765625,
-        "z": "8603b63b.c1c358",
+        "x": 367.566650390625,
+        "y": 1222.1666259765625,
+        "z": "b25656d7.85a8a8",
         "wires": [
             [
-                "40266792.930ff8"
+                "baa368e2.d0057"
             ]
         ]
     }
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
index cd4962c2..643abf34 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "94ab5931.1ae6d",
+        "id": "b2b464d7.ce16c8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 292.566650390625,
-        "y": 59.56666564941406,
-        "z": "ba0dc87e.a3b258",
+        "x": 255.56666564941406,
+        "y": 78.56666564941406,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "1c26c9e8.6ceaee"
+                "ba005c83.b939c"
             ]
         ]
     },
     {
-        "id": "1c26c9e8.6ceaee",
+        "id": "ba005c83.b939c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,3073 +22,3073 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 576.8523406982422,
-        "y": 120.8047742843628,
-        "z": "ba0dc87e.a3b258",
+        "x": 539.8523559570312,
+        "y": 139.8047742843628,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "23f5599a.c9cd86"
+                "7e8df070.fdf6b"
             ]
         ]
     },
     {
-        "id": "23f5599a.c9cd86",
+        "id": "7e8df070.fdf6b",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-F1",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 492.9952392578125,
-        "y": 198.5666961669922,
-        "z": "ba0dc87e.a3b258",
+        "x": 455.99525451660156,
+        "y": 217.5666961669922,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "dc959d18.681ba8"
+                "85985867.416fd"
             ]
         ]
     },
     {
-        "id": "dc959d18.681ba8",
+        "id": "85985867.416fd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 226.8046875,
-        "y": 702.2333526611328,
-        "z": "ba0dc87e.a3b258",
+        "x": 189.80470275878906,
+        "y": 721.2333526611328,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "3133ba0.df70946",
-                "a232054c.f7cde",
-                "cf7049ac.59d6b8",
-                "da9884fe.c1ab2",
-                "d00a834c.9393c8",
-                "e4a1c30c.a1f11",
-                "ed8a3e8e.eba718",
-                "5d4c8b88.6ea084"
+                "d05dbda7.cd211",
+                "992a5395.f31118",
+                "e4271cab.c93a2",
+                "45bcd5eb.003ca4",
+                "475897b8.f705c",
+                "364ba6be.e5fa32",
+                "a560d2b.9b8b03",
+                "64dad903.5a2f98"
             ]
         ]
     },
     {
-        "id": "3133ba0.df70946",
+        "id": "d05dbda7.cd211",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 499.566650390625,
-        "y": 656.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 462.56666564941406,
+        "y": 675.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "a232054c.f7cde",
+        "id": "992a5395.f31118",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 720.566650390625,
-        "y": 724.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 683.5666656494141,
+        "y": 743.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "cf7049ac.59d6b8",
+        "id": "e4271cab.c93a2",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 510.566650390625,
-        "y": 770.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 473.56666564941406,
+        "y": 789.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e4a1c30c.a1f11",
+        "id": "364ba6be.e5fa32",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 703.566650390625,
-        "y": 834.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 666.5666656494141,
+        "y": 853.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "ed8a3e8e.eba718",
+        "id": "a560d2b.9b8b03",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 795.566650390625,
-        "y": 1213.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 758.5666656494141,
+        "y": 1232.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "a0634476.d7e6f8"
+                "74538129.24a8e8"
             ]
         ]
     },
     {
-        "id": "a0634476.d7e6f8",
+        "id": "74538129.24a8e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1017.5666198730469,
-        "y": 1225.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 980.5666351318359,
+        "y": 1244.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "aaab02fa.9f4d88",
-                "c83caaf9.d6f6",
-                "a09d3d16.a9628",
-                "38b6179d.185d98",
-                "6e9dd85.efe07a8",
-                "ef30d7fa.1abd9",
-                "ba078fb1.cbb95",
-                "95800647.4aa41",
-                "84e1fc7d.aa5158",
-                "4be74bfa.e8a9a4"
+                "fd37f729.79d4e8",
+                "ea6cbf13.151c98",
+                "8ceda3a6.204b48",
+                "1013e0e2.7cc397",
+                "90a6c364.46118",
+                "22dcd83c.2b5368",
+                "e09d2c81.71b548",
+                "e150ae4f.8b2e58",
+                "1660b66e.1d0baa",
+                "af14d18e.54c668"
             ]
         ]
     },
     {
-        "id": "aaab02fa.9f4d88",
+        "id": "fd37f729.79d4e8",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1692.566650390625,
-        "y": 804.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1655.566665649414,
+        "y": 823.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "c83caaf9.d6f6",
+        "id": "ea6cbf13.151c98",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1406.566650390625,
-        "y": 894.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1369.566665649414,
+        "y": 913.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "a21a8c5c.c26b18",
-                "5ad886dd.89cfc"
+                "56460655.4e95f",
+                "f048ad7d.2b28f8"
             ]
         ]
     },
     {
-        "id": "a21a8c5c.c26b18",
+        "id": "56460655.4e95f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1772.566650390625,
-        "y": 855.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1735.566665649414,
+        "y": 874.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "492daa68.bf54bc"
+                "4a892274.fb8984"
             ]
         ]
     },
     {
-        "id": "5ad886dd.89cfc",
+        "id": "f048ad7d.2b28f8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1773.566650390625,
-        "y": 901.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1736.566665649414,
+        "y": 920.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "5f6a6611.d2602"
+                "9be4afb9.f321d"
             ]
         ]
     },
     {
-        "id": "492daa68.bf54bc",
+        "id": "4a892274.fb8984",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 1986.566650390625,
-        "y": 854.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1949.566665649414,
+        "y": 873.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "5f6a6611.d2602",
+        "id": "9be4afb9.f321d",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 1984.566650390625,
-        "y": 899.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1947.566665649414,
+        "y": 918.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "a09d3d16.a9628",
+        "id": "8ceda3a6.204b48",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 1582.566650390625,
-        "y": 968.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1545.566665649414,
+        "y": 987.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "38b6179d.185d98",
+        "id": "1013e0e2.7cc397",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1626.566650390625,
-        "y": 1016.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1589.566665649414,
+        "y": 1035.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "1e4fefc4.84dea",
-                "140ba84b.114188",
-                "5ac6d6d0.fa8f3"
+                "cf3ee2c7.7cc8",
+                "6e4433e1.c3d544",
+                "fc23e91d.8a06b8"
             ]
         ]
     },
     {
-        "id": "1e4fefc4.84dea",
+        "id": "cf3ee2c7.7cc8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1839.066650390625,
-        "y": 963.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1802.066665649414,
+        "y": 982.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "c513ad5c.67a2a8"
+                "15f4239b.d2dd94"
             ]
         ]
     },
     {
-        "id": "140ba84b.114188",
+        "id": "6e4433e1.c3d544",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1851.066650390625,
-        "y": 1013.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1814.066665649414,
+        "y": 1032.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "56e61af8.fb0edc"
+                "4f08eef5.3a084"
             ]
         ]
     },
     {
-        "id": "5ac6d6d0.fa8f3",
+        "id": "fc23e91d.8a06b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1842.066650390625,
-        "y": 1068.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1805.066665649414,
+        "y": 1087.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "5b77e98c.bb3518"
+                "9e248b49.4b123"
             ]
         ]
     },
     {
-        "id": "5b77e98c.bb3518",
+        "id": "9e248b49.4b123",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 1987.066650390625,
-        "y": 1067.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1950.066665649414,
+        "y": 1086.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "56e61af8.fb0edc",
+        "id": "4f08eef5.3a084",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 1998.066650390625,
-        "y": 1010.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 1961.066665649414,
+        "y": 1029.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "c513ad5c.67a2a8",
+        "id": "15f4239b.d2dd94",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1964.4490966796875,
-        "y": 957.2223358154297,
-        "z": "ba0dc87e.a3b258",
+        "x": 1927.4491119384766,
+        "y": 976.2223358154297,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "e866a3e1.053498"
+                "75b021d3.c00118"
             ]
         ]
     },
     {
-        "id": "e866a3e1.053498",
+        "id": "75b021d3.c00118",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2125.566650390625,
-        "y": 971.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 2088.566665649414,
+        "y": 990.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "5690d718.48c698"
+                "b15e9c16.6b681"
             ]
         ]
     },
     {
-        "id": "5690d718.48c698",
+        "id": "b15e9c16.6b681",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2320.566650390625,
-        "y": 971.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 2283.566665649414,
+        "y": 990.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "f99896f3.a9973"
+                "c6fb39ce.9e60a"
             ]
         ]
     },
     {
-        "id": "804d49e5.886028",
+        "id": "30ac35dd.e14312",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2700.566650390625,
-        "y": 967.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 2663.566665649414,
+        "y": 986.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "ebd7bd5b.40a158",
-                "9cbfb486.1d485"
+                "94cf3038.f341a8",
+                "94b6490f.68e4d"
             ]
         ]
     },
     {
-        "id": "9cbfb486.1d485",
+        "id": "94b6490f.68e4d",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 2908.566650390625,
-        "y": 974.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 2871.566665649414,
+        "y": 993.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "eb53f24.9c8df9",
-                "b699925f.52e788",
-                "177a0a75.4ffe3e"
+                "7943f6f7.be2db8",
+                "c75de222.529ce8",
+                "d30226e9.2d3ab"
             ]
         ]
     },
     {
-        "id": "ebd7bd5b.40a158",
+        "id": "94cf3038.f341a8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2938.566650390625,
-        "y": 922.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 2901.566665649414,
+        "y": 941.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "eb53f24.9c8df9",
+        "id": "7943f6f7.be2db8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3118.566650390625,
-        "y": 965.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 3081.566665649414,
+        "y": 984.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "664ce225.e11764"
+                "2503b7bf.0ec"
             ]
         ]
     },
     {
-        "id": "b699925f.52e788",
+        "id": "c75de222.529ce8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3110.566650390625,
-        "y": 1020.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 3073.566665649414,
+        "y": 1039.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "c5f2fad1.bd663"
+                "bca36ee5.113d58"
             ]
         ]
     },
     {
-        "id": "177a0a75.4ffe3e",
+        "id": "d30226e9.2d3ab",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3115.566650390625,
-        "y": 1077.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3078.566665649414,
+        "y": 1096.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "f4a026e6.715c"
+                "1e88570c.ee0719"
             ]
         ]
     },
     {
-        "id": "f4a026e6.715c",
+        "id": "1e88570c.ee0719",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3267.566650390625,
-        "y": 1078.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3230.566665649414,
+        "y": 1097.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "c5f2fad1.bd663",
+        "id": "bca36ee5.113d58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3278.566650390625,
-        "y": 1023.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 3241.566665649414,
+        "y": 1042.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "664ce225.e11764",
+        "id": "2503b7bf.0ec",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3262.948974609375,
-        "y": 963.2223358154297,
-        "z": "ba0dc87e.a3b258",
+        "x": 3225.948989868164,
+        "y": 982.2223358154297,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "a508abe9.f5813"
+                "41aaab63.e1cd3c"
             ]
         ]
     },
     {
-        "id": "f99896f3.a9973",
+        "id": "c6fb39ce.9e60a",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2523.566650390625,
-        "y": 975.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 2486.566665649414,
+        "y": 994.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "804d49e5.886028"
+                "30ac35dd.e14312"
             ]
         ]
     },
     {
-        "id": "a508abe9.f5813",
+        "id": "41aaab63.e1cd3c",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3477.566650390625,
-        "y": 959.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 3440.566665649414,
+        "y": 978.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "6e9dd85.efe07a8",
+        "id": "90a6c364.46118",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1596.566650390625,
-        "y": 1185.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1559.566665649414,
+        "y": 1204.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "75774fa2.7a2cf",
-                "4436153e.9cd34c"
+                "802374f4.7d7ff8",
+                "a519ae80.fc5af8"
             ]
         ]
     },
     {
-        "id": "75774fa2.7a2cf",
+        "id": "802374f4.7d7ff8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1797.566650390625,
-        "y": 1183.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1760.566665649414,
+        "y": 1202.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "36577996.f92cc6"
+                "48f58df5.6800bc"
             ]
         ]
     },
     {
-        "id": "b48623b8.fdb8a",
+        "id": "40ebb061.3ec958",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 2078.566650390625,
-        "y": 1133.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2041.566665649414,
+        "y": 1152.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "54c1b7cf.fc463",
+        "id": "483dd213.b85e1c",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2014.566650390625,
-        "y": 1234.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1977.566665649414,
+        "y": 1253.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "8183849e.8f8b9",
-                "edcb38ad.17a0a8"
+                "d8888a92.ad5628",
+                "f6c02aaa.58a08"
             ]
         ]
     },
     {
-        "id": "8183849e.8f8b9",
+        "id": "d8888a92.ad5628",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2244.566650390625,
-        "y": 1230.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2207.566665649414,
+        "y": 1249.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "eb1da6e2.d6cac"
+                "7e806dc9.39e0fc"
             ]
         ]
     },
     {
-        "id": "4436153e.9cd34c",
+        "id": "a519ae80.fc5af8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1797.566650390625,
-        "y": 1232.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1760.566665649414,
+        "y": 1251.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "54c1b7cf.fc463"
+                "483dd213.b85e1c"
             ]
         ]
     },
     {
-        "id": "edcb38ad.17a0a8",
+        "id": "f6c02aaa.58a08",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2245.566650390625,
-        "y": 1276.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2208.566665649414,
+        "y": 1295.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "10a3f078.2aa84"
+                "1f8e1450.d16a94"
             ]
         ]
     },
     {
-        "id": "10a3f078.2aa84",
+        "id": "1f8e1450.d16a94",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2459.566650390625,
-        "y": 1276.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2422.566665649414,
+        "y": 1295.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "8c80417d.32f06",
+        "id": "9123357e.60632",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2133.566650390625,
-        "y": 1180.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2096.566665649414,
+        "y": 1199.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "36577996.f92cc6",
+        "id": "48f58df5.6800bc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1921.566650390625,
-        "y": 1174.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1884.566665649414,
+        "y": 1193.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "8c80417d.32f06"
+                "9123357e.60632"
             ]
         ]
     },
     {
-        "id": "eb1da6e2.d6cac",
+        "id": "7e806dc9.39e0fc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2377.566650390625,
-        "y": 1206.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2340.566665649414,
+        "y": 1225.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "4f91088c.aa2a9"
+                "d554f558.28b1b8"
             ]
         ]
     },
     {
-        "id": "90fd9019.34d388",
+        "id": "2ea08541.5c60c2",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 2533.566650390625,
-        "y": 1222.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2496.566665649414,
+        "y": 1241.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "4f91088c.aa2a9",
+        "id": "d554f558.28b1b8",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 2581.566650390625,
-        "y": 1174.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2544.566665649414,
+        "y": 1193.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "d00a834c.9393c8",
+        "id": "475897b8.f705c",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",
         "comments": "",
-        "x": 468.56658935546875,
-        "y": 3827.566909790039,
-        "z": "ba0dc87e.a3b258",
+        "x": 431.5666046142578,
+        "y": 3846.566909790039,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "da9884fe.c1ab2",
+        "id": "45bcd5eb.003ca4",
         "type": "set",
         "name": "set srcTtp OTN layer",
         "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
         "comments": "",
-        "x": 507.566650390625,
-        "y": 912.5666656494141,
-        "z": "ba0dc87e.a3b258",
+        "x": 470.56666564941406,
+        "y": 931.5666656494141,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "ef30d7fa.1abd9",
+        "id": "22dcd83c.2b5368",
         "type": "set",
         "name": "set srcTtp+dstTtp pair",
         "xml": "<set>\n<parameter name='tmp.srcTtpdstTtpPair' value=\"`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id + ',' +\n                                               $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`\" />\n\n\n",
         "comments": "",
-        "x": 1572.566650390625,
-        "y": 1265.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1535.566665649414,
+        "y": 1284.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "95800647.4aa41",
+        "id": "e150ae4f.8b2e58",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1764.5666198730469,
-        "y": 1363.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1727.566635131836,
+        "y": 1382.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "ba078fb1.cbb95",
+        "id": "e09d2c81.71b548",
         "type": "set",
         "name": "set current-provider-id and current-cvlan-id",
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$tmp.access-provider-id`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n",
         "comments": "",
-        "x": 1636.566650390625,
-        "y": 1316.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1599.566665649414,
+        "y": 1335.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "84e1fc7d.aa5158",
+        "id": "1660b66e.1d0baa",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1445.566650390625,
-        "y": 1517.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1408.566665649414,
+        "y": 1536.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "e1b1a2e3.c8a22",
-                "a1f3f094.cf6868"
+                "f4cf9f1c.724fd",
+                "b4d1d385.3d74f"
             ]
         ]
     },
     {
-        "id": "e1b1a2e3.c8a22",
+        "id": "f4cf9f1c.724fd",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1731.566650390625,
-        "y": 2336.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1694.566665649414,
+        "y": 2355.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "877d2c40.229dc8"
+                "74fc514b.817128"
             ]
         ]
     },
     {
-        "id": "9881a97f.aa45c",
+        "id": "996fa9bd.709cb8",
         "type": "comment",
         "name": "call string.contains to check if the cache has srcTtpdstTtpPair",
         "info": "if it had: then no new otn/vpn-binding is needed\n           ==> find the otn. ==>look into the relationships of this connectivity and find the one that has same srcTtp and dstTtp\n           ==> increase the bw\nif not, create a new vpn-binding, attach this vpn-binding into the founded connectivity, and attach it to the middle-man-conn as well.",
         "comments": "",
-        "x": 2157.566650390625,
-        "y": 2281.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2120.566665649414,
+        "y": 2300.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "8313a95b.4655",
+        "id": "db35c82.2ff7538",
         "type": "comment",
         "name": "create a new connectivity - (for dummy connectivity)",
         "info": "(this should not be for LEAF side or ROOT side, otherwise error)\n\ncreate a new vpn-binding (done here)\ncreate a new connectivity (done below)\nadd srcTtpdstTtpPair into the cache in this connectivity\nattach the vpn-binding into the connectivity relationship\nattach this connectivity into the middle man\nattach this connectivity into the service-instance",
         "comments": "",
-        "x": 2024.5666198730469,
-        "y": 1479.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1987.566635131836,
+        "y": 1498.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "298356b2.691352",
+        "id": "54f8b37c.0f6ed4",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2071.566650390625,
-        "y": 1529.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2034.566665649414,
+        "y": 1548.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "594dfec1.070b58"
+                "7be3896.57701f8"
             ]
         ]
     },
     {
-        "id": "594dfec1.070b58",
+        "id": "7be3896.57701f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2359.566650390625,
-        "y": 1530.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2322.566665649414,
+        "y": 1549.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "20be2b7.b4b9054"
+                "f1bf4e31.6b1fe8"
             ]
         ]
     },
     {
-        "id": "20be2b7.b4b9054",
+        "id": "f1bf4e31.6b1fe8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2543.066650390625,
-        "y": 1528.820571899414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2506.066665649414,
+        "y": 1547.820571899414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "48aaf3f8.b9dde4",
+        "id": "3cd3c761.10556",
         "type": "execute",
         "name": "execute string.contains srcTtpdstTtpPair",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n<parameter name=\"source\" value='`$tmp.the-connectivity.coupling-flag`'/>\n<parameter name=\"target\" value=\"`$tmp.srcTtpdstTtpPair`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2145.566650390625,
-        "y": 2333.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2108.566665649414,
+        "y": 2352.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "5fc5edcc.a33e6c",
-                "1c8fc333.3d53cd"
+                "c33f3993.207e3",
+                "56575be2.b67874"
             ]
         ]
     },
     {
-        "id": "5fc5edcc.a33e6c",
+        "id": "c33f3993.207e3",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2318.566650390625,
-        "y": 2181.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2281.566665649414,
+        "y": 2200.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "1c8fc333.3d53cd",
+        "id": "56575be2.b67874",
         "type": "outcomeFalse",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2350.566650390625,
-        "y": 2440.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2313.566665649414,
+        "y": 2459.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "7733ea37.676d94"
+                "3b0b33da.eb46f4"
             ]
         ]
     },
     {
-        "id": "94ea5f1c.00084",
+        "id": "1cae89b4.aa5636",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2757.566650390625,
-        "y": 1971.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2720.566665649414,
+        "y": 1990.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "ee79eb28.dfce98"
+                "d58227c9.ab762"
             ]
         ]
     },
     {
-        "id": "ee79eb28.dfce98",
+        "id": "d58227c9.ab762",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3061.566650390625,
-        "y": 1968.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3024.566665649414,
+        "y": 1987.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "cd827e2b.fca8e"
+                "92fb98e0.3a3cb"
             ]
         ]
     },
     {
-        "id": "cd827e2b.fca8e",
+        "id": "92fb98e0.3a3cb",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3212.066650390625,
-        "y": 1975.820571899414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3175.066665649414,
+        "y": 1994.820571899414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "6a2d9e1e.0984a",
+        "id": "86dbc539.52181",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2051.566650390625,
-        "y": 1584.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2014.566665649414,
+        "y": 1603.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f0be409.bf59b4",
+        "id": "6447d455.3d2644",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1989.566650390625,
-        "y": 1634.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1952.566665649414,
+        "y": 1653.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "f8e04437.c053b8",
+        "id": "f8fc4136.e557d8",
         "type": "save",
         "name": "save middle-man-conn relationship to connectivity-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2090.566650390625,
-        "y": 1679.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2053.566665649414,
+        "y": 1698.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "83b33842.f7a008",
+        "id": "489556f5.800788",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 2126.566650390625,
-        "y": 1733.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2089.566665649414,
+        "y": 1752.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "665710a0.10b6d",
+        "id": "b222b6e5.a2269",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2094.566650390625,
-        "y": 1792.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2057.566665649414,
+        "y": 1811.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "50815aa.2966624",
+        "id": "e72c7ac8.1ee27",
         "type": "comment",
         "name": "find middle-man's eth-srv-name",
         "info": "",
         "comments": "",
-        "x": 1552.566650390625,
-        "y": 1408.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1515.566665649414,
+        "y": 1427.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "4be74bfa.e8a9a4",
+        "id": "af14d18e.54c668",
         "type": "set",
         "name": "set prop.ethernet-service-name",
         "xml": "<set>\n<parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />\n\n",
         "comments": "",
-        "x": 1574.566650390625,
-        "y": 1452.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1537.566665649414,
+        "y": 1471.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "7bee4ebc.b72be8",
+        "id": "e07c3627.a9ad28",
         "type": "save",
         "name": "save middle-man-conn relationship to tmp.the-connectivity, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2781.566650390625,
-        "y": 2188.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2744.566665649414,
+        "y": 2207.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "2dce7211.24f81e",
+        "id": "68912ce0.303fb4",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 2812.566650390625,
-        "y": 2227.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2775.566665649414,
+        "y": 2246.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "90bd55a8.2fdfb",
+        "id": "18b33cfb.a5700b",
         "type": "save",
         "name": "save tmp.the-connectivity relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2783.566650390625,
-        "y": 2300.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2746.566665649414,
+        "y": 2319.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "7a94ba19.d3678c",
+        "id": "3e5eef0e.e3f73",
         "type": "comment",
         "name": "update the founded connectivity to have a new coupling-flag",
         "info": "",
         "comments": "",
-        "x": 2753.566650390625,
-        "y": 2016.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2716.566665649414,
+        "y": 2035.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "1f39716d.08bb37",
+        "id": "a5fb576e.12d628",
         "type": "set",
         "name": "set newFlag",
         "xml": "<set>\n<parameter name='tmp.newFlag' value=\"`$tmp.the-connectivity.coupling-flag + '-' +\n                                               $tmp.srcTtpdstTtpPair`\" />\n\n\n",
         "comments": "",
-        "x": 2639.566650390625,
-        "y": 2055.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2602.566665649414,
+        "y": 2074.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "966d5b58.b138c",
+        "id": "d377ac03.65cde",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='coupling-flag' value='`$tmp.newFlag`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2703.566650390625,
-        "y": 2100.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2666.566665649414,
+        "y": 2119.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "3ca218f1.e24728",
+        "id": "f2d99771.385da",
         "type": "comment",
         "name": "the following two relationships should have already been there; if not => error",
         "info": "",
         "comments": "",
-        "x": 2795.566650390625,
-        "y": 2150.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2758.566665649414,
+        "y": 2169.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "533f0d90.da6154",
+        "id": "1df0ae3d.1e012a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1781.566650390625,
-        "y": 1517.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1744.566665649414,
+        "y": 1536.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "298356b2.691352",
-                "6a2d9e1e.0984a",
-                "6f0be409.bf59b4",
-                "f8e04437.c053b8",
-                "83b33842.f7a008",
-                "665710a0.10b6d"
+                "54f8b37c.0f6ed4",
+                "86dbc539.52181",
+                "6447d455.3d2644",
+                "f8fc4136.e557d8",
+                "489556f5.800788",
+                "b222b6e5.a2269"
             ]
         ]
     },
     {
-        "id": "a1f3f094.cf6868",
+        "id": "b4d1d385.3d74f",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1643.566650390625,
-        "y": 1513.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 1606.566665649414,
+        "y": 1532.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "533f0d90.da6154"
+                "1df0ae3d.1e012a"
             ]
         ]
     },
     {
-        "id": "877d2c40.229dc8",
+        "id": "74fc514b.817128",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2441.566650390625,
-        "y": 1980.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2404.566665649414,
+        "y": 1999.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "94ea5f1c.00084",
-                "1f39716d.08bb37",
-                "966d5b58.b138c",
-                "90bd55a8.2fdfb"
+                "1cae89b4.aa5636",
+                "a5fb576e.12d628",
+                "d377ac03.65cde",
+                "18b33cfb.a5700b"
             ]
         ]
     },
     {
-        "id": "921c2635.2657",
+        "id": "1d755c4.2631d24",
         "type": "comment",
         "name": "loop through the relationships of this founded connectivity, then",
         "info": "then find the vpn-binding that has same src ttp and dst ttp as this one",
         "comments": "",
-        "x": 2446.566650390625,
-        "y": 2405.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2409.566665649414,
+        "y": 2424.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "2a3dc4da.d825f4",
+        "id": "e76d16f4.131fa8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='tcridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2788.566650390625,
-        "y": 2441.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2751.566665649414,
+        "y": 2460.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "736b385a.35da7"
+                "c79290ba.c52288"
             ]
         ]
     },
     {
-        "id": "736b385a.35da7",
+        "id": "c79290ba.c52288",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$tcridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3000.566650390625,
-        "y": 2439.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2963.566665649414,
+        "y": 2458.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "e66ec218.e79bc"
+                "7b053331.5433cc"
             ]
         ]
     },
     {
-        "id": "e66ec218.e79bc",
+        "id": "7b053331.5433cc",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3184.566650390625,
-        "y": 2437.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3147.566665649414,
+        "y": 2456.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "8c204db5.df1ea"
+                "874cfbc4.610df"
             ]
         ]
     },
     {
-        "id": "8c204db5.df1ea",
+        "id": "874cfbc4.610df",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3363.566650390625,
-        "y": 2442.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3326.566665649414,
+        "y": 2461.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "750b8345.e6107c",
-                "b2411873.31b798"
+                "23e63567.6cde12",
+                "860dc7bb.33f898"
             ]
         ]
     },
     {
-        "id": "b2411873.31b798",
+        "id": "860dc7bb.33f898",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 3580.566650390625,
-        "y": 2373.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3543.566665649414,
+        "y": 2392.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "750b8345.e6107c",
+        "id": "23e63567.6cde12",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$tcridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3573.566650390625,
-        "y": 2459.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3536.566665649414,
+        "y": 2478.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "bdf485ca.827e58",
-                "ed90443b.6fe53",
-                "a94ce9b.8c46898"
+                "9ae4e678.567218",
+                "7ffe67c7.f6ae9",
+                "495c2481.525c0c"
             ]
         ]
     },
     {
-        "id": "ed90443b.6fe53",
+        "id": "7ffe67c7.f6ae9",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3787.0576171875,
-        "y": 2444.1407012939453,
-        "z": "ba0dc87e.a3b258",
+        "x": 3750.057632446289,
+        "y": 2463.1407012939453,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "1ae663bf.60e5d4"
+                "aa65fd53.ef5338"
             ]
         ]
     },
     {
-        "id": "1ae663bf.60e5d4",
+        "id": "aa65fd53.ef5338",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3949.629150390625,
-        "y": 2443.4264068603516,
-        "z": "ba0dc87e.a3b258",
+        "x": 3912.629165649414,
+        "y": 2462.4264068603516,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "4b566804.b29878",
+        "id": "46144b36.0d9e9c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3950.566650390625,
-        "y": 2488.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3913.566665649414,
+        "y": 2507.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "a94ce9b.8c46898",
+        "id": "495c2481.525c0c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3782.566650390625,
-        "y": 2488.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3745.566665649414,
+        "y": 2507.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "4b566804.b29878"
+                "46144b36.0d9e9c"
             ]
         ]
     },
     {
-        "id": "bdf485ca.827e58",
+        "id": "9ae4e678.567218",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3784.566650390625,
-        "y": 2548.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3747.566665649414,
+        "y": 2567.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "e92643e6.dea4d"
+                "10d11190.f9b6ce"
             ]
         ]
     },
     {
-        "id": "e92643e6.dea4d",
+        "id": "10d11190.f9b6ce",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3953.566650390625,
-        "y": 2547.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 3916.566665649414,
+        "y": 2566.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "8f8a5cb3.af8a3"
+                "f3f9bec1.1031a8"
             ]
         ]
     },
     {
-        "id": "7733ea37.676d94",
+        "id": "3b0b33da.eb46f4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2577.566650390625,
-        "y": 2439.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2540.566665649414,
+        "y": 2458.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "2a3dc4da.d825f4",
-                "9b2ffd1b.3a96e",
-                "6fbcac88.0e9a54"
+                "e76d16f4.131fa8",
+                "cf3e3cbd.e0de98",
+                "d9eb4973.6fd078"
             ]
         ]
     },
     {
-        "id": "8f8a5cb3.af8a3",
+        "id": "f3f9bec1.1031a8",
         "type": "switchNode",
         "name": "switch srcTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id == $tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4152.566650390625,
-        "y": 2548.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 4115.566665649414,
+        "y": 2567.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "bc9f47cc.0b96"
+                "b44e2e1b.d89b7"
             ]
         ]
     },
     {
-        "id": "bc9f47cc.0b96",
+        "id": "b44e2e1b.d89b7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4315.566650390625,
-        "y": 2546.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 4278.566665649414,
+        "y": 2565.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "566fa06e.e1e238"
+                "1fcb6776.c122c9"
             ]
         ]
     },
     {
-        "id": "566fa06e.e1e238",
+        "id": "1fcb6776.c122c9",
         "type": "switchNode",
         "name": "switch dstTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id == $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4496.566650390625,
-        "y": 2546.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 4459.566665649414,
+        "y": 2565.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "f4daf0bd.af9d9"
+                "9cd0e2ee.ae3208"
             ]
         ]
     },
     {
-        "id": "f4daf0bd.af9d9",
+        "id": "9cd0e2ee.ae3208",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4659.566650390625,
-        "y": 2544.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 4622.566665649414,
+        "y": 2563.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "c0c49b50.2a7748"
+                "2650c786.e545e"
             ]
         ]
     },
     {
-        "id": "562992d6.b870dc",
+        "id": "4a1b7e57.c40f08",
         "type": "set",
         "name": "set tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='`$tmp.aai.vpn-binding.`' />\n",
         "comments": "",
-        "x": 5016.566650390625,
-        "y": 2551.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 4979.566665649414,
+        "y": 2570.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "c0c49b50.2a7748",
+        "id": "2650c786.e545e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4798.566650390625,
-        "y": 2543.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 4761.566665649414,
+        "y": 2562.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "562992d6.b870dc",
-                "10659fb.a744fe"
+                "4a1b7e57.c40f08",
+                "a9183733.3981d8"
             ]
         ]
     },
     {
-        "id": "10659fb.a744fe",
+        "id": "a9183733.3981d8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4962.566650390625,
-        "y": 2595.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 4925.566665649414,
+        "y": 2614.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "9b2ffd1b.3a96e",
+        "id": "cf3e3cbd.e0de98",
         "type": "set",
         "name": "unset tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2798.566650390625,
-        "y": 2402.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2761.566665649414,
+        "y": 2421.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "9d592730.4455b8",
+        "id": "b12c732.984971",
         "type": "comment",
         "name": "increase the bw of the-vpn-binding and change status to modified",
         "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
         "comments": "",
-        "x": 2887.566650390625,
-        "y": 2576.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2850.566665649414,
+        "y": 2595.566665649414,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "6fbcac88.0e9a54",
+        "id": "d9eb4973.6fd078",
         "type": "save",
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`($tmp.the-vpn-binding.customer-vpn-id + $gfp)`' />\n\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2857.566650390625,
-        "y": 2636.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 2820.566665649414,
+        "y": 2655.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "5d4c8b88.6ea084",
+        "id": "64dad903.5a2f98",
         "type": "switchNode",
         "name": "switch otninfoProtect exists",
         "xml": "<switch test=\"`$tmp.otninfoProtect_length > 0`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 623.6832885742188,
-        "y": 2502.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 586.6833038330078,
+        "y": 2521.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "b304b119.fc6c6"
+                "215a5551.e3e412"
             ]
         ]
     },
     {
-        "id": "b304b119.fc6c6",
+        "id": "215a5551.e3e412",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 844.6832885742188,
-        "y": 2503.566665649414,
-        "z": "ba0dc87e.a3b258",
+        "x": 807.6833038330078,
+        "y": 2522.566665649414,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "929a93b0.fb26e"
+                "a45af556.e89b18"
             ]
         ]
     },
     {
-        "id": "1365d05a.43ccb8",
+        "id": "3c1038b8.5e7e68",
         "type": "for",
         "name": "for vidx..tmp.otninfoProtect_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfoProtect_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 660.2333374023438,
-        "y": 3284.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 623.2333526611328,
+        "y": 3303.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "d491584d.33cd28"
+                "ef268a68.25127"
             ]
         ]
     },
     {
-        "id": "d491584d.33cd28",
+        "id": "ef268a68.25127",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 920.2333068847656,
-        "y": 3277.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 883.2333221435547,
+        "y": 3296.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "252a570f.f396c8",
-                "f0403523.cecec",
-                "53ad6d75.3e9854",
-                "61d4cb78.58331c",
-                "d81f3e39.a99398",
-                "57f2e473.517f54",
-                "c1b2a740.d37fa",
-                "34621460.796344",
-                "5ed2002c.80ebf8",
-                "6dfdf88f.4bb6c"
+                "3c86462f.4b1cfa",
+                "95fc92f6.a552f",
+                "bd01141d.416e08",
+                "a5def1e9.f9efb8",
+                "2ba7fbc5.caf74c",
+                "7c316fec.b1e588",
+                "85ee5aba.20cb98",
+                "9839af4.fe6bc5",
+                "f83dd9dc.4b2938",
+                "e931b49.dce4f48"
             ]
         ]
     },
     {
-        "id": "f0403523.cecec",
+        "id": "95fc92f6.a552f",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1309.2333374023438,
-        "y": 2946.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1272.2333526611328,
+        "y": 2965.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "a19e39b9.f8da1",
-                "f567fdff.bdc4a8"
+                "11f57316.f3cd45",
+                "95eb0f31.f65c"
             ]
         ]
     },
     {
-        "id": "f567fdff.bdc4a8",
+        "id": "95eb0f31.f65c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1676.2333374023438,
-        "y": 2953.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1639.2333526611328,
+        "y": 2972.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "4918f2b6.cf40ac"
+                "bae99d3f.d39558"
             ]
         ]
     },
     {
-        "id": "4918f2b6.cf40ac",
+        "id": "bae99d3f.d39558",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 1887.2333374023438,
-        "y": 2951.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1850.2333526611328,
+        "y": 2970.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "53ad6d75.3e9854",
+        "id": "bd01141d.416e08",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 1485.2333374023438,
-        "y": 3020.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1448.2333526611328,
+        "y": 3039.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "61d4cb78.58331c",
+        "id": "a5def1e9.f9efb8",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1529.2333374023438,
-        "y": 3068.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1492.2333526611328,
+        "y": 3087.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "c8e35acd.0cd338",
-                "1a3bc3e9.de0b6c",
-                "d9c66705.f174c8"
+                "1b704af4.001005",
+                "90a71ff0.af51a",
+                "de22a1d2.f2012"
             ]
         ]
     },
     {
-        "id": "c8e35acd.0cd338",
+        "id": "1b704af4.001005",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1741.7333374023438,
-        "y": 3015.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1704.7333526611328,
+        "y": 3034.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "b0542ad9.f9bdf8"
+                "13747b87.9c71cc"
             ]
         ]
     },
     {
-        "id": "1a3bc3e9.de0b6c",
+        "id": "90a71ff0.af51a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1753.7333374023438,
-        "y": 3065.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1716.7333526611328,
+        "y": 3084.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "6126bc5c.e48684"
+                "8dc0e81e.e3f4e8"
             ]
         ]
     },
     {
-        "id": "d9c66705.f174c8",
+        "id": "de22a1d2.f2012",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1744.7333374023438,
-        "y": 3120.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1707.7333526611328,
+        "y": 3139.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "bc3263f3.ac82e"
+                "588af43e.c26e74"
             ]
         ]
     },
     {
-        "id": "bc3263f3.ac82e",
+        "id": "588af43e.c26e74",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 1889.7333374023438,
-        "y": 3119.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1852.7333526611328,
+        "y": 3138.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "6126bc5c.e48684",
+        "id": "8dc0e81e.e3f4e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 1900.7333374023438,
-        "y": 3062.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1863.7333526611328,
+        "y": 3081.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "b0542ad9.f9bdf8",
+        "id": "13747b87.9c71cc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1867.1157836914062,
-        "y": 3009.1222381591797,
-        "z": "ba0dc87e.a3b258",
+        "x": 1830.1157989501953,
+        "y": 3028.1222381591797,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "fcdf9d8b.4643d"
+                "974aaa11.eb6cb"
             ]
         ]
     },
     {
-        "id": "fcdf9d8b.4643d",
+        "id": "974aaa11.eb6cb",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2028.2333374023438,
-        "y": 3023.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1991.2333526611328,
+        "y": 3042.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "d8f6f412.7d192"
+                "d0dc9aab.207738"
             ]
         ]
     },
     {
-        "id": "d8f6f412.7d192",
+        "id": "d0dc9aab.207738",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2223.2333374023438,
-        "y": 3023.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2186.233352661133,
+        "y": 3042.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "513cd183.70a36"
+                "c5ea8522.683198"
             ]
         ]
     },
     {
-        "id": "16c3d135.367537",
+        "id": "5023a378.bccf5c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2603.2333374023438,
-        "y": 3019.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2566.233352661133,
+        "y": 3038.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "8f09a3ce.bb8bc8",
-                "42328e66.9a179"
+                "684650c8.a4a3a",
+                "cb667230.05f32"
             ]
         ]
     },
     {
-        "id": "42328e66.9a179",
+        "id": "cb667230.05f32",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 2811.2333374023438,
-        "y": 3026.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2774.233352661133,
+        "y": 3045.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "2a95e8b.71c7818",
-                "8cd4441d.84eb48",
-                "2f9a0731.3058d8"
+                "b3d421a8.26ce58",
+                "207778d4.3409c8",
+                "d90d835c.bc33f"
             ]
         ]
     },
     {
-        "id": "8f09a3ce.bb8bc8",
+        "id": "684650c8.a4a3a",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2841.2333374023438,
-        "y": 2974.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2804.233352661133,
+        "y": 2993.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "2a95e8b.71c7818",
+        "id": "b3d421a8.26ce58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3021.2333374023438,
-        "y": 3017.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2984.233352661133,
+        "y": 3036.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "bb0632bc.6bdea8"
+                "344430e4.438e1"
             ]
         ]
     },
     {
-        "id": "8cd4441d.84eb48",
+        "id": "207778d4.3409c8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3013.2333374023438,
-        "y": 3072.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2976.233352661133,
+        "y": 3091.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "fee906e6.a31e28"
+                "dc2a2f20.50fc1"
             ]
         ]
     },
     {
-        "id": "2f9a0731.3058d8",
+        "id": "d90d835c.bc33f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3018.2333374023438,
-        "y": 3129.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2981.233352661133,
+        "y": 3148.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "b7732316.bbeb1"
+                "1ecff912.83975f"
             ]
         ]
     },
     {
-        "id": "b7732316.bbeb1",
+        "id": "1ecff912.83975f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3170.2333374023438,
-        "y": 3130.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3133.233352661133,
+        "y": 3149.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "fee906e6.a31e28",
+        "id": "dc2a2f20.50fc1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3181.2333374023438,
-        "y": 3075.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3144.233352661133,
+        "y": 3094.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "bb0632bc.6bdea8",
+        "id": "344430e4.438e1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3165.6156616210938,
-        "y": 3015.1222381591797,
-        "z": "ba0dc87e.a3b258",
+        "x": 3128.615676879883,
+        "y": 3034.1222381591797,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "f496005b.73025"
+                "8422f10e.6bf76"
             ]
         ]
     },
     {
-        "id": "513cd183.70a36",
+        "id": "c5ea8522.683198",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2426.2333374023438,
-        "y": 3027.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2389.233352661133,
+        "y": 3046.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "16c3d135.367537"
+                "5023a378.bccf5c"
             ]
         ]
     },
     {
-        "id": "f496005b.73025",
+        "id": "8422f10e.6bf76",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3380.2333374023438,
-        "y": 3011.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3343.233352661133,
+        "y": 3030.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "d81f3e39.a99398",
+        "id": "2ba7fbc5.caf74c",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1499.2333374023438,
-        "y": 3237.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1462.2333526611328,
+        "y": 3256.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "f53e378b.14151",
-                "e638c491.631368"
+                "d1a10e9.68db57",
+                "55ef105b.219ab8"
             ]
         ]
     },
     {
-        "id": "f53e378b.14151",
+        "id": "d1a10e9.68db57",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1700.2333374023438,
-        "y": 3235.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1663.2333526611328,
+        "y": 3254.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "7fd6322b.5362bc"
+                "854cd71a.2831b"
             ]
         ]
     },
     {
-        "id": "f8356e69.4561c",
+        "id": "5d22aeae.4146d",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 1981.2333374023438,
-        "y": 3185.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1944.2333526611328,
+        "y": 3204.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "4191bf2c.16bd58",
+        "id": "da07edc0.17da88",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainC)",
         "xml": "<switch test='`$otnidx == $tmp.otninfoProtect_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1917.2333374023438,
-        "y": 3286.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1880.2333526611328,
+        "y": 3305.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "93d13951.14dd18",
-                "fa75dc08.2eaf8"
+                "123d4b4b.3d3dad",
+                "ef13616b.b55bd"
             ]
         ]
     },
     {
-        "id": "93d13951.14dd18",
+        "id": "123d4b4b.3d3dad",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2147.2333374023438,
-        "y": 3282.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2110.233352661133,
+        "y": 3301.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "8d4bef0b.6a0fe8"
+                "158fea08.6700e6"
             ]
         ]
     },
     {
-        "id": "e638c491.631368",
+        "id": "55ef105b.219ab8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1700.2333374023438,
-        "y": 3284.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1663.2333526611328,
+        "y": 3303.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "4191bf2c.16bd58"
+                "da07edc0.17da88"
             ]
         ]
     },
     {
-        "id": "fa75dc08.2eaf8",
+        "id": "ef13616b.b55bd",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2148.2333374023438,
-        "y": 3328.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2111.233352661133,
+        "y": 3347.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "5bb88da7.4d8694"
+                "8c36d27f.e0867"
             ]
         ]
     },
     {
-        "id": "5bb88da7.4d8694",
+        "id": "8c36d27f.e0867",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2362.2333374023438,
-        "y": 3328.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2325.233352661133,
+        "y": 3347.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "6729c928.c3b6c",
+        "id": "d0c0493f.f08008",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2036.2333374023438,
-        "y": 3232.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1999.2333526611328,
+        "y": 3251.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "7fd6322b.5362bc",
+        "id": "854cd71a.2831b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1824.2333374023438,
-        "y": 3226.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1787.2333526611328,
+        "y": 3245.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "6729c928.c3b6c"
+                "d0c0493f.f08008"
             ]
         ]
     },
     {
-        "id": "8d4bef0b.6a0fe8",
+        "id": "158fea08.6700e6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2280.2333374023438,
-        "y": 3258.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2243.233352661133,
+        "y": 3277.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "e3feca80.0e5828"
+                "9e71b7af.8db628"
             ]
         ]
     },
     {
-        "id": "e95f7eb5.2af0b8",
+        "id": "bea33937.3887e8",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 2436.2333374023438,
-        "y": 3274.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2399.233352661133,
+        "y": 3293.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "e3feca80.0e5828",
+        "id": "9e71b7af.8db628",
         "type": "set",
         "name": "set attachment_param domain C",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />",
         "comments": "",
-        "x": 2484.2333374023438,
-        "y": 3226.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2447.233352661133,
+        "y": 3245.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "57f2e473.517f54",
+        "id": "7c316fec.b1e588",
         "type": "set",
         "name": "set srcTtp+dstTtp pair",
         "xml": "<set>\n<parameter name='tmp.srcTtpdstTtpPair' value=\"`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id + ',' +\n                                               $tmp.otninfootninfoProtect.dstPort.dst-tunnel-tp-id`\" />\n\n\n",
         "comments": "",
-        "x": 1475.2333374023438,
-        "y": 3317.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1438.2333526611328,
+        "y": 3336.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "34621460.796344",
+        "id": "9839af4.fe6bc5",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1667.2333068847656,
-        "y": 3415.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1630.2333221435547,
+        "y": 3434.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "c1b2a740.d37fa",
+        "id": "85ee5aba.20cb98",
         "type": "set",
         "name": "set current-provider-id and current-cvlan-id",
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$tmp.access-provider-id`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n",
         "comments": "",
-        "x": 1539.2333374023438,
-        "y": 3368.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1502.2333526611328,
+        "y": 3387.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "5ed2002c.80ebf8",
+        "id": "f83dd9dc.4b2938",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1348.2333374023438,
-        "y": 3569.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1311.2333526611328,
+        "y": 3588.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "3ba1da7b.60657e",
-                "5bde363c.523c48"
+                "18d6c2fa.641995",
+                "dcc8cc4e.be442"
             ]
         ]
     },
     {
-        "id": "3ba1da7b.60657e",
+        "id": "18d6c2fa.641995",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1634.2333374023438,
-        "y": 4388.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1597.2333526611328,
+        "y": 4407.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "c5f8d573.741818"
+                "e6eb5ead.3574d"
             ]
         ]
     },
     {
-        "id": "cfba9c01.06834",
+        "id": "343e95a2.91d102",
         "type": "comment",
         "name": "call string.contains to check if the cache has srcTtpdstTtpPair",
         "info": "if it had: then no new otn/vpn-binding is needed\n           ==> find the otn. ==>look into the relationships of this connectivity and find the one that has same srcTtp and dstTtp\n           ==> increase the bw\nif not, create a new vpn-binding, attach this vpn-binding into the founded connectivity, and attach it to the middle-man-conn as well.",
         "comments": "",
-        "x": 2060.2333374023438,
-        "y": 4333.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2023.2333526611328,
+        "y": 4352.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "d5ee8376.6d7b3",
+        "id": "96e5df51.7a42e8",
         "type": "comment",
         "name": "create a new connectivity - (for dummy connectivity)",
         "info": "(this should not be for LEAF side or ROOT side, otherwise error)\n\ncreate a new vpn-binding (done here)\ncreate a new connectivity (done below)\nadd srcTtpdstTtpPair into the cache in this connectivity\nattach the vpn-binding into the connectivity relationship\nattach this connectivity into the middle man\nattach this connectivity into the service-instance",
         "comments": "",
-        "x": 1927.2333068847656,
-        "y": 3531.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1890.2333221435547,
+        "y": 3550.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "7d7a6dc.ff5ab14",
+        "id": "b3b8f0b4.38811",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value=\"`$prop.otn-tunnel-name + '-protection'`\" />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value=\"`$prop.otn-tunnel-name + '-protection'`\" />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1974.2333374023438,
-        "y": 3581.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1937.2333526611328,
+        "y": 3600.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "770ec83d.f5f698"
+                "45c4366f.fdbdd8"
             ]
         ]
     },
     {
-        "id": "770ec83d.f5f698",
+        "id": "45c4366f.fdbdd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2262.2333374023438,
-        "y": 3582.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2225.233352661133,
+        "y": 3601.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "1ea6c507.8eb3c3"
+                "2d3f69ef.0fb5de"
             ]
         ]
     },
     {
-        "id": "1ea6c507.8eb3c3",
+        "id": "2d3f69ef.0fb5de",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2445.7333374023438,
-        "y": 3580.720474243164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2408.733352661133,
+        "y": 3599.720474243164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "4b1e068c.b603",
+        "id": "2e9ec397.995dbc",
         "type": "execute",
         "name": "execute string.contains srcTtpdstTtpPair",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n<parameter name=\"source\" value='`$tmp.the-connectivity.coupling-flag`'/>\n<parameter name=\"target\" value=\"`$tmp.srcTtpdstTtpPair`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2048.2333374023438,
-        "y": 4385.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2011.2333526611328,
+        "y": 4404.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "fa23bfea.633fa",
-                "5640420c.c8d724"
+                "ed90dd28.b83e58",
+                "f82ff6ac.db51f"
             ]
         ]
     },
     {
-        "id": "fa23bfea.633fa",
+        "id": "ed90dd28.b83e58",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2221.2333374023438,
-        "y": 4233.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2184.233352661133,
+        "y": 4252.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "5640420c.c8d724",
+        "id": "f82ff6ac.db51f",
         "type": "outcomeFalse",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2253.2333374023438,
-        "y": 4492.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2216.233352661133,
+        "y": 4511.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "745b8702.06258"
+                "99f4b014.f67058"
             ]
         ]
     },
     {
-        "id": "566a0421.e07abc",
+        "id": "8628699c.1adc48",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value=\"`$prop.otn-tunnel-name + '-protection'`\" />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value=\"`$prop.otn-tunnel-name + '-protection'`\" />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2660.2333374023438,
-        "y": 4023.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2623.233352661133,
+        "y": 4042.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "e7e1a1af.83dc9"
+                "350cf74a.3ae6a8"
             ]
         ]
     },
     {
-        "id": "e7e1a1af.83dc9",
+        "id": "350cf74a.3ae6a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2964.2333374023438,
-        "y": 4020.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2927.233352661133,
+        "y": 4039.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "9e39afad.724988"
+                "80cb8f26.8d8088"
             ]
         ]
     },
     {
-        "id": "9e39afad.724988",
+        "id": "80cb8f26.8d8088",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3114.7333374023438,
-        "y": 4027.720474243164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3077.733352661133,
+        "y": 4046.720474243164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "5fd9a93f.71f3e",
+        "id": "a2ac802b.508078",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1954.2333374023438,
-        "y": 3636.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1917.2333526611328,
+        "y": 3655.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e99e1220.c8d158",
+        "id": "9669f040.b74ba",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1892.2333374023438,
-        "y": 3686.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1855.2333526611328,
+        "y": 3705.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e74eb1dd.b1cce",
+        "id": "7c73fd.eee64c04",
         "type": "save",
         "name": "save middle-man-conn relationship to connectivity-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1993.2333374023438,
-        "y": 3731.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1956.2333526611328,
+        "y": 3750.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "d069cfb2.559918",
+        "id": "470effce.6ff878",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 2029.2333374023438,
-        "y": 3785.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1992.2333526611328,
+        "y": 3804.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "db7724b7.c0b95",
+        "id": "46fef161.e2f5b8",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1997.2333374023438,
-        "y": 3844.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1960.2333526611328,
+        "y": 3863.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "dccc268f.14582",
+        "id": "a6bdd1f3.4b8e18",
         "type": "comment",
         "name": "find middle-man's eth-srv-name",
         "info": "",
         "comments": "",
-        "x": 1455.2333374023438,
-        "y": 3460.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1418.2333526611328,
+        "y": 3479.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "6dfdf88f.4bb6c",
+        "id": "e931b49.dce4f48",
         "type": "set",
         "name": "set prop.ethernet-service-name",
         "xml": "<set>\n<parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />\n\n",
         "comments": "",
-        "x": 1477.2333374023438,
-        "y": 3504.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1440.2333526611328,
+        "y": 3523.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "e9be22f5.c3b77",
+        "id": "90c5dad8.6290a8",
         "type": "save",
         "name": "save middle-man-conn relationship to tmp.the-connectivity, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2684.2333374023438,
-        "y": 4240.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2647.233352661133,
+        "y": 4259.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "e3ac7685.f8539",
+        "id": "db332d3c.49a9a",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 2715.2333374023438,
-        "y": 4279.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2678.233352661133,
+        "y": 4298.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "8511409f.51bd2",
+        "id": "d699f611.493dc8",
         "type": "save",
         "name": "save tmp.the-connectivity relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2686.2333374023438,
-        "y": 4352.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2649.233352661133,
+        "y": 4371.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "65db0af6.94eaf4",
+        "id": "1cd5d29a.f74d95",
         "type": "comment",
         "name": "update the founded connectivity to have a new coupling-flag",
         "info": "",
         "comments": "",
-        "x": 2656.2333374023438,
-        "y": 4068.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2619.233352661133,
+        "y": 4087.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "537df036.3150f",
+        "id": "41ec6c24.ddf264",
         "type": "set",
         "name": "set newFlag",
         "xml": "<set>\n<parameter name='tmp.newFlag' value=\"`$tmp.the-connectivity.coupling-flag + '-' +\n                                               $tmp.srcTtpdstTtpPair`\" />\n\n\n",
         "comments": "",
-        "x": 2542.2333374023438,
-        "y": 4107.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2505.233352661133,
+        "y": 4126.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "73887d45.2afa44",
+        "id": "5401259a.255f4c",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='coupling-flag' value='`$tmp.newFlag`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2606.2333374023438,
-        "y": 4152.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2569.233352661133,
+        "y": 4171.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "442047ec.b76048",
+        "id": "f4ae7aab.9265",
         "type": "comment",
         "name": "the following two relationships should have already been there; if not => error",
         "info": "",
         "comments": "",
-        "x": 2698.2333374023438,
-        "y": 4202.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2661.233352661133,
+        "y": 4221.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "a6868862.e0d7a8",
+        "id": "f7b21c05.40cbf",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1684.2333374023438,
-        "y": 3569.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1647.2333526611328,
+        "y": 3588.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "7d7a6dc.ff5ab14",
-                "5fd9a93f.71f3e",
-                "e99e1220.c8d158",
-                "e74eb1dd.b1cce",
-                "d069cfb2.559918",
-                "db7724b7.c0b95"
+                "b3b8f0b4.38811",
+                "a2ac802b.508078",
+                "9669f040.b74ba",
+                "7c73fd.eee64c04",
+                "470effce.6ff878",
+                "46fef161.e2f5b8"
             ]
         ]
     },
     {
-        "id": "5bde363c.523c48",
+        "id": "dcc8cc4e.be442",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1546.2333374023438,
-        "y": 3565.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1509.2333526611328,
+        "y": 3584.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "a6868862.e0d7a8"
+                "f7b21c05.40cbf"
             ]
         ]
     },
     {
-        "id": "c5f8d573.741818",
+        "id": "e6eb5ead.3574d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2344.2333374023438,
-        "y": 4032.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2307.233352661133,
+        "y": 4051.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "566a0421.e07abc",
-                "537df036.3150f",
-                "73887d45.2afa44",
-                "8511409f.51bd2"
+                "8628699c.1adc48",
+                "41ec6c24.ddf264",
+                "5401259a.255f4c",
+                "d699f611.493dc8"
             ]
         ]
     },
     {
-        "id": "8b5f6b52.3288",
+        "id": "3343c09a.65c218",
         "type": "comment",
         "name": "loop through the relationships of this founded connectivity, then",
         "info": "then find the vpn-binding that has same src ttp and dst ttp as this one",
         "comments": "",
-        "x": 2349.2333374023438,
-        "y": 4457.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2312.233352661133,
+        "y": 4476.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "1a02430.b289b3d",
+        "id": "9dc35d09.68f5e",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='tcridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2691.2333374023438,
-        "y": 4493.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2654.233352661133,
+        "y": 4512.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "cd907dba.e4d3c8"
+                "9e275798.602f8"
             ]
         ]
     },
     {
-        "id": "cd907dba.e4d3c8",
+        "id": "9e275798.602f8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$tcridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2903.2333374023438,
-        "y": 4491.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2866.233352661133,
+        "y": 4510.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "20ed8870.8c9e9"
+                "7a3ca348.6eb8cc"
             ]
         ]
     },
     {
-        "id": "20ed8870.8c9e9",
+        "id": "7a3ca348.6eb8cc",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3087.2333374023438,
-        "y": 4489.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3050.233352661133,
+        "y": 4508.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "3940766f.dd75d2"
+                "18297da6.def11a"
             ]
         ]
     },
     {
-        "id": "3940766f.dd75d2",
+        "id": "18297da6.def11a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3266.2333374023438,
-        "y": 4494.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3229.233352661133,
+        "y": 4513.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "de8d19cf.e0eb38",
-                "501e7414.822a34"
+                "cae15caf.d873b",
+                "b9a58cc8.83da"
             ]
         ]
     },
     {
-        "id": "501e7414.822a34",
+        "id": "b9a58cc8.83da",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 3483.2333374023438,
-        "y": 4425.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3446.233352661133,
+        "y": 4444.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "de8d19cf.e0eb38",
+        "id": "cae15caf.d873b",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$tcridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3476.2333374023438,
-        "y": 4511.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3439.233352661133,
+        "y": 4530.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "fabce7f.821b298",
-                "84c19fc0.ef7ad8",
-                "d8007fa7.e96748"
+                "5138a4d2.ef8fac",
+                "ac846614.4aec2",
+                "f282e20e.a80ae8"
             ]
         ]
     },
     {
-        "id": "84c19fc0.ef7ad8",
+        "id": "ac846614.4aec2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3689.7243041992188,
-        "y": 4496.040603637695,
-        "z": "ba0dc87e.a3b258",
+        "x": 3652.724319458008,
+        "y": 4515.040603637695,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "ab7f4c85.a03338"
+                "a9c1a4d0.be4bf"
             ]
         ]
     },
     {
-        "id": "ab7f4c85.a03338",
+        "id": "a9c1a4d0.be4bf",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3852.2958374023438,
-        "y": 4495.326309204102,
-        "z": "ba0dc87e.a3b258",
+        "x": 3815.295852661133,
+        "y": 4514.326309204102,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "c7bb2a00.8d6e3",
+        "id": "3f01f4a.cba308c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3853.2333374023438,
-        "y": 4540.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3816.233352661133,
+        "y": 4559.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "d8007fa7.e96748",
+        "id": "f282e20e.a80ae8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3685.2333374023438,
-        "y": 4540.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3648.233352661133,
+        "y": 4559.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "c7bb2a00.8d6e3"
+                "3f01f4a.cba308c"
             ]
         ]
     },
     {
-        "id": "fabce7f.821b298",
+        "id": "5138a4d2.ef8fac",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3687.2333374023438,
-        "y": 4600.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3650.233352661133,
+        "y": 4619.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "44bdcb57.5d1c04"
+                "77a45849.e6938"
             ]
         ]
     },
     {
-        "id": "44bdcb57.5d1c04",
+        "id": "77a45849.e6938",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3856.2333374023438,
-        "y": 4599.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 3819.233352661133,
+        "y": 4618.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "ab8a9481.ed1188"
+                "4ba14139.176d1"
             ]
         ]
     },
     {
-        "id": "745b8702.06258",
+        "id": "99f4b014.f67058",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2480.2333374023438,
-        "y": 4491.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2443.233352661133,
+        "y": 4510.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "1a02430.b289b3d",
-                "b7b42ab.e3d1558",
-                "e37b8cbd.aee6b8"
+                "9dc35d09.68f5e",
+                "389a95d9.814532",
+                "dc2c44c.de08338"
             ]
         ]
     },
     {
-        "id": "ab8a9481.ed1188",
+        "id": "4ba14139.176d1",
         "type": "switchNode",
         "name": "switch srcTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id == $tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4055.2333374023438,
-        "y": 4600.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 4018.233352661133,
+        "y": 4619.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "b7cd5564.ed6c"
+                "bca4df60.ab3168"
             ]
         ]
     },
     {
-        "id": "b7cd5564.ed6c",
+        "id": "bca4df60.ab3168",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4218.233337402344,
-        "y": 4598.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 4181.233352661133,
+        "y": 4617.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "ccabadec.a87d08"
+                "8c9fdcfa.7d409"
             ]
         ]
     },
     {
-        "id": "ccabadec.a87d08",
+        "id": "8c9fdcfa.7d409",
         "type": "switchNode",
         "name": "switch dstTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id == $tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4399.233337402344,
-        "y": 4598.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 4362.233352661133,
+        "y": 4617.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "61252d2.f400154"
+                "1fd4ba30.e4e24e"
             ]
         ]
     },
     {
-        "id": "61252d2.f400154",
+        "id": "1fd4ba30.e4e24e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4562.233337402344,
-        "y": 4596.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 4525.233352661133,
+        "y": 4615.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "c33d2a30.0a34e8"
+                "eeebf323.f178a8"
             ]
         ]
     },
     {
-        "id": "73039273.69e874",
+        "id": "19bf4184.74519e",
         "type": "set",
         "name": "set tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='`$tmp.aai.vpn-binding.`' />\n",
         "comments": "",
-        "x": 4919.233337402344,
-        "y": 4603.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 4882.233352661133,
+        "y": 4622.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "c33d2a30.0a34e8",
+        "id": "eeebf323.f178a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4701.233337402344,
-        "y": 4595.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 4664.233352661133,
+        "y": 4614.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "73039273.69e874",
-                "9503d547.7a1c98"
+                "19bf4184.74519e",
+                "12253a72.5240ae"
             ]
         ]
     },
     {
-        "id": "9503d547.7a1c98",
+        "id": "12253a72.5240ae",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4865.233337402344,
-        "y": 4647.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 4828.233352661133,
+        "y": 4666.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "b7b42ab.e3d1558",
+        "id": "389a95d9.814532",
         "type": "set",
         "name": "unset tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2701.2333374023438,
-        "y": 4454.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2664.233352661133,
+        "y": 4473.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "d737e9cc.f602b8",
+        "id": "5b2a70f3.05e488",
         "type": "comment",
         "name": "increase the bw of the-vpn-binding and change status to modified",
         "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
         "comments": "",
-        "x": 2790.2333374023438,
-        "y": 4628.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2753.233352661133,
+        "y": 4647.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "e37b8cbd.aee6b8",
+        "id": "dc2c44c.de08338",
         "type": "save",
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`($tmp.the-vpn-binding.customer-vpn-id + $gfp)`' />\n\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2760.2333374023438,
-        "y": 4688.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 2723.233352661133,
+        "y": 4707.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "252a570f.f396c8",
+        "id": "3c86462f.4b1cfa",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1595.2333374023438,
-        "y": 2856.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1558.2333526611328,
+        "y": 2875.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             []
         ]
     },
     {
-        "id": "a19e39b9.f8da1",
+        "id": "11f57316.f3cd45",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1675.2333374023438,
-        "y": 2907.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1638.2333526611328,
+        "y": 2926.466567993164,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "f653960c.909178"
+                "9c6641d3.3410d"
             ]
         ]
     },
     {
-        "id": "f653960c.909178",
+        "id": "9c6641d3.3410d",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 1889.2333374023438,
-        "y": 2906.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1852.2333526611328,
+        "y": 2925.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "8f4a3300.fba8d8",
+        "id": "397ccb1f.018174",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value='' />\n<parameter name='prop.vpn-binding-otnidx-uuid' value='' />\n<parameter name='tmp.access-provider-id' value='' />\n<parameter name='tmp.access-client-id' value='' />\n<parameter name='tmp.access-topology-id' value='' />\n<parameter name='tmp.srcdstpnf-id' value='' />\n<parameter name='tmp.aai.srcdst-pnf.' value='' />\n<parameter name='tmp.domainG.esr-thirdparty-id' value='' />\n<parameter name='tmp.aai.domainG.esr-thirdparty-sdnc.' value='' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value='' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value='' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value='' />\n<parameter name='tmp.srcTtpdstTtpPair' value='' />\n\n\n",
         "comments": "",
-        "x": 1255.1332397460938,
-        "y": 2491.466567993164,
-        "z": "ba0dc87e.a3b258",
+        "x": 1218.1332550048828,
+        "y": 2510.466567993164,
+        "z": "2050832.98c01fc",
         "wires": []
     },
     {
-        "id": "929a93b0.fb26e",
+        "id": "a45af556.e89b18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1029.7666625976562,
-        "y": 2507.699966430664,
-        "z": "ba0dc87e.a3b258",
+        "x": 992.7666778564453,
+        "y": 2526.699966430664,
+        "z": "2050832.98c01fc",
         "wires": [
             [
-                "8f4a3300.fba8d8",
-                "1365d05a.43ccb8"
+                "397ccb1f.018174",
+                "3c1038b8.5e7e68"
             ]
         ]
     }
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
index 8897cd2b..a670133a 100644
--- 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
@@ -1,20 +1,20 @@
 [
     {
-        "id": "e4aeb52e.202cc8",
+        "id": "8a5b20c9.2d6958",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 204.56666564941406,
-        "y": 120,
-        "z": "bdffb6ef.b80cc8",
+        "x": 261.566650390625,
+        "y": 139.56666564941406,
+        "z": "2d18ff94.88c5f",
         "wires": [
             [
-                "9feb921c.82a788"
+                "bdb245f1.4da368"
             ]
         ]
     },
     {
-        "id": "9feb921c.82a788",
+        "id": "bdb245f1.4da368",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API 777",
         "module": "GENERIC-RESOURCE-API",
@@ -22,169 +22,218 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='777'>",
         "outputs": 1,
-        "x": 488.85235595703125,
-        "y": 181.23810863494873,
-        "z": "bdffb6ef.b80cc8",
+        "x": 545.8523406982422,
+        "y": 200.8047742843628,
+        "z": "2d18ff94.88c5f",
         "wires": [
             [
-                "6348e040.131e2"
+                "4eb0b947.e83b78"
             ]
         ]
     },
     {
-        "id": "6348e040.131e2",
+        "id": "4eb0b947.e83b78",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-callbackdg-notification",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 475.99525451660156,
-        "y": 257.0000305175781,
-        "z": "bdffb6ef.b80cc8",
+        "x": 532.9952392578125,
+        "y": 276.5666961669922,
+        "z": "2d18ff94.88c5f",
         "wires": [
             [
-                "afa43904.62cb1"
+                "416b6213.27c614"
             ]
         ]
     },
     {
-        "id": "afa43904.62cb1",
+        "id": "96fcdbbe.b24fe",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 804.8047027587891,
-        "y": 257.66668701171875,
-        "z": "bdffb6ef.b80cc8",
+        "x": 1120.8046875,
+        "y": 501.23333740234375,
+        "z": "2d18ff94.88c5f",
         "wires": [
             [
-                "b180367c.1f9198",
-                "7ef57ba6.1f727c",
-                "c42a69a0.a4eb7",
-                "5786b926.3906a8",
-                "b1e4d5b8.551e78",
-                "38d39329.9d1d2c",
-                "25fc0d1d.85e28a",
-                "93ceb81d.d133c"
+                "fe25bf06.e1202",
+                "e39f74e0.3b6dd",
+                "621e169.bbf1768",
+                "ff3bf0b0.2c575",
+                "bbfd60be.b270e",
+                "5d29e3cc.fdd34c"
             ]
         ]
     },
     {
-        "id": "b180367c.1f9198",
+        "id": "b5bac117.85774",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1055.566665649414,
-        "y": 258,
-        "z": "bdffb6ef.b80cc8",
+        "x": 1112.566650390625,
+        "y": 277.56666564941406,
+        "z": "2d18ff94.88c5f",
         "wires": [
             []
         ]
     },
     {
-        "id": "7ef57ba6.1f727c",
+        "id": "fe25bf06.e1202",
         "type": "set",
         "name": "set received notification parameters",
         "xml": "<set>\n<!--<parameter name='rcvdNotif' value='`$notifvalue`' />-->\n<parameter name='rcvd-etht-svc-end-point' value='`$push-change-update.datastore-changes.payload.parameter-value[0].etht-svc-end-point`' />\n<parameter name='rcvd-subscription-id' value='`$push-change-update.subscription-id`' />\n<parameter name='rcvd-bandwidth-value' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value`' />\n<parameter name='rcvd-service-instance-id' value='`$push-change-update.datastore-changes.payload.parameter-value[0].value-description`' />",
         "comments": "",
-        "x": 1083.5667266845703,
-        "y": 431,
-        "z": "bdffb6ef.b80cc8",
+        "x": 1441.566650390625,
+        "y": 459.566650390625,
+        "z": "2d18ff94.88c5f",
         "wires": []
     },
     {
-        "id": "93ceb81d.d133c",
+        "id": "d60d98ea.d791b8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"CallBack DG For SSE CONNECTION is called\"/>\n<!--<parameter name=\"field2\" value=\"`$rcvdNotif`\"/>-->",
         "comments": "",
         "outputs": 1,
-        "x": 1019.5667266845703,
-        "y": 202,
-        "z": "bdffb6ef.b80cc8",
+        "x": 1076.5667114257812,
+        "y": 221.56666564941406,
+        "z": "2d18ff94.88c5f",
         "wires": [
             []
         ]
     },
     {
-        "id": "c42a69a0.a4eb7",
+        "id": "5d29e3cc.fdd34c",
         "type": "save",
         "name": "save:metadata to AAI",
-        "xml": "<!--<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource=\"service-instance:metadata\"-->\n<!-- key=\"service-instance.service-instance-id = $network-topology-operation-input.service-information.service-id  -->\n<!--\tAND customer.global-customer-id = $network-topology-operation-input.service-information.global-customer-id-->\n<!--\t  AND service-subscription.service-type = $network-topology-operation-input.service-information.subscription-service-type-->\n<!--\t  AND service-instance.service-instance-id =  $rcvd-service-instance-id\"  force=\"true\" pfx=\"tmp.AnAI-data\">-->\n\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\n\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\n AND customer.global-customer-id = '5GCustomer' \n AND service-subscription.service-type = '5G'\"  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\n\n         \n         ",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource=\"service-instance:metadata\"\n key=\"service-instance.service-instance-id =  $rcvd-service-instance-id\n AND customer.global-customer-id = 'IBNCustomer' \n AND service-subscription.service-type = 'IBN'\"  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\n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1040.5667266845703,
-        "y": 494,
-        "z": "bdffb6ef.b80cc8",
+        "x": 1398.566650390625,
+        "y": 522.566650390625,
+        "z": "2d18ff94.88c5f",
         "wires": [
             []
         ]
     },
     {
-        "id": "38d39329.9d1d2c",
+        "id": "ff3bf0b0.2c575",
         "type": "set",
         "name": "set parameters",
         "xml": "<set>\n<parameter name='eventIdUuid' value=\"`'BandwidthChanged_' + $eventId-uuid`\" />\n<parameter name='eventNameUuid' value='`$eventName-uuid`' />\n<parameter name='cclId' value='`$rcvd-service-instance-id`' />\n<parameter name='uniId' value='`$rcvd-etht-svc-end-point`' />\n<parameter name='bandwidthValue' value='`$rcvd-bandwidth-value`' />\n",
         "comments": "",
-        "x": 1019.5667266845703,
-        "y": 740.9999694824219,
-        "z": "bdffb6ef.b80cc8",
+        "x": 1377.566650390625,
+        "y": 769.5666198730469,
+        "z": "2d18ff94.88c5f",
         "wires": []
     },
     {
-        "id": "25fc0d1d.85e28a",
+        "id": "bbfd60be.b270e",
         "type": "execute",
         "name": "execute RestApiCallNode call VES",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-call-ves.templatefile`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.dcaeAddrAndPort + '/eventListener/v7'`\" />-->\n<parameter name=\"restapiUrl\" value=\"https://dcae-ves-collector:8443/eventListener/v7\" />\n<parameter name=\"restapiUser\" value=\"sample1\" />\n<parameter name=\"restapiPassword\" value=\"sample1\" />\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<parameter name=\"disableHostVerification\" value=\"true\"/>\n<parameter name=\"ssl\" value=\"false\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1077.5667266845703,
-        "y": 783.9999694824219,
-        "z": "bdffb6ef.b80cc8",
+        "x": 1435.566650390625,
+        "y": 812.5666198730469,
+        "z": "2d18ff94.88c5f",
         "wires": [
             []
         ]
     },
     {
-        "id": "5786b926.3906a8",
+        "id": "e39f74e0.3b6dd",
         "type": "execute",
         "name": "execute UUID generator for eventId",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventId-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1081.5667266845703,
-        "y": 648.9999694824219,
-        "z": "bdffb6ef.b80cc8",
+        "x": 1439.566650390625,
+        "y": 677.5666198730469,
+        "z": "2d18ff94.88c5f",
         "wires": [
             []
         ]
     },
     {
-        "id": "b1e4d5b8.551e78",
+        "id": "621e169.bbf1768",
         "type": "execute",
         "name": "execute UUID generator for eventName",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"eventName-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1094.5667266845703,
-        "y": 690.9999694824219,
-        "z": "bdffb6ef.b80cc8",
+        "x": 1452.566650390625,
+        "y": 719.5666198730469,
+        "z": "2d18ff94.88c5f",
         "wires": [
             []
         ]
     },
     {
-        "id": "2ee5d5bb.37a0e2",
+        "id": "b2f5ba8c.666eb8",
         "type": "comment",
         "name": "Calling VES and passing notification parameters",
         "info": "",
         "comments": "",
-        "x": 1108.5667266845703,
-        "y": 593.9999694824219,
-        "z": "bdffb6ef.b80cc8",
+        "x": 1466.566650390625,
+        "y": 622.5666198730469,
+        "z": "2d18ff94.88c5f",
         "wires": []
+    },
+    {
+        "id": "6d59e09e.bb9828",
+        "type": "switchNode",
+        "name": "switch change type == upadte",
+        "xml": "<switch test=\"`$push-change-update.datastore-changes.type == 'update' `\">\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1137.566650390625,
+        "y": 352.566650390625,
+        "z": "2d18ff94.88c5f",
+        "wires": [
+            [
+                "967e790f.f55248"
+            ]
+        ]
+    },
+    {
+        "id": "967e790f.f55248",
+        "type": "outcome",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1352.566650390625,
+        "y": 350.566650390625,
+        "z": "2d18ff94.88c5f",
+        "wires": [
+            [
+                "96fcdbbe.b24fe"
+            ]
+        ]
+    },
+    {
+        "id": "416b6213.27c614",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 867.566650390625,
+        "y": 277.566650390625,
+        "z": "2d18ff94.88c5f",
+        "wires": [
+            [
+                "d60d98ea.d791b8",
+                "b5bac117.85774",
+                "6d59e09e.bb9828"
+            ]
+        ]
     }
 ]
\ 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-create-clean.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
index 2fc491a7..5989c10f 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "934a37b5.570538",
+    "id": "77a1d01c.aa0f88",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 132.56666564941406,
-    "y": 130,
-    "z": "8bc654d2.f0dde",
+    "x": 168.56666564941406,
+    "y": 174.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "56cf7e3f.c20408"
+        "1e3c1648.671ee2"
       ]
     ]
   },
   {
-    "id": "56cf7e3f.c20408",
+    "id": "1e3c1648.671ee2",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,7886 +22,7886 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 416.85235595703125,
-    "y": 191.23810863494873,
-    "z": "8bc654d2.f0dde",
+    "x": 452.85235595703125,
+    "y": 235.8047742843628,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9d6f7a83.dd2e58"
+        "cf91a24a.cfe63"
       ]
     ]
   },
   {
-    "id": "9d6f7a83.dd2e58",
+    "id": "cf91a24a.cfe63",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-create-clean",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-create-clean' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 422.9952697753906,
-    "y": 276.0000305175781,
-    "z": "8bc654d2.f0dde",
+    "x": 458.9952697753906,
+    "y": 320.5666961669922,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "69ada9d9.f9e3c"
+        "8dc5a038.179a08"
       ]
     ]
   },
   {
-    "id": "69ada9d9.f9e3c",
+    "id": "8dc5a038.179a08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 772.5666656494141,
-    "y": 335,
-    "z": "8bc654d2.f0dde",
+    "x": 808.5666656494141,
+    "y": 379.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8dd82f3b.b9fa5",
-        "304cbf07.b12f58",
-        "1a3f65b2.521b1a"
+        "9b12be39.ac6768",
+        "27bb57a4.5f987",
+        "2a2da752.b59748"
       ]
     ]
   },
   {
-    "id": "8dd82f3b.b9fa5",
+    "id": "9b12be39.ac6768",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 1073.900161743164,
-    "y": 605.9302978515625,
-    "z": "8bc654d2.f0dde",
+    "x": 1109.900161743164,
+    "y": 650.4969635009766,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "304cbf07.b12f58",
+    "id": "27bb57a4.5f987",
     "type": "save",
     "name": "get service-instance from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
     "comments": "",
     "outputs": 1,
-    "x": 1095.328628540039,
-    "y": 308.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1131.328628540039,
+    "y": 352.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c42506f9.b054",
-        "15d85509.bac5fb",
-        "c693218f.780828"
+        "6a4d10dc.68d4a",
+        "5691a128.aafbf8",
+        "5af1bedf.a7a338"
       ]
     ]
   },
   {
-    "id": "c42506f9.b054",
+    "id": "6a4d10dc.68d4a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1320.328628540039,
-    "y": 166.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1356.328628540039,
+    "y": 210.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c432fa86.b14b18"
+        "80bca2fd.976568"
       ]
     ]
   },
   {
-    "id": "15d85509.bac5fb",
+    "id": "5691a128.aafbf8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1315.819595336914,
-    "y": 235.9073486328125,
-    "z": "8bc654d2.f0dde",
+    "x": 1351.819595336914,
+    "y": 280.47401428222656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c16eebd5.51383"
+        "7f99fec5.4581e"
       ]
     ]
   },
   {
-    "id": "c693218f.780828",
+    "id": "5af1bedf.a7a338",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1304.328628540039,
-    "y": 282.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1340.328628540039,
+    "y": 326.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3a0cbeb0.e80882"
+        "811c97ff.d24ba8"
       ]
     ]
   },
   {
-    "id": "2b8d35c8.ebc05a",
+    "id": "1663aedd.7a50f9",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1074.328628540039,
-    "y": 196.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1110.328628540039,
+    "y": 240.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1a3f65b2.521b1a",
+    "id": "2a2da752.b59748",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 1062.328628540039,
-    "y": 248.33331298828125,
-    "z": "8bc654d2.f0dde",
+    "x": 1098.328628540039,
+    "y": 292.8999786376953,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c432fa86.b14b18",
+    "id": "80bca2fd.976568",
     "type": "switchNode",
     "name": "switch allotted-resources_length != 0",
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1560.566665649414,
-    "y": 163,
-    "z": "8bc654d2.f0dde",
+    "x": 1596.566665649414,
+    "y": 207.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1d921b54.6d01cd",
-        "4b7292d8.462d44"
+        "9eedb337.58df9",
+        "1db64f77.692391"
       ]
     ]
   },
   {
-    "id": "c16eebd5.51383",
+    "id": "7f99fec5.4581e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1470.6290435791016,
-    "y": 238.85977172851562,
-    "z": "8bc654d2.f0dde",
+    "x": 1506.6290435791016,
+    "y": 283.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3a0cbeb0.e80882",
+    "id": "811c97ff.d24ba8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1474.566665649414,
-    "y": 283,
-    "z": "8bc654d2.f0dde",
+    "x": 1510.566665649414,
+    "y": 327.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1d921b54.6d01cd",
+    "id": "9eedb337.58df9",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1765.566665649414,
-    "y": 200,
-    "z": "8bc654d2.f0dde",
+    "x": 1801.566665649414,
+    "y": 244.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e73b29c9.cbd5e8"
+        "e3d32c54.b9a328"
       ]
     ]
   },
   {
-    "id": "4b7292d8.462d44",
+    "id": "1db64f77.692391",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1775.566665649414,
-    "y": 127,
-    "z": "8bc654d2.f0dde",
+    "x": 1811.566665649414,
+    "y": 171.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e73b29c9.cbd5e8",
+    "id": "e3d32c54.b9a328",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1758.566665649414,
-    "y": 275,
-    "z": "8bc654d2.f0dde",
+    "x": 1794.566665649414,
+    "y": 319.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d6fcbbd7.6468b8",
-        "8f5c7a9a.326598",
-        "cd48af2d.929d6",
-        "528e88db.403fc",
-        "899de386.880988"
+        "bb266e42.d64ce8",
+        "33816966.623666",
+        "6367b887.741ef",
+        "a5dc6d6.f390b9",
+        "c617e6ee.8b983"
       ]
     ]
   },
   {
-    "id": "1f336392.1dac3c",
+    "id": "410f1f1c.a0bc8",
     "type": "save",
     "name": "get allotted-resource from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2244.566665649414,
-    "y": 326,
-    "z": "8bc654d2.f0dde",
+    "x": 2280.566665649414,
+    "y": 370.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "923c23f1.638a98",
-        "ba451af8.67c9c8",
-        "2ed7be49.0a7032"
+        "b15d3419.e56af8",
+        "8179030d.1dc9b8",
+        "c175e9c7.17a5f8"
       ]
     ]
   },
   {
-    "id": "923c23f1.638a98",
+    "id": "b15d3419.e56af8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2460.566665649414,
-    "y": 393,
-    "z": "8bc654d2.f0dde",
+    "x": 2496.566665649414,
+    "y": 437.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c090e3a4.ec2058"
+        "e4dfd7bc.ebf1f8"
       ]
     ]
   },
   {
-    "id": "ba451af8.67c9c8",
+    "id": "8179030d.1dc9b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2461.057632446289,
-    "y": 292.573974609375,
-    "z": "8bc654d2.f0dde",
+    "x": 2497.057632446289,
+    "y": 337.14064025878906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4c29ba0c.292a6c"
+        "a4be790d.e1feb"
       ]
     ]
   },
   {
-    "id": "2ed7be49.0a7032",
+    "id": "c175e9c7.17a5f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2456.566665649414,
-    "y": 342,
-    "z": "8bc654d2.f0dde",
+    "x": 2492.566665649414,
+    "y": 386.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f2cd659.3fc4898"
+        "7226e4d.271f21c"
       ]
     ]
   },
   {
-    "id": "d6fcbbd7.6468b8",
+    "id": "bb266e42.d64ce8",
     "type": "for",
     "name": "for each allotted-resource",
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1961.566665649414,
-    "y": 307,
-    "z": "8bc654d2.f0dde",
+    "x": 1997.566665649414,
+    "y": 351.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "419d8708.3b9078",
-        "1f336392.1dac3c",
-        "90827cac.7f3cc8",
-        "e557ce2.09f823"
+        "a610825f.3baab8",
+        "410f1f1c.a0bc8",
+        "5b668059.1f482",
+        "989a0e11.127538"
       ]
     ]
   },
   {
-    "id": "419d8708.3b9078",
+    "id": "a610825f.3baab8",
     "type": "set",
     "name": "set the current allotted-resource-id",
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
     "comments": "",
-    "x": 2241.566665649414,
-    "y": 245,
-    "z": "8bc654d2.f0dde",
+    "x": 2277.566665649414,
+    "y": 289.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "528e88db.403fc",
+    "id": "a5dc6d6.f390b9",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
     "comments": "",
-    "x": 1935.566665649414,
-    "y": 257,
-    "z": "8bc654d2.f0dde",
+    "x": 1971.566665649414,
+    "y": 301.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8f5c7a9a.326598",
+    "id": "33816966.623666",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1978.566665649414,
-    "y": 116,
-    "z": "8bc654d2.f0dde",
+    "x": 2014.566665649414,
+    "y": 160.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "cd48af2d.929d6",
+    "id": "6367b887.741ef",
     "type": "get-resource",
     "name": "get-resource logical-links",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1990.566665649414,
-    "y": 157,
-    "z": "8bc654d2.f0dde",
+    "x": 2026.566665649414,
+    "y": 201.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "73efca11.a03e0c",
+    "id": "bc72be6f.8dc5b",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2015.566665649414,
-    "y": 69,
-    "z": "8bc654d2.f0dde",
+    "x": 2051.566665649414,
+    "y": 113.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "19fb453a.d497cb",
+    "id": "999645ff.8d79f8",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
     "comments": "",
-    "x": 1935.566665649414,
-    "y": 203,
-    "z": "8bc654d2.f0dde",
+    "x": 1971.566665649414,
+    "y": 247.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4c29ba0c.292a6c",
+    "id": "a4be790d.e1feb",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 2639.566665649414,
-    "y": 295,
-    "z": "8bc654d2.f0dde",
+    "x": 2675.566665649414,
+    "y": 339.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f2cd659.3fc4898",
+    "id": "7226e4d.271f21c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2639.504165649414,
-    "y": 344.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 2675.504165649414,
+    "y": 388.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c090e3a4.ec2058",
+    "id": "e4dfd7bc.ebf1f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2641.504165649414,
-    "y": 395.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 2677.504165649414,
+    "y": 439.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "383f413.f1d10be"
+        "4971434.1d7e03c"
       ]
     ]
   },
   {
-    "id": "383f413.f1d10be",
+    "id": "4971434.1d7e03c",
     "type": "save",
     "name": "get allotted-resource relationship from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2934.504165649414,
-    "y": 342.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 2970.504165649414,
+    "y": 386.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7f2204ba.ff0eac",
-        "6593ad3c.c3a94c",
-        "91d5dd73.0552a8"
+        "24e6d7c1.5d2048",
+        "3ed3e5cb.f1266a",
+        "c01f466a.2c59b8"
       ]
     ]
   },
   {
-    "id": "6593ad3c.c3a94c",
+    "id": "3ed3e5cb.f1266a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3237.995101928711,
-    "y": 74.7142333984375,
-    "z": "8bc654d2.f0dde",
+    "x": 3273.995101928711,
+    "y": 119.28089904785156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "578e5a01.301d74"
+        "23469507.c7cb02"
       ]
     ]
   },
   {
-    "id": "578e5a01.301d74",
+    "id": "23469507.c7cb02",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3415.566635131836,
-    "y": 75,
-    "z": "8bc654d2.f0dde",
+    "x": 3451.566635131836,
+    "y": 119.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "91d5dd73.0552a8",
+    "id": "c01f466a.2c59b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3233.504135131836,
-    "y": 124.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3269.504135131836,
+    "y": 168.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3a340bd0.83bde4"
+        "196361cf.857fbe"
       ]
     ]
   },
   {
-    "id": "3a340bd0.83bde4",
+    "id": "196361cf.857fbe",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3415.504135131836,
-    "y": 124.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3451.504135131836,
+    "y": 168.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7f2204ba.ff0eac",
+    "id": "24e6d7c1.5d2048",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3237.504135131836,
-    "y": 175.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3273.504135131836,
+    "y": 219.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5f6b46f2.1bbc28"
+        "51b732b0.20c4ec"
       ]
     ]
   },
   {
-    "id": "5f6b46f2.1bbc28",
+    "id": "51b732b0.20c4ec",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3417.504135131836,
-    "y": 175.1402587890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3453.504135131836,
+    "y": 219.70692443847656,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "432203ff.80791c"
+        "b7af5f8.780582"
       ]
     ]
   },
   {
-    "id": "432203ff.80791c",
+    "id": "b7af5f8.780582",
     "type": "switchNode",
     "name": "switch allotted-resource.relationship-list not empty",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2953.566665649414,
-    "y": 470,
-    "z": "8bc654d2.f0dde",
+    "x": 2989.566665649414,
+    "y": 514.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "25bf5884.d1bc1",
-        "68d7ca3f.b9c4a4"
+        "73dd535b.21de04",
+        "941bba5e.9658d"
       ]
     ]
   },
   {
-    "id": "68d7ca3f.b9c4a4",
+    "id": "941bba5e.9658d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3293.566635131836,
-    "y": 317,
-    "z": "8bc654d2.f0dde",
+    "x": 3329.566635131836,
+    "y": 361.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "25bf5884.d1bc1",
+    "id": "73dd535b.21de04",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3292.566635131836,
-    "y": 371,
-    "z": "8bc654d2.f0dde",
+    "x": 3328.566635131836,
+    "y": 415.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a4256717.8bdab"
+        "33242734.b6ef48"
       ]
     ]
   },
   {
-    "id": "dc3dd60e.e6fb58",
+    "id": "8e081bd8.979208",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4037.566635131836,
-    "y": 325,
-    "z": "8bc654d2.f0dde",
+    "x": 4073.566635131836,
+    "y": 369.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7a99d9c1.cc807"
+        "ce0fbf14.8d016"
       ]
     ]
   },
   {
-    "id": "7a99d9c1.cc807",
+    "id": "ce0fbf14.8d016",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4214.566513061523,
-    "y": 317.9998779296875,
-    "z": "8bc654d2.f0dde",
+    "x": 4250.566513061523,
+    "y": 362.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "54329230.9376a4",
-        "e44ffd73.3caae8"
+        "1a44842.2180c7c",
+        "958a84e8.9fbc48"
       ]
     ]
   },
   {
-    "id": "a4256717.8bdab",
+    "id": "33242734.b6ef48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3456.566635131836,
-    "y": 297,
-    "z": "8bc654d2.f0dde",
+    "x": 3492.566635131836,
+    "y": 341.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ab8d2f4.fb7de5",
-        "6cd92abd.ea602c"
+        "afaee3e0.e6df98",
+        "db5b85f.aeb77f8"
       ]
     ]
   },
   {
-    "id": "ab8d2f4.fb7de5",
+    "id": "afaee3e0.e6df98",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3737.566635131836,
-    "y": 253,
-    "z": "8bc654d2.f0dde",
+    "x": 3773.566635131836,
+    "y": 297.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d2f6d2c1.0cd0b8"
+        "c2880ab0.c73eb"
       ]
     ]
   },
   {
-    "id": "d2f6d2c1.0cd0b8",
+    "id": "c2880ab0.c73eb",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3999.566635131836,
-    "y": 253,
-    "z": "8bc654d2.f0dde",
+    "x": 4035.566635131836,
+    "y": 297.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dc3dd60e.e6fb58"
+        "8e081bd8.979208"
       ]
     ]
   },
   {
-    "id": "54329230.9376a4",
+    "id": "1a44842.2180c7c",
     "type": "set",
     "name": "set the 1st network-policy-id",
     "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 4457.566513061523,
-    "y": 274.9998779296875,
-    "z": "8bc654d2.f0dde",
+    "x": 4493.566513061523,
+    "y": 319.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e44ffd73.3caae8",
+    "id": "958a84e8.9fbc48",
     "type": "save",
     "name": "get network-policy from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
     "comments": "",
     "outputs": 1,
-    "x": 4446.566513061523,
-    "y": 329.9998779296875,
-    "z": "8bc654d2.f0dde",
+    "x": 4482.566513061523,
+    "y": 374.56654357910156,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9db3143c.c20748",
-        "3f90e90d.8c4416",
-        "767c00f3.c60f18"
+        "4710cc76.36ad1c",
+        "efa019b.ed98a68",
+        "b08c41e4.127bd8"
       ]
     ]
   },
   {
-    "id": "767c00f3.c60f18",
+    "id": "b08c41e4.127bd8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4697.566879272461,
-    "y": 271,
-    "z": "8bc654d2.f0dde",
+    "x": 4733.566879272461,
+    "y": 315.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "eb2a7a65.4a99c"
+        "7eb7952c.f46d84"
       ]
     ]
   },
   {
-    "id": "eb2a7a65.4a99c",
+    "id": "7eb7952c.f46d84",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4846.138412475586,
-    "y": 271.2857666015625,
-    "z": "8bc654d2.f0dde",
+    "x": 4882.138412475586,
+    "y": 315.85243225097656,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1d4fa709.d3c2b1",
+    "id": "dd0313dc.1a2988",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4845.075912475586,
-    "y": 315.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4881.075912475586,
+    "y": 359.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3f90e90d.8c4416",
+    "id": "efa019b.ed98a68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4686.075912475586,
-    "y": 315.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4722.075912475586,
+    "y": 359.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1d4fa709.d3c2b1"
+        "dd0313dc.1a2988"
       ]
     ]
   },
   {
-    "id": "9db3143c.c20748",
+    "id": "4710cc76.36ad1c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4693.075912475586,
-    "y": 394.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4729.075912475586,
+    "y": 438.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d725abd1.c0b928"
+        "fbbb1a1a.e2c5b8"
       ]
     ]
   },
   {
-    "id": "d725abd1.c0b928",
+    "id": "fbbb1a1a.e2c5b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4832.075912475586,
-    "y": 394.426025390625,
-    "z": "8bc654d2.f0dde",
+    "x": 4868.075912475586,
+    "y": 438.99269104003906,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "561b0f6d.fce1f8",
-        "8702a1ee.cea5e8"
+        "7a803641.fde268",
+        "6a2b20cd.32701"
       ]
     ]
   },
   {
-    "id": "561b0f6d.fce1f8",
+    "id": "7a803641.fde268",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5037.566879272461,
-    "y": 392,
-    "z": "8bc654d2.f0dde",
+    "x": 5073.566879272461,
+    "y": 436.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8702a1ee.cea5e8",
+    "id": "6a2b20cd.32701",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5036.566879272461,
-    "y": 438,
-    "z": "8bc654d2.f0dde",
+    "x": 5072.566879272461,
+    "y": 482.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6cd92abd.ea602c",
+    "id": "db5b85f.aeb77f8",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3554.566635131836,
-    "y": 369,
-    "z": "8bc654d2.f0dde",
+    "x": 3590.566635131836,
+    "y": 413.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dd91e386.997658"
+        "3d651743.57b188"
       ]
     ]
   },
   {
-    "id": "dd91e386.997658",
+    "id": "3d651743.57b188",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3834.566635131836,
-    "y": 369,
-    "z": "8bc654d2.f0dde",
+    "x": 3870.566635131836,
+    "y": 413.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d0b5ecff.91d928"
+        "823d6ddb.3083e8"
       ]
     ]
   },
   {
-    "id": "d0b5ecff.91d928",
+    "id": "823d6ddb.3083e8",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2217.5667877197266,
-    "y": 782.0001220703125,
-    "z": "8bc654d2.f0dde",
+    "x": 2253.5667877197266,
+    "y": 826.5667877197266,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3175715f.1727f6"
+        "a4f7cdf6.5208e8"
       ]
     ]
   },
   {
-    "id": "3175715f.1727f6",
+    "id": "a4f7cdf6.5208e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2394.566665649414,
-    "y": 775,
-    "z": "8bc654d2.f0dde",
+    "x": 2430.566665649414,
+    "y": 819.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e36efc83.994d78",
-        "41c74306.d5cc9c"
+        "eb8d4808.206a1",
+        "4f79166b.81752"
       ]
     ]
   },
   {
-    "id": "e36efc83.994d78",
+    "id": "eb8d4808.206a1",
     "type": "set",
     "name": "set the current logical-link-name",
     "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 2637.566665649414,
-    "y": 732,
-    "z": "8bc654d2.f0dde",
+    "x": 2673.566665649414,
+    "y": 776.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "41c74306.d5cc9c",
+    "id": "4f79166b.81752",
     "type": "save",
     "name": "get logical-link from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
     "comments": "",
     "outputs": 1,
-    "x": 2626.566665649414,
-    "y": 787,
-    "z": "8bc654d2.f0dde",
+    "x": 2662.566665649414,
+    "y": 831.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9d68f10f.bd8b8",
-        "dffb55fa.85b55",
-        "c53e6e84.05ac9"
+        "62989b79.9cfe9c",
+        "1988a7a4.ff123",
+        "85413e7a.b1b628"
       ]
     ]
   },
   {
-    "id": "9d68f10f.bd8b8",
+    "id": "62989b79.9cfe9c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2918.057632446289,
-    "y": 765.573974609375,
-    "z": "8bc654d2.f0dde",
+    "x": 2954.057632446289,
+    "y": 810.1406402587891,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b9d2eb35.931cc8"
+        "f822b8e9.269d"
       ]
     ]
   },
   {
-    "id": "dffb55fa.85b55",
+    "id": "1988a7a4.ff123",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2906.566665649414,
-    "y": 810,
-    "z": "8bc654d2.f0dde",
+    "x": 2942.566665649414,
+    "y": 854.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e6924452.e6205"
+        "b1dab01.deaad5"
       ]
     ]
   },
   {
-    "id": "b9d2eb35.931cc8",
+    "id": "f822b8e9.269d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3066.629165649414,
-    "y": 765.8597412109375,
-    "z": "8bc654d2.f0dde",
+    "x": 3102.629165649414,
+    "y": 810.4264068603516,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e6924452.e6205",
+    "id": "b1dab01.deaad5",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3065.566665649414,
-    "y": 810,
-    "z": "8bc654d2.f0dde",
+    "x": 3101.566665649414,
+    "y": 854.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c53e6e84.05ac9",
+    "id": "85413e7a.b1b628",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2913.566665649414,
-    "y": 889,
-    "z": "8bc654d2.f0dde",
+    "x": 2949.566665649414,
+    "y": 933.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "361f88a3.058c08"
+        "fb178b5b.3c4ae8"
       ]
     ]
   },
   {
-    "id": "361f88a3.058c08",
+    "id": "fb178b5b.3c4ae8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3052.566665649414,
-    "y": 889,
-    "z": "8bc654d2.f0dde",
+    "x": 3088.566665649414,
+    "y": 933.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "936c7f50.057838",
-        "fff97b6b.1650f8",
-        "40c59221.de8304",
-        "da2087d.3780d78",
-        "db5a893f.6acb2",
-        "855375ef.856b78",
-        "bd585daa.5b0d3",
-        "d3754757.4f2538",
-        "dd28e890.6f37f",
-        "10147ab3.fed6fd",
-        "425867c4.b0a9",
-        "e3e1a44c.9927b8",
-        "4a62d4e.fca9aac",
-        "2ae40328.466974",
-        "f71bee39.3d2f68",
-        "6cb3b80a.d81b1",
-        "7411f30.15b1c8c",
-        "59ced5c4.1cbb54",
-        "b2338e3d.f752e8",
-        "8b07e19d.5f94",
-        "877b276.88c73d8"
+        "e94ce0e6.cdcf4",
+        "2a0a2d05.627212",
+        "2d29cc30.4d633c",
+        "8255fb50.a7b88",
+        "ea28bb0a.303ea8",
+        "4b5b0bf9.d92b04",
+        "42798389.0acfb4",
+        "29a6af57.132c2",
+        "18652387.ef4d1c",
+        "c49ed897.0159e8",
+        "9d2ec307.fb07b8",
+        "c81a19d9.9b256",
+        "b5b402c1.c35e88",
+        "84774758.102ed8",
+        "17e6527f.ea49de",
+        "c22e8ab9.0a6b88",
+        "647f2e19.e50158",
+        "9c75cfb6.9dae68",
+        "9a8ce081.e6446",
+        "c989c621.8b708",
+        "88b89d66.20648"
       ]
     ]
   },
   {
-    "id": "b5bad4b9.685ad8",
+    "id": "31581a8c.76364e",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3401.566665649414,
-    "y": 422.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3437.566665649414,
+    "y": 467.56663513183594,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "936c7f50.057838",
+    "id": "e94ce0e6.cdcf4",
     "type": "execute",
     "name": "execute UUID generator for otn-tunnel-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3382.566604614258,
-    "y": 501.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3418.566604614258,
+    "y": 546.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "2ae40328.466974",
+    "id": "84774758.102ed8",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 3339.566604614258,
-    "y": 546.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3375.566604614258,
+    "y": 591.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fff97b6b.1650f8",
+    "id": "2a0a2d05.627212",
     "type": "set",
     "name": "set network-route-one",
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
     "comments": "",
-    "x": 3304.566635131836,
-    "y": 600.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3340.566635131836,
+    "y": 645.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "40c59221.de8304",
+    "id": "2d29cc30.4d633c",
     "type": "set",
     "name": "set network-route-two",
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
     "comments": "",
-    "x": 3305.566635131836,
-    "y": 655.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3341.566635131836,
+    "y": 700.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "da2087d.3780d78",
+    "id": "8255fb50.a7b88",
     "type": "save",
     "name": "get network-route-one from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
     "comments": "",
     "outputs": 1,
-    "x": 3303.566635131836,
-    "y": 919.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3339.566635131836,
+    "y": 964.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "969278b.6dcd308",
-        "8ef50320.33a2f",
-        "bc9f501b.616458"
+        "bc9dba3e.42915",
+        "4ccb40e3.75eb",
+        "6e77d52e.d49a5c"
       ]
     ]
   },
   {
-    "id": "db5a893f.6acb2",
+    "id": "ea28bb0a.303ea8",
     "type": "save",
     "name": "get network-route-two from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
     "comments": "",
     "outputs": 1,
-    "x": 3298.566635131836,
-    "y": 980.9998474121094,
-    "z": "8bc654d2.f0dde",
+    "x": 3334.566635131836,
+    "y": 1025.5665130615234,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3f6dc76b.2c189",
-        "8fe533b.8ccffd",
-        "17823dcb.715f8a"
+        "ddf0ef9b.af495",
+        "d012a2e6.7e886",
+        "c732ba74.e6ac38"
       ]
     ]
   },
   {
-    "id": "969278b.6dcd308",
+    "id": "bc9dba3e.42915",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3614.566635131836,
-    "y": 690.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3650.566635131836,
+    "y": 735.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9ca5fa1b.024df8"
+        "d26a86c.70f36f8"
       ]
     ]
   },
   {
-    "id": "8ef50320.33a2f",
+    "id": "4ccb40e3.75eb",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3610.075668334961,
-    "y": 740.4259948730469,
-    "z": "8bc654d2.f0dde",
+    "x": 3646.075668334961,
+    "y": 784.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e39d355.b4f33c8"
+        "3592fdd4.1e4502"
       ]
     ]
   },
   {
-    "id": "bc9f501b.616458",
+    "id": "6e77d52e.d49a5c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3614.075668334961,
-    "y": 793.4259948730469,
-    "z": "8bc654d2.f0dde",
+    "x": 3650.075668334961,
+    "y": 837.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e84899ba.db50e8"
+        "f6681e1c.b1626"
       ]
     ]
   },
   {
-    "id": "9ca5fa1b.024df8",
+    "id": "d26a86c.70f36f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3763.138168334961,
-    "y": 690.2857360839844,
-    "z": "8bc654d2.f0dde",
+    "x": 3799.138168334961,
+    "y": 734.8524017333984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e39d355.b4f33c8",
+    "id": "3592fdd4.1e4502",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3753.075668334961,
-    "y": 740.4259948730469,
-    "z": "8bc654d2.f0dde",
+    "x": 3789.075668334961,
+    "y": 784.9926605224609,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3f6dc76b.2c189",
+    "id": "ddf0ef9b.af495",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3576.566604614258,
-    "y": 880.9998168945312,
-    "z": "8bc654d2.f0dde",
+    "x": 3612.566604614258,
+    "y": 925.5664825439453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "62e0b7bc.37a4e"
+        "275632fb.e09a86"
       ]
     ]
   },
   {
-    "id": "8fe533b.8ccffd",
+    "id": "d012a2e6.7e886",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3572.075668334961,
-    "y": 923.4258728027344,
-    "z": "8bc654d2.f0dde",
+    "x": 3608.075668334961,
+    "y": 967.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ac864505.12601"
+        "984e984a.f448c8"
       ]
     ]
   },
   {
-    "id": "17823dcb.715f8a",
+    "id": "c732ba74.e6ac38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3573.075668334961,
-    "y": 976.4258728027344,
-    "z": "8bc654d2.f0dde",
+    "x": 3609.075668334961,
+    "y": 1020.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bed44813.048dd"
+        "2eeb8181.d4367e"
       ]
     ]
   },
   {
-    "id": "62e0b7bc.37a4e",
+    "id": "275632fb.e09a86",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3725.138137817383,
-    "y": 880.2855834960938,
-    "z": "8bc654d2.f0dde",
+    "x": 3761.138137817383,
+    "y": 924.8522491455078,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ac864505.12601",
+    "id": "984e984a.f448c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3715.075668334961,
-    "y": 923.4258728027344,
-    "z": "8bc654d2.f0dde",
+    "x": 3751.075668334961,
+    "y": 967.9925384521484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e84899ba.db50e8",
+    "id": "f6681e1c.b1626",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3775.566635131836,
-    "y": 792.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3811.566635131836,
+    "y": 837.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f9db2337.8fb9d"
+        "caab91f.12177f"
       ]
     ]
   },
   {
-    "id": "bed44813.048dd",
+    "id": "2eeb8181.d4367e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3726.566635131836,
-    "y": 975.9998474121094,
-    "z": "8bc654d2.f0dde",
+    "x": 3762.566635131836,
+    "y": 1020.5665130615234,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "423a02cf.14e434"
+        "9eb76f3a.cfcbd8"
       ]
     ]
   },
   {
-    "id": "f9db2337.8fb9d",
+    "id": "caab91f.12177f",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3950.566635131836,
-    "y": 766.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3986.566635131836,
+    "y": 811.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2c035f93.775ae8",
-        "a1971f98.6ccb48",
-        "dd62b4eb.26fb1"
+        "2172bcb.4fd5b44",
+        "c6b4aa53.9764a8",
+        "fbdccf10.5fabc"
       ]
     ]
   },
   {
-    "id": "423a02cf.14e434",
+    "id": "9eb76f3a.cfcbd8",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3910.566635131836,
-    "y": 883.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3946.566635131836,
+    "y": 928.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9f546ca0.9d33e8",
-        "2ec96d4e.1ca132",
-        "cb966d3f.bcf358"
+        "572a469b.71d458",
+        "b8b0db7f.0d0b98",
+        "56529717.d57cf"
       ]
     ]
   },
   {
-    "id": "2c035f93.775ae8",
+    "id": "2172bcb.4fd5b44",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4072.566635131836,
-    "y": 551.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4108.566635131836,
+    "y": 596.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6429cd23.35e7c4"
+        "b34792b6.2f84b"
       ]
     ]
   },
   {
-    "id": "a1971f98.6ccb48",
+    "id": "c6b4aa53.9764a8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4074.566635131836,
-    "y": 605.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4110.566635131836,
+    "y": 650.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "17c9fbf5.2a0a34"
+        "8791b1f2.9fddd"
       ]
     ]
   },
   {
-    "id": "9f546ca0.9d33e8",
+    "id": "572a469b.71d458",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4091.566665649414,
-    "y": 822,
-    "z": "8bc654d2.f0dde",
+    "x": 4127.566665649414,
+    "y": 866.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "22d232ad.fa9d6e"
+        "2e043645.b8ff02"
       ]
     ]
   },
   {
-    "id": "2ec96d4e.1ca132",
+    "id": "b8b0db7f.0d0b98",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4093.566665649414,
-    "y": 876,
-    "z": "8bc654d2.f0dde",
+    "x": 4129.566665649414,
+    "y": 920.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5c001c7.14606e4"
+        "8eeda316.6df7"
       ]
     ]
   },
   {
-    "id": "d98ccbbe.37e04",
+    "id": "9e47fb61.f661c8",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4382.566635131836,
-    "y": 503.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4418.566635131836,
+    "y": 548.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "449eb720.722948",
+    "id": "21b58670.3a1192",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4375.566635131836,
-    "y": 601.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4411.566635131836,
+    "y": 646.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "83bfbc5.ae6994",
+    "id": "d0dd5f40.4b5f38",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4393.566665649414,
-    "y": 795,
-    "z": "8bc654d2.f0dde",
+    "x": 4429.566665649414,
+    "y": 839.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5244a859.c728e8",
+    "id": "d70d7c37.e21f5",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4397.566665649414,
-    "y": 888,
-    "z": "8bc654d2.f0dde",
+    "x": 4433.566665649414,
+    "y": 932.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6ca3f458.2d99d4",
+    "id": "a539fdfb.953e38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3540.566665649414,
-    "y": 1560,
-    "z": "8bc654d2.f0dde",
+    "x": 3576.566665649414,
+    "y": 1604.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3eea4372.1c5814"
+        "7f7f51c3.cfe0e"
       ]
     ]
   },
   {
-    "id": "662947db.2b96e8",
+    "id": "a32c9d1e.59f95",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3550.057632446289,
-    "y": 1602.5740356445312,
-    "z": "8bc654d2.f0dde",
+    "x": 3586.057632446289,
+    "y": 1647.1407012939453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f28295e0.d2c148"
+        "ea2bacf1.80819"
       ]
     ]
   },
   {
-    "id": "5677884d.d93c78",
+    "id": "fb2990eb.3d37b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3538.566665649414,
-    "y": 1649,
-    "z": "8bc654d2.f0dde",
+    "x": 3574.566665649414,
+    "y": 1693.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f900f622.22fda"
+        "495659dd.a8b668"
       ]
     ]
   },
   {
-    "id": "eddb7de7.123d5",
+    "id": "c88f575a.f847c",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3240.566665649414,
-    "y": 1522,
-    "z": "8bc654d2.f0dde",
+    "x": 3276.566665649414,
+    "y": 1566.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "bd585daa.5b0d3",
+    "id": "42798389.0acfb4",
     "type": "save",
     "name": "get p-interface-src from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3283.566665649414,
-    "y": 1587,
-    "z": "8bc654d2.f0dde",
+    "x": 3319.566665649414,
+    "y": 1631.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6ca3f458.2d99d4",
-        "662947db.2b96e8",
-        "5677884d.d93c78"
+        "a539fdfb.953e38",
+        "a32c9d1e.59f95",
+        "fb2990eb.3d37b8"
       ]
     ]
   },
   {
-    "id": "855375ef.856b78",
+    "id": "4b5b0bf9.d92b04",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3284.566665649414,
-    "y": 1257,
-    "z": "8bc654d2.f0dde",
+    "x": 3320.566665649414,
+    "y": 1301.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "74d070ad.2d8b38",
-        "f1856675.64f168"
+        "7927223e.403f8c",
+        "cb61ec61.ad89d"
       ]
     ]
   },
   {
-    "id": "f1856675.64f168",
+    "id": "cb61ec61.ad89d",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3505.566635131836,
-    "y": 1309.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3541.566635131836,
+    "y": 1354.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "77f0bbcf.b75e0c"
+        "b9b2d4da.80c098"
       ]
     ]
   },
   {
-    "id": "74d070ad.2d8b38",
+    "id": "7927223e.403f8c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3507.566635131836,
-    "y": 1342.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3543.566635131836,
+    "y": 1387.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6e268d43.53f934"
+        "3bca8d9d.c75392"
       ]
     ]
   },
   {
-    "id": "3eea4372.1c5814",
+    "id": "7f7f51c3.cfe0e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3713.233169555664,
-    "y": 1559,
-    "z": "8bc654d2.f0dde",
+    "x": 3749.233169555664,
+    "y": 1603.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f48e6ddf.17618",
-        "cc30c632.26f008"
+        "f7adce7b.f663c8",
+        "aab5a13f.7b9228"
       ]
     ]
   },
   {
-    "id": "f28295e0.d2c148",
+    "id": "ea2bacf1.80819",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3703.6290435791016,
-    "y": 1605.8597717285156,
-    "z": "8bc654d2.f0dde",
+    "x": 3739.6290435791016,
+    "y": 1650.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f900f622.22fda",
+    "id": "495659dd.a8b668",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3707.566665649414,
-    "y": 1650,
-    "z": "8bc654d2.f0dde",
+    "x": 3743.566665649414,
+    "y": 1694.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f48e6ddf.17618",
+    "id": "f7adce7b.f663c8",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3977.566665649414,
-    "y": 1543,
-    "z": "8bc654d2.f0dde",
+    "x": 4013.566665649414,
+    "y": 1587.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c31fbd4a.4c152",
-        "ca57bc98.e008f"
+        "eba55ae6.b47008",
+        "a5049a4a.932988"
       ]
     ]
   },
   {
-    "id": "ca57bc98.e008f",
+    "id": "a5049a4a.932988",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4200.566665649414,
-    "y": 1498,
-    "z": "8bc654d2.f0dde",
+    "x": 4236.566665649414,
+    "y": 1542.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ae27226e.c1211"
+        "b0af1c9f.1d33f"
       ]
     ]
   },
   {
-    "id": "c31fbd4a.4c152",
+    "id": "eba55ae6.b47008",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4202.566665649414,
-    "y": 1562,
-    "z": "8bc654d2.f0dde",
+    "x": 4238.566665649414,
+    "y": 1606.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "48b6888c.1688c8"
+        "3044898a.b774b6"
       ]
     ]
   },
   {
-    "id": "48b6888c.1688c8",
+    "id": "3044898a.b774b6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4364.566665649414,
-    "y": 1558,
-    "z": "8bc654d2.f0dde",
+    "x": 4400.566665649414,
+    "y": 1602.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ae27226e.c1211",
+    "id": "b0af1c9f.1d33f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4365.566665649414,
-    "y": 1495,
-    "z": "8bc654d2.f0dde",
+    "x": 4401.566665649414,
+    "y": 1539.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dc9805ea.b1d968",
-        "e17a88a7.3a0c68"
+        "3cd7ef1e.9f6f38",
+        "782ad12.44a143"
       ]
     ]
   },
   {
-    "id": "6e268d43.53f934",
+    "id": "3bca8d9d.c75392",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3650.566635131836,
-    "y": 1339.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3686.566635131836,
+    "y": 1384.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "77f0bbcf.b75e0c",
+    "id": "b9b2d4da.80c098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3653.566635131836,
-    "y": 1302.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3689.566635131836,
+    "y": 1347.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6b41cb54.146c7c",
-        "2227088d.da8978"
+        "2e849446.924674",
+        "15f06507.bc03a3"
       ]
     ]
   },
   {
-    "id": "6b41cb54.146c7c",
+    "id": "2e849446.924674",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3827.566635131836,
-    "y": 1258.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3863.566635131836,
+    "y": 1303.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cc30c632.26f008",
+    "id": "aab5a13f.7b9228",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3926.566635131836,
-    "y": 1652.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3962.566635131836,
+    "y": 1697.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4c51d8d9.7e50e"
+        "7f3dbf41.0b7cb"
       ]
     ]
   },
   {
-    "id": "4c51d8d9.7e50e",
+    "id": "7f3dbf41.0b7cb",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4132.566635131836,
-    "y": 1652.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4168.566635131836,
+    "y": 1697.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ea6dd5aa.f54cc"
+        "33161afe.bf5fb6"
       ]
     ]
   },
   {
-    "id": "ea6dd5aa.f54cc",
+    "id": "33161afe.bf5fb6",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4347.852279663086,
-    "y": 1652.8217468261719,
-    "z": "8bc654d2.f0dde",
+    "x": 4383.852279663086,
+    "y": 1697.388412475586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "878f0a88.cc7f28"
+        "d1f5e6bd.d6c388"
       ]
     ]
   },
   {
-    "id": "2227088d.da8978",
+    "id": "15f06507.bc03a3",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3842.566635131836,
-    "y": 1369.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3878.566635131836,
+    "y": 1414.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a1b22fed.dd46f",
-        "39006ff3.e4d42",
-        "90a88d63.a0deb"
+        "609f91e1.96d3c",
+        "c5dd830a.81bd98",
+        "f762b67a.3d2c8"
       ]
     ]
   },
   {
-    "id": "a1b22fed.dd46f",
+    "id": "609f91e1.96d3c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4038.0667572021484,
-    "y": 1321.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4074.0667572021484,
+    "y": 1366.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "11cc8b93.732e94"
+        "964976f5.819d98"
       ]
     ]
   },
   {
-    "id": "39006ff3.e4d42",
+    "id": "c5dd830a.81bd98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4030.0667572021484,
-    "y": 1376.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4066.0667572021484,
+    "y": 1421.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dc84c818.c1238"
+        "bf5b62.bbb734a"
       ]
     ]
   },
   {
-    "id": "90a88d63.a0deb",
+    "id": "f762b67a.3d2c8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4035.0667572021484,
-    "y": 1433.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4071.0667572021484,
+    "y": 1478.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5b4aec5c.78ea6c"
+        "bc48235e.ca1af8"
       ]
     ]
   },
   {
-    "id": "5b4aec5c.78ea6c",
+    "id": "bc48235e.ca1af8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4187.066757202148,
-    "y": 1434.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4223.066757202148,
+    "y": 1479.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "dc84c818.c1238",
+    "id": "bf5b62.bbb734a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4198.066757202148,
-    "y": 1379.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4234.066757202148,
+    "y": 1424.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "11cc8b93.732e94",
+    "id": "964976f5.819d98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4182.449081420898,
-    "y": 1319.6556396484375,
-    "z": "8bc654d2.f0dde",
+    "x": 4218.449081420898,
+    "y": 1364.2223052978516,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3dd6ac8d.e6d824"
+        "242018b6.f49c88"
       ]
     ]
   },
   {
-    "id": "3dd6ac8d.e6d824",
+    "id": "242018b6.f49c88",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4366.566635131836,
-    "y": 1333.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4402.566635131836,
+    "y": 1378.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2c6d0561.1001da"
+        "fc08eb6a.2320e"
       ]
     ]
   },
   {
-    "id": "e17a88a7.3a0c68",
+    "id": "782ad12.44a143",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
     "comments": "",
-    "x": 4535.566665649414,
-    "y": 1453,
-    "z": "8bc654d2.f0dde",
+    "x": 4571.566665649414,
+    "y": 1497.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "dc9805ea.b1d968",
+    "id": "3cd7ef1e.9f6f38",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
     "comments": "",
-    "x": 4536.566665649414,
-    "y": 1561,
-    "z": "8bc654d2.f0dde",
+    "x": 4572.566665649414,
+    "y": 1605.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4eccdb3c.a00b8c",
+    "id": "9dc8c404.7ec36",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4537.566665649414,
-    "y": 1510,
-    "z": "8bc654d2.f0dde",
+    "x": 4573.566665649414,
+    "y": 1554.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "878f0a88.cc7f28",
+    "id": "d1f5e6bd.d6c388",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4554.683822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4590.683822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a6df4a7c.6d4298",
-        "e55c6491.d1cf5",
-        "7eb455b8.997c94"
+        "333e33dc.560624",
+        "7db36be0.62778c",
+        "5d7040fa.99ac2"
       ]
     ]
   },
   {
-    "id": "a6df4a7c.6d4298",
+    "id": "333e33dc.560624",
     "type": "set",
     "name": "set source ttp-id",
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4769.683822631836,
-    "y": 1615.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4805.683822631836,
+    "y": 1659.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e55c6491.d1cf5",
+    "id": "7db36be0.62778c",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4766.683822631836,
-    "y": 1654.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4802.683822631836,
+    "y": 1698.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5121fcc7.d1555c"
+        "2d9a4fac.ae36b8"
       ]
     ]
   },
   {
-    "id": "7eb455b8.997c94",
+    "id": "5d7040fa.99ac2",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4722.183822631836,
-    "y": 1696.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4758.183822631836,
+    "y": 1740.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5121fcc7.d1555c",
+    "id": "2d9a4fac.ae36b8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4947.183822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 4983.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dcdffb31.a68748"
+        "a4ece740.b4105"
       ]
     ]
   },
   {
-    "id": "ee290dd7.3447b8",
+    "id": "52e1d551.a483dc",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4766.566665649414,
-    "y": 1271,
-    "z": "8bc654d2.f0dde",
+    "x": 4802.566665649414,
+    "y": 1315.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f5c3f7a5.0472d8"
+        "7de9311.18a165"
       ]
     ]
   },
   {
-    "id": "f5c3f7a5.0472d8",
+    "id": "7de9311.18a165",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4943.566665649414,
-    "y": 1263,
-    "z": "8bc654d2.f0dde",
+    "x": 4979.566665649414,
+    "y": 1307.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "92327400.5b0ea",
-        "7dac197a.3be828"
+        "fff1a40e.199ba",
+        "7abb7683.fa5358"
       ]
     ]
   },
   {
-    "id": "2c6d0561.1001da",
+    "id": "fc08eb6a.2320e",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4561.566635131836,
-    "y": 1333.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4597.566635131836,
+    "y": 1378.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ee290dd7.3447b8",
-        "97637af.969a388"
+        "52e1d551.a483dc",
+        "6d2d083c.e53ec8"
       ]
     ]
   },
   {
-    "id": "97637af.969a388",
+    "id": "6d2d083c.e53ec8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4769.566665649414,
-    "y": 1345,
-    "z": "8bc654d2.f0dde",
+    "x": 4805.566665649414,
+    "y": 1389.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2b94ab82.f6af74"
+        "b42cfcde.f4ebc8"
       ]
     ]
   },
   {
-    "id": "2b94ab82.f6af74",
+    "id": "b42cfcde.f4ebc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4946.566665649414,
-    "y": 1337,
-    "z": "8bc654d2.f0dde",
+    "x": 4982.566665649414,
+    "y": 1381.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a745e5da.a32578"
+        "e8e280e3.a65e5"
       ]
     ]
   },
   {
-    "id": "dcdffb31.a68748",
+    "id": "a4ece740.b4105",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5105.183822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 5141.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f0d23e06.a32c6"
+        "425d708e.783968"
       ]
     ]
   },
   {
-    "id": "f0d23e06.a32c6",
+    "id": "425d708e.783968",
     "type": "set",
     "name": "set source tunnel tp ip",
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5312.183822631836,
-    "y": 1653.3403015136719,
-    "z": "8bc654d2.f0dde",
+    "x": 5348.183822631836,
+    "y": 1697.906967163086,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7dac197a.3be828",
+    "id": "7abb7683.fa5358",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5151.566665649414,
-    "y": 1270,
-    "z": "8bc654d2.f0dde",
+    "x": 5187.566665649414,
+    "y": 1314.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "36ef2efb.214b2a",
-        "a6a3aa1c.6f7288",
-        "f4089fab.088a2"
+        "45403a46.69b7f4",
+        "ab6bed09.5e53d",
+        "1ce7c845.052f38"
       ]
     ]
   },
   {
-    "id": "92327400.5b0ea",
+    "id": "fff1a40e.199ba",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainA id",
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5181.566665649414,
-    "y": 1218,
-    "z": "8bc654d2.f0dde",
+    "x": 5217.566665649414,
+    "y": 1262.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "36ef2efb.214b2a",
+    "id": "45403a46.69b7f4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5361.566665649414,
-    "y": 1261,
-    "z": "8bc654d2.f0dde",
+    "x": 5397.566665649414,
+    "y": 1305.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8d49602b.5cbbb8"
+        "f2e23e54.aa63c8"
       ]
     ]
   },
   {
-    "id": "a6a3aa1c.6f7288",
+    "id": "ab6bed09.5e53d",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5353.566665649414,
-    "y": 1316,
-    "z": "8bc654d2.f0dde",
+    "x": 5389.566665649414,
+    "y": 1360.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2502bb8.26e4744"
+        "29b1e9b9.e1584e"
       ]
     ]
   },
   {
-    "id": "f4089fab.088a2",
+    "id": "1ce7c845.052f38",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5358.566665649414,
-    "y": 1373,
-    "z": "8bc654d2.f0dde",
+    "x": 5394.566665649414,
+    "y": 1417.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "192598bd.b5d887"
+        "26b11425.c22444"
       ]
     ]
   },
   {
-    "id": "192598bd.b5d887",
+    "id": "26b11425.c22444",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5510.566665649414,
-    "y": 1374,
-    "z": "8bc654d2.f0dde",
+    "x": 5546.566665649414,
+    "y": 1418.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "2502bb8.26e4744",
+    "id": "29b1e9b9.e1584e",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5521.566665649414,
-    "y": 1319,
-    "z": "8bc654d2.f0dde",
+    "x": 5557.566665649414,
+    "y": 1363.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8d49602b.5cbbb8",
+    "id": "f2e23e54.aa63c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5505.948989868164,
-    "y": 1258.6556701660156,
-    "z": "8bc654d2.f0dde",
+    "x": 5541.948989868164,
+    "y": 1303.2223358154297,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "34dd56c8.a561f2"
+        "a969095b.c118"
       ]
     ]
   },
   {
-    "id": "a745e5da.a32578",
+    "id": "e8e280e3.a65e5",
     "type": "set",
     "name": "set domainA ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5181.566665649414,
-    "y": 1461,
-    "z": "8bc654d2.f0dde",
+    "x": 5217.566665649414,
+    "y": 1505.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "34dd56c8.a561f2",
+    "id": "a969095b.c118",
     "type": "set",
     "name": "set controller domainA data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5720.566665649414,
-    "y": 1255,
-    "z": "8bc654d2.f0dde",
+    "x": 5756.566665649414,
+    "y": 1299.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9cc65469.2e5488",
+    "id": "3c38a36b.8cf1d4",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4370.566635131836,
-    "y": 539.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4406.566635131836,
+    "y": 584.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "bae36160.d0fbc",
+    "id": "66912289.29f5fc",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4361.566635131836,
-    "y": 637.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4397.566635131836,
+    "y": 682.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6429cd23.35e7c4",
+    "id": "b34792b6.2f84b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4195.566635131836,
-    "y": 545.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4231.566635131836,
+    "y": 590.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d98ccbbe.37e04",
-        "9cc65469.2e5488"
+        "9e47fb61.f661c8",
+        "3c38a36b.8cf1d4"
       ]
     ]
   },
   {
-    "id": "17c9fbf5.2a0a34",
+    "id": "8791b1f2.9fddd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4201.566635131836,
-    "y": 609.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4237.566635131836,
+    "y": 654.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "449eb720.722948",
-        "bae36160.d0fbc"
+        "21b58670.3a1192",
+        "66912289.29f5fc"
       ]
     ]
   },
   {
-    "id": "22d232ad.fa9d6e",
+    "id": "2e043645.b8ff02",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4219.566665649414,
-    "y": 822,
-    "z": "8bc654d2.f0dde",
+    "x": 4255.566665649414,
+    "y": 866.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "83bfbc5.ae6994",
-        "7c60504e.d38f7"
+        "d0dd5f40.4b5f38",
+        "fac3c269.3e8818"
       ]
     ]
   },
   {
-    "id": "5c001c7.14606e4",
+    "id": "8eeda316.6df7",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4222.566665649414,
-    "y": 875,
-    "z": "8bc654d2.f0dde",
+    "x": 4258.566665649414,
+    "y": 919.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5244a859.c728e8",
-        "9835c9a0.4caf78"
+        "d70d7c37.e21f5",
+        "d978bf81.a682c8"
       ]
     ]
   },
   {
-    "id": "7c60504e.d38f7",
+    "id": "fac3c269.3e8818",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4379.566665649414,
-    "y": 835,
-    "z": "8bc654d2.f0dde",
+    "x": 4415.566665649414,
+    "y": 879.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9835c9a0.4caf78",
+    "id": "d978bf81.a682c8",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4382.566665649414,
-    "y": 926,
-    "z": "8bc654d2.f0dde",
+    "x": 4418.566665649414,
+    "y": 970.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c2220864.024798",
+    "id": "98a290a7.380a3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3674.566635131836,
-    "y": 2052.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3710.566635131836,
+    "y": 2097.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b80ff39a.5788d",
-        "d5ffb970.fa1968"
+        "e497858e.0123a",
+        "498e60f5.55f178"
       ]
     ]
   },
   {
-    "id": "db8ae4f9.347f",
+    "id": "7f085da3.5b6764",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3501.900131225586,
-    "y": 2053.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3537.900131225586,
+    "y": 2098.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c2220864.024798"
+        "98a290a7.380a3"
       ]
     ]
   },
   {
-    "id": "4d1c7431.f53f04",
+    "id": "92e1b5b8.c9d748",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511.391098022461,
-    "y": 2096.574005126953,
-    "z": "8bc654d2.f0dde",
+    "x": 3547.391098022461,
+    "y": 2141.140670776367,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c720d68c.d6ef88"
+        "b56c748b.ef0b98"
       ]
     ]
   },
   {
-    "id": "f027027b.1605f8",
+    "id": "67d077ec.f8e2b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3499.900131225586,
-    "y": 2142.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3535.900131225586,
+    "y": 2187.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "174ecc35.cb4194"
+        "531aab62.3c8d74"
       ]
     ]
   },
   {
-    "id": "c720d68c.d6ef88",
+    "id": "b56c748b.ef0b98",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3664.9625091552734,
-    "y": 2099.8597412109375,
-    "z": "8bc654d2.f0dde",
+    "x": 3700.9625091552734,
+    "y": 2144.4264068603516,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "174ecc35.cb4194",
+    "id": "531aab62.3c8d74",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3668.900131225586,
-    "y": 2143.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3704.900131225586,
+    "y": 2188.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b80ff39a.5788d",
+    "id": "e497858e.0123a",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3960.900131225586,
-    "y": 2057.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 3996.900131225586,
+    "y": 2101.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f5a758df.e8e0d8",
-        "83d46017.2ef77"
+        "f5003287.c43b28",
+        "e21b6e0c.643e48"
       ]
     ]
   },
   {
-    "id": "83d46017.2ef77",
+    "id": "e21b6e0c.643e48",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4183.900131225586,
-    "y": 2012.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4219.900131225586,
+    "y": 2056.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "128bbd7c.ee7803"
+        "1c25bfa5.0e84a8"
       ]
     ]
   },
   {
-    "id": "f5a758df.e8e0d8",
+    "id": "f5003287.c43b28",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4185.900131225586,
-    "y": 2076.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4221.900131225586,
+    "y": 2120.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7922a686.9432f8"
+        "9df0e8d3.70e7b"
       ]
     ]
   },
   {
-    "id": "7922a686.9432f8",
+    "id": "9df0e8d3.70e7b",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4344.900131225586,
-    "y": 2095.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4380.900131225586,
+    "y": 2139.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "128bbd7c.ee7803",
+    "id": "1c25bfa5.0e84a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4348.900131225586,
-    "y": 2009.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4384.900131225586,
+    "y": 2053.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ecc94bdb.36f218",
-        "70d8643e.5fc584"
+        "15645f19.451cd9",
+        "5b635208.85addc"
       ]
     ]
   },
   {
-    "id": "dd28e890.6f37f",
+    "id": "18652387.ef4d1c",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3273.900131225586,
-    "y": 2088.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 3309.900131225586,
+    "y": 2133.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "db8ae4f9.347f",
-        "4d1c7431.f53f04",
-        "f027027b.1605f8"
+        "7f085da3.5b6764",
+        "92e1b5b8.c9d748",
+        "67d077ec.f8e2b8"
       ]
     ]
   },
   {
-    "id": "6cb9de7.531902",
+    "id": "8fa3650.6227a18",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3234.900131225586,
-    "y": 2032.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3270.900131225586,
+    "y": 2077.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d3754757.4f2538",
+    "id": "29a6af57.132c2",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3293.900131225586,
-    "y": 1828.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3329.900131225586,
+    "y": 1873.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c926dd8a.c40d78",
-        "b866a3cd.1307c8"
+        "7f4e16fd.13b25",
+        "9c29704e.b9eca8"
       ]
     ]
   },
   {
-    "id": "b866a3cd.1307c8",
+    "id": "9c29704e.b9eca8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3516.900131225586,
-    "y": 1814.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3552.900131225586,
+    "y": 1859.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "963b51c2.5c60a8"
+        "bb1e4e57.280888"
       ]
     ]
   },
   {
-    "id": "c926dd8a.c40d78",
+    "id": "7f4e16fd.13b25",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3518.900131225586,
-    "y": 1847.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3554.900131225586,
+    "y": 1892.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "288c4b3e.38e3ac"
+        "b75dfd73.636e48"
       ]
     ]
   },
   {
-    "id": "288c4b3e.38e3ac",
+    "id": "b75dfd73.636e48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3661.900131225586,
-    "y": 1844.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3697.900131225586,
+    "y": 1889.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "963b51c2.5c60a8",
+    "id": "bb1e4e57.280888",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3664.900131225586,
-    "y": 1807.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3700.900131225586,
+    "y": 1852.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dba238c.ade58c8",
-        "11c5499c.e33516"
+        "bda8773a.f12a1",
+        "d5e4b6e4.115dd8"
       ]
     ]
   },
   {
-    "id": "dba238c.ade58c8",
+    "id": "bda8773a.f12a1",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3858.900131225586,
-    "y": 1811.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 3894.900131225586,
+    "y": 1855.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d5ffb970.fa1968",
+    "id": "498e60f5.55f178",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3911.900100708008,
-    "y": 2179.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 3947.900100708008,
+    "y": 2224.566604614258,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8ab0c323.e760e"
+        "f195472b.83ff2"
       ]
     ]
   },
   {
-    "id": "8ab0c323.e760e",
+    "id": "f195472b.83ff2",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4117.900100708008,
-    "y": 2179.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 4153.900100708008,
+    "y": 2224.566604614258,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ef601430.2ce96"
+        "2e029795.f674f8"
       ]
     ]
   },
   {
-    "id": "ef601430.2ce96",
+    "id": "2e029795.f674f8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4335.185745239258,
-    "y": 2178.8217163085938,
-    "z": "8bc654d2.f0dde",
+    "x": 4371.185745239258,
+    "y": 2223.388381958008,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e64538ad.e88608"
+        "9d2261f5.b9fa08"
       ]
     ]
   },
   {
-    "id": "11c5499c.e33516",
+    "id": "d5e4b6e4.115dd8",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3880.900131225586,
-    "y": 1879.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 3916.900131225586,
+    "y": 1923.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "72da73e.01fae8c",
-        "1bf4f20c.844916",
-        "c2abc766.4ac0f"
+        "6730b25.e0c5f4c",
+        "c5d11aca.de4aa8",
+        "359fd71e.08e5b"
       ]
     ]
   },
   {
-    "id": "72da73e.01fae8c",
+    "id": "6730b25.e0c5f4c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4076.4002532958984,
-    "y": 1831.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4112.400253295898,
+    "y": 1875.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e5dd1f31.8ac458"
+        "11cc1f31.73aba1"
       ]
     ]
   },
   {
-    "id": "1bf4f20c.844916",
+    "id": "c5d11aca.de4aa8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4068.4002532958984,
-    "y": 1886.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4104.400253295898,
+    "y": 1930.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2c7c5a6c.8f4a66"
+        "5b1bf93a.85704"
       ]
     ]
   },
   {
-    "id": "c2abc766.4ac0f",
+    "id": "359fd71e.08e5b",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4073.4002532958984,
-    "y": 1943.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4109.400253295898,
+    "y": 1987.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a0f15b8e.a7ebb"
+        "150deb8f.b69cd4"
       ]
     ]
   },
   {
-    "id": "a0f15b8e.a7ebb",
+    "id": "150deb8f.b69cd4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4225.400253295898,
-    "y": 1944.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4261.400253295898,
+    "y": 1988.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "2c7c5a6c.8f4a66",
+    "id": "5b1bf93a.85704",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4236.400253295898,
-    "y": 1889.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4272.400253295898,
+    "y": 1933.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e5dd1f31.8ac458",
+    "id": "11cc1f31.73aba1",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4220.782577514648,
-    "y": 1828.65576171875,
-    "z": "8bc654d2.f0dde",
+    "x": 4256.782577514648,
+    "y": 1873.222427368164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5bc7c506.3f7314"
+        "cff6dd9b.8cbec"
       ]
     ]
   },
   {
-    "id": "ecc94bdb.36f218",
+    "id": "15645f19.451cd9",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
     "comments": "",
-    "x": 4518.900131225586,
-    "y": 1970.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4554.900131225586,
+    "y": 2014.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "70d8643e.5fc584",
+    "id": "5b635208.85addc",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
     "comments": "",
-    "x": 4519.900131225586,
-    "y": 2075.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4555.900131225586,
+    "y": 2119.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "75e052b3.6ff0fc",
+    "id": "f4c1e1b8.e7b4e8",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4514.900131225586,
-    "y": 2024.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4550.900131225586,
+    "y": 2068.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e64538ad.e88608",
+    "id": "9d2261f5.b9fa08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4542.017288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4578.017288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "58b39a0b.a28104",
-        "908d048a.fd0138",
-        "5394d746.97415"
+        "84d8ab80.c7c5d8",
+        "e6773f2f.211b88",
+        "2391fc90.5865f4"
       ]
     ]
   },
   {
-    "id": "58b39a0b.a28104",
+    "id": "84d8ab80.c7c5d8",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4757.017288208008,
-    "y": 2130.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4793.017288208008,
+    "y": 2174.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "908d048a.fd0138",
+    "id": "e6773f2f.211b88",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4754.017288208008,
-    "y": 2169.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4790.017288208008,
+    "y": 2213.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "160d9213.6a516e"
+        "e6f8fe6a.d80188"
       ]
     ]
   },
   {
-    "id": "5394d746.97415",
+    "id": "2391fc90.5865f4",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4709.517288208008,
-    "y": 2211.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4745.517288208008,
+    "y": 2255.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "160d9213.6a516e",
+    "id": "e6f8fe6a.d80188",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4934.517288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 4970.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2403cbf1.90bae4"
+        "fdc72134.67c23"
       ]
     ]
   },
   {
-    "id": "2403cbf1.90bae4",
+    "id": "fdc72134.67c23",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5092.517288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 5128.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "15dae2c1.fe6bdd"
+        "be11f8e.1056f08"
       ]
     ]
   },
   {
-    "id": "15dae2c1.fe6bdd",
+    "id": "be11f8e.1056f08",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5299.517288208008,
-    "y": 2168.3403930664062,
-    "z": "8bc654d2.f0dde",
+    "x": 5335.517288208008,
+    "y": 2212.9070587158203,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e7ce121f.269bb",
+    "id": "8905f8e1.68af1",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4802.900131225586,
-    "y": 1847.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4838.900131225586,
+    "y": 1891.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "30725ca7.222ea4"
+        "ca38006f.4cfdd"
       ]
     ]
   },
   {
-    "id": "30725ca7.222ea4",
+    "id": "ca38006f.4cfdd",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4979.900131225586,
-    "y": 1839.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5015.900131225586,
+    "y": 1883.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "82bc9190.99083",
-        "c6a75ef3.9aa488"
+        "9fddc1a7.528c8",
+        "516ef3bb.d53aec"
       ]
     ]
   },
   {
-    "id": "5bc7c506.3f7314",
+    "id": "cff6dd9b.8cbec",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4404.900131225586,
-    "y": 1843.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4440.900131225586,
+    "y": 1887.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9e2fa3d8.88246"
+        "4e481827.26cf7"
       ]
     ]
   },
   {
-    "id": "9e2fa3d8.88246",
+    "id": "4e481827.26cf7",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4599.900131225586,
-    "y": 1843.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4635.900131225586,
+    "y": 1887.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e7ce121f.269bb",
-        "87abf2c8.a21648"
+        "8905f8e1.68af1",
+        "eb2add71.4c5b38"
       ]
     ]
   },
   {
-    "id": "c6a75ef3.9aa488",
+    "id": "516ef3bb.d53aec",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5187.900131225586,
-    "y": 1846.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5223.900131225586,
+    "y": 1890.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d33681ca.12c55",
-        "54cfcb70.c20a5c",
-        "76901bc2.c646ec"
+        "8f1e6966.2ed9b",
+        "eb0b97a0.d2554",
+        "8b053235.7e7848"
       ]
     ]
   },
   {
-    "id": "c7485083.08e3d",
+    "id": "13674b50.1cc875",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4981.900131225586,
-    "y": 1912.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5017.900131225586,
+    "y": 1956.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9f7ab33f.3d3ee8"
+        "fd136ece.b5724"
       ]
     ]
   },
   {
-    "id": "87abf2c8.a21648",
+    "id": "eb2add71.4c5b38",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4804.900131225586,
-    "y": 1920.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 4840.900131225586,
+    "y": 1964.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c7485083.08e3d"
+        "13674b50.1cc875"
       ]
     ]
   },
   {
-    "id": "82bc9190.99083",
+    "id": "9fddc1a7.528c8",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainB id",
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5217.900131225586,
-    "y": 1794.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5253.900131225586,
+    "y": 1838.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9f7ab33f.3d3ee8",
+    "id": "fd136ece.b5724",
     "type": "set",
     "name": "set domainB ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5216.900131225586,
-    "y": 2036.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5252.900131225586,
+    "y": 2080.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d33681ca.12c55",
+    "id": "8f1e6966.2ed9b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5397.900131225586,
-    "y": 1837.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5433.900131225586,
+    "y": 1881.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "52bdc174.53236"
+        "9db69d63.dc9d08"
       ]
     ]
   },
   {
-    "id": "54cfcb70.c20a5c",
+    "id": "eb0b97a0.d2554",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5389.900131225586,
-    "y": 1892.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5425.900131225586,
+    "y": 1936.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "da0362e9.7cf8b8"
+        "c57fd560.6db4a"
       ]
     ]
   },
   {
-    "id": "76901bc2.c646ec",
+    "id": "8b053235.7e7848",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5394.900131225586,
-    "y": 1949.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5430.900131225586,
+    "y": 1993.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "656ad13e.13aaf8"
+        "6e911852.3a5e28"
       ]
     ]
   },
   {
-    "id": "656ad13e.13aaf8",
+    "id": "6e911852.3a5e28",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5546.900131225586,
-    "y": 1950.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5582.900131225586,
+    "y": 1994.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "da0362e9.7cf8b8",
+    "id": "c57fd560.6db4a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5557.900131225586,
-    "y": 1895.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5593.900131225586,
+    "y": 1939.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "52bdc174.53236",
+    "id": "9db69d63.dc9d08",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5542.282455444336,
-    "y": 1834.65576171875,
-    "z": "8bc654d2.f0dde",
+    "x": 5578.282455444336,
+    "y": 1879.222427368164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2dd4dc53.801b1c"
+        "e6169acb.b321e8"
       ]
     ]
   },
   {
-    "id": "2dd4dc53.801b1c",
+    "id": "e6169acb.b321e8",
     "type": "set",
     "name": "set controller domainB data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5756.900131225586,
-    "y": 1831.0000915527344,
-    "z": "8bc654d2.f0dde",
+    "x": 5792.900131225586,
+    "y": 1875.5667572021484,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "10147ab3.fed6fd",
+    "id": "c49ed897.0159e8",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3241.566635131836,
-    "y": 1649.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 3277.566635131836,
+    "y": 1694.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "bb3da11a.4b756",
+    "id": "758e6e49.b62098",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4537.566635131836,
-    "y": 623.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4573.566635131836,
+    "y": 668.5666351318359,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "550747e5.fd6e4",
+    "id": "ebf6202d.cf95a8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4547.566665649414,
-    "y": 820,
-    "z": "8bc654d2.f0dde",
+    "x": 4583.566665649414,
+    "y": 864.5666656494141,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "425867c4.b0a9",
+    "id": "9d2ec307.fb07b8",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3244.566604614258,
-    "y": 2157.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 3280.566604614258,
+    "y": 2202.566604614258,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e3e1a44c.9927b8",
+    "id": "c81a19d9.9b256",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3381.566665649414,
-    "y": 2814,
-    "z": "8bc654d2.f0dde",
+    "x": 3417.566665649414,
+    "y": 2858.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "4a62d4e.fca9aac",
+    "id": "b5b402c1.c35e88",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3258.566665649414,
-    "y": 2924,
-    "z": "8bc654d2.f0dde",
+    "x": 3294.566665649414,
+    "y": 2968.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "81493f2.f26234",
-        "6c24115d.c6e7c"
+        "1932a37.6a327dd",
+        "e9120928.0c2298"
       ]
     ]
   },
   {
-    "id": "81493f2.f26234",
+    "id": "1932a37.6a327dd",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3442.566665649414,
-    "y": 2903,
-    "z": "8bc654d2.f0dde",
+    "x": 3478.566665649414,
+    "y": 2947.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3aff0eaf.ff7b7a"
+        "82607164.646368"
       ]
     ]
   },
   {
-    "id": "6c24115d.c6e7c",
+    "id": "e9120928.0c2298",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3334.566665649414,
-    "y": 5081,
-    "z": "8bc654d2.f0dde",
+    "x": 3370.566665649414,
+    "y": 5125.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5bc4950a.db01dc"
+        "ff313408.b74908"
       ]
     ]
   },
   {
-    "id": "5bc4950a.db01dc",
+    "id": "ff313408.b74908",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3489.566665649414,
-    "y": 5074,
-    "z": "8bc654d2.f0dde",
+    "x": 3525.566665649414,
+    "y": 5118.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2f2701b5.2dac16",
-        "316110e0.e54cc",
-        "b160de6d.e8ced8",
-        "595e7f4b.3b8bd8",
-        "8bf8bc6f.53ce6",
-        "1e2222c.7b917dd"
+        "172df7ad.1d8918",
+        "e9491637.d51c9",
+        "ed589f33.dee34",
+        "8bbbb496.3df16",
+        "581d9366.e6ee44",
+        "f0668881.7d6d6"
       ]
     ]
   },
   {
-    "id": "3aff0eaf.ff7b7a",
+    "id": "82607164.646368",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3585.566665649414,
-    "y": 2903,
-    "z": "8bc654d2.f0dde",
+    "x": 3621.566665649414,
+    "y": 2947.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5168a07f.a36df8",
-        "6c599b75.a60fcc",
-        "35850a83.44a89e",
-        "ae160236.4157c8",
-        "b7fd9c88.558b98",
-        "6e041a0e.19b3cc",
-        "612f5852.aaa57",
-        "8d9898f5.dd7e",
-        "638e1104.d7c428",
-        "d797d3a4.8fe9",
-        "ce4e4e08.0ce56",
-        "a4cacc19.7d376",
-        "57e31ea9.c7173",
-        "bf6be8f0.fb6c88",
-        "982a1a56.4966b8",
-        "8feec705.936fd8",
-        "eb6eb29c.21a438",
-        "cad73781.1cf898",
-        "bdd8ea07.2740c",
-        "8877dbf4.9fef7",
-        "374b533b.d2c934",
-        "e008f489.a45f08"
+        "a3d597a8.021388",
+        "2f89ad50.333c2a",
+        "7f37398e.ac4788",
+        "c4c44808.41f1d8",
+        "7f311072.1019e",
+        "a4b5361a.3a19d8",
+        "22f4d985.fe3c1e",
+        "dc9eeea6.2c8698",
+        "7a27d008.22f4d",
+        "7fc66b60.eeacbc",
+        "4cc13ef6.adae78",
+        "19fd1bdb.1b78e4",
+        "d873f718.81f988",
+        "cea863c0.4ccb38",
+        "6825a3b9.0c4a74",
+        "97368f95.9c3c68",
+        "550c2be9.9018d4",
+        "540352c5.31c62c",
+        "87e2b691.2d12d8",
+        "25259a32.c04fe6",
+        "b87e18c5.0db5e8",
+        "88b90ca8.e250c"
       ]
     ]
   },
   {
-    "id": "638e1104.d7c428",
+    "id": "7a27d008.22f4d",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainB",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3895.566665649414,
-    "y": 3218,
-    "z": "8bc654d2.f0dde",
+    "x": 3931.566665649414,
+    "y": 3262.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5168a07f.a36df8",
+    "id": "a3d597a8.021388",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3843.566665649414,
-    "y": 3260,
-    "z": "8bc654d2.f0dde",
+    "x": 3879.566665649414,
+    "y": 3304.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "6c599b75.a60fcc",
+    "id": "2f89ad50.333c2a",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3972.566665649414,
-    "y": 3302,
-    "z": "8bc654d2.f0dde",
+    "x": 4008.566665649414,
+    "y": 3346.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e80dd6ae.f178",
+    "id": "568e89f6.76041",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3818.566665649414,
-    "y": 3177,
-    "z": "8bc654d2.f0dde",
+    "x": 3854.566665649414,
+    "y": 3221.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b4b36e39.27fc08",
+    "id": "cfc92e2e.d4332",
     "type": "comment",
     "name": "create middle man connectivity and ...",
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",
     "comments": "",
-    "x": 4343.566665649414,
-    "y": 3698,
-    "z": "8bc654d2.f0dde",
+    "x": 4379.566665649414,
+    "y": 3742.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "35850a83.44a89e",
+    "id": "7f37398e.ac4788",
     "type": "execute",
     "name": "execute UUID generator for connectivity middle-man",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3907.566665649414,
-    "y": 3737,
-    "z": "8bc654d2.f0dde",
+    "x": 3943.566665649414,
+    "y": 3781.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ae160236.4157c8",
+    "id": "c4c44808.41f1d8",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3855.566665649414,
-    "y": 3788,
-    "z": "8bc654d2.f0dde",
+    "x": 3891.566665649414,
+    "y": 3832.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b7fd9c88.558b98",
+    "id": "7f311072.1019e",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-middle-man-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-middle-man-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3991.566665649414,
-    "y": 3835,
-    "z": "8bc654d2.f0dde",
+    "x": 4027.566665649414,
+    "y": 3879.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f07a7af4.49b438",
+    "id": "b73302ea.6b3c9",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3848.566665649414,
-    "y": 3697,
-    "z": "8bc654d2.f0dde",
+    "x": 3884.566665649414,
+    "y": 3741.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d7c1d718.25aef8",
+    "id": "f06d4892.086d48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4278.566665649414,
-    "y": 3894,
-    "z": "8bc654d2.f0dde",
+    "x": 4314.566665649414,
+    "y": 3938.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e041a0e.19b3cc",
+    "id": "a4b5361a.3a19d8",
     "type": "save",
     "name": "get middle-man connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3869.566665649414,
-    "y": 3941,
-    "z": "8bc654d2.f0dde",
+    "x": 3905.566665649414,
+    "y": 3985.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3be15b0.8cc9ea6",
-        "8fcafedd.8f9ff8",
-        "74f3c2d6.5194d4"
+        "7c79fc80.066eb4",
+        "c371f5b2.5890b8",
+        "8674a08a.891028"
       ]
     ]
   },
   {
-    "id": "3be15b0.8cc9ea6",
+    "id": "7c79fc80.066eb4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4116.566665649414,
-    "y": 3895,
-    "z": "8bc654d2.f0dde",
+    "x": 4152.566665649414,
+    "y": 3939.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d7c1d718.25aef8"
+        "f06d4892.086d48"
       ]
     ]
   },
   {
-    "id": "8fcafedd.8f9ff8",
+    "id": "c371f5b2.5890b8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4117.057632446289,
-    "y": 3940.5740356445312,
-    "z": "8bc654d2.f0dde",
+    "x": 4153.057632446289,
+    "y": 3985.1407012939453,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "535b8241.bba134"
+        "f874dece.70a19"
       ]
     ]
   },
   {
-    "id": "74f3c2d6.5194d4",
+    "id": "8674a08a.891028",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4114.566665649414,
-    "y": 3984,
-    "z": "8bc654d2.f0dde",
+    "x": 4150.566665649414,
+    "y": 4028.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4abd8099.5640c"
+        "395b0fd4.a6a4c"
       ]
     ]
   },
   {
-    "id": "535b8241.bba134",
+    "id": "f874dece.70a19",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4279.629043579102,
-    "y": 3940.8597717285156,
-    "z": "8bc654d2.f0dde",
+    "x": 4315.629043579102,
+    "y": 3985.4264373779297,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4abd8099.5640c",
+    "id": "395b0fd4.a6a4c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4283.566665649414,
-    "y": 3985,
-    "z": "8bc654d2.f0dde",
+    "x": 4319.566665649414,
+    "y": 4029.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "982a1a56.4966b8",
+    "id": "6825a3b9.0c4a74",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3923.566665649414,
-    "y": 4283,
-    "z": "8bc654d2.f0dde",
+    "x": 3959.566665649414,
+    "y": 4327.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8feec705.936fd8",
+    "id": "97368f95.9c3c68",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3926.566665649414,
-    "y": 4328,
-    "z": "8bc654d2.f0dde",
+    "x": 3962.566665649414,
+    "y": 4372.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "cad73781.1cf898",
+    "id": "540352c5.31c62c",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3918.566665649414,
-    "y": 4056,
-    "z": "8bc654d2.f0dde",
+    "x": 3954.566665649414,
+    "y": 4100.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "bdd8ea07.2740c",
+    "id": "87e2b691.2d12d8",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3920.566665649414,
-    "y": 4103,
-    "z": "8bc654d2.f0dde",
+    "x": 3956.566665649414,
+    "y": 4147.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b21853e4.c6418",
+    "id": "de9883f2.40e1e",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3839.566665649414,
-    "y": 4236,
-    "z": "8bc654d2.f0dde",
+    "x": 3875.566665649414,
+    "y": 4280.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f1842c11.743b7",
+    "id": "8e94a286.9bf3d",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4449.566665649414,
-    "y": 4902,
-    "z": "8bc654d2.f0dde",
+    "x": 4485.566665649414,
+    "y": 4946.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f2701b5.2dac16",
+    "id": "172df7ad.1d8918",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3704.566665649414,
-    "y": 5055,
-    "z": "8bc654d2.f0dde",
+    "x": 3740.566665649414,
+    "y": 5099.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bb4138b0.4e1d88",
-        "3497566e.93319a"
+        "42ddce9e.8ae7c",
+        "527e3f0b.1dc1d"
       ]
     ]
   },
   {
-    "id": "3497566e.93319a",
+    "id": "527e3f0b.1dc1d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3876.566665649414,
-    "y": 5052,
-    "z": "8bc654d2.f0dde",
+    "x": 3912.566665649414,
+    "y": 5096.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c7f4755e.39d608"
+        "7bd89115.7af5d"
       ]
     ]
   },
   {
-    "id": "bb4138b0.4e1d88",
+    "id": "42ddce9e.8ae7c",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3828.566665649414,
-    "y": 5899,
-    "z": "8bc654d2.f0dde",
+    "x": 3864.566665649414,
+    "y": 5943.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6c4c0ada.7452e4"
+        "ba444b0.6d090b8"
       ]
     ]
   },
   {
-    "id": "4c3530ee.3fa66",
+    "id": "678feee9.54f5e",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3889.566665649414,
-    "y": 5022,
-    "z": "8bc654d2.f0dde",
+    "x": 3925.566665649414,
+    "y": 5066.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "56d0be77.8f738",
+    "id": "f4c6dae7.f846f8",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3899.566665649414,
-    "y": 5857,
-    "z": "8bc654d2.f0dde",
+    "x": 3935.566665649414,
+    "y": 5901.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "612f5852.aaa57",
+    "id": "22f4d985.fe3c1e",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3922.566665649414,
-    "y": 4431,
-    "z": "8bc654d2.f0dde",
+    "x": 3958.566665649414,
+    "y": 4475.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7f4755e.39d608",
+    "id": "7bd89115.7af5d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4052.566665649414,
-    "y": 5054,
-    "z": "8bc654d2.f0dde",
+    "x": 4088.566665649414,
+    "y": 5098.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "230e1b13.237ccc",
-        "5181bb49.6fa9a4",
-        "fd0048f2.8665c8",
-        "78647ab5.49b354",
-        "f0982e54.06c37",
-        "828e934c.bce518",
-        "f1842c11.743b7",
-        "76d94500.85b34c",
-        "66bf889f.a4f118"
+        "a830956d.47074",
+        "1755eaf4.354305",
+        "bc42d413.82595",
+        "e6e246b3.ed891",
+        "ea96eb7.ae6d798",
+        "64dc9cdb.f55c8c",
+        "8e94a286.9bf3d",
+        "f715ac9f.9b32b8",
+        "79d51ab0.5a125c"
       ]
     ]
   },
   {
-    "id": "ae961dcf.a0b6c",
+    "id": "979e33e8.311e38",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5497.566665649414,
-    "y": 4527,
-    "z": "8bc654d2.f0dde",
+    "x": 5533.566665649414,
+    "y": 4571.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "230e1b13.237ccc",
+    "id": "a830956d.47074",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4430.566665649414,
-    "y": 5557,
-    "z": "8bc654d2.f0dde",
+    "x": 4466.566665649414,
+    "y": 5601.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8d9898f5.dd7e",
+    "id": "dc9eeea6.2c8698",
     "type": "save",
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3901.566665649414,
-    "y": 3431,
-    "z": "8bc654d2.f0dde",
+    "x": 3937.566665649414,
+    "y": 3475.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "d797d3a4.8fe9",
+    "id": "7fc66b60.eeacbc",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3899.566665649414,
-    "y": 2888,
-    "z": "8bc654d2.f0dde",
+    "x": 3935.566665649414,
+    "y": 2932.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce4e4e08.0ce56",
+    "id": "4cc13ef6.adae78",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\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`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\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`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3847.566665649414,
-    "y": 2936,
-    "z": "8bc654d2.f0dde",
+    "x": 3883.566665649414,
+    "y": 2980.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "a4cacc19.7d376",
+    "id": "19fd1bdb.1b78e4",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3975.566665649414,
-    "y": 2983,
-    "z": "8bc654d2.f0dde",
+    "x": 4011.566665649414,
+    "y": 3027.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ae968df.974b9f",
+    "id": "49213484.6d2684",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3812.566665649414,
-    "y": 2846,
-    "z": "8bc654d2.f0dde",
+    "x": 3848.566665649414,
+    "y": 2890.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "57e31ea9.c7173",
+    "id": "d873f718.81f988",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3809.566665649414,
-    "y": 3074,
-    "z": "8bc654d2.f0dde",
+    "x": 3845.566665649414,
+    "y": 3118.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "bf6be8f0.fb6c88",
+    "id": "cea863c0.4ccb38",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 3902.566665649414,
-    "y": 3127,
-    "z": "8bc654d2.f0dde",
+    "x": 3938.566665649414,
+    "y": 3171.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "155d8942.126f0f",
+    "id": "8a16772c.f0d08",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3793.566665649414,
-    "y": 3030,
-    "z": "8bc654d2.f0dde",
+    "x": 3829.566665649414,
+    "y": 3074.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eda430a0.e8a4b8",
+    "id": "d8aa6375.55f12",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3797.566665649414,
-    "y": 3346,
-    "z": "8bc654d2.f0dde",
+    "x": 3833.566665649414,
+    "y": 3390.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "78647ab5.49b354",
+    "id": "e6e246b3.ed891",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4366.566665649414,
-    "y": 4535,
-    "z": "8bc654d2.f0dde",
+    "x": 4402.566665649414,
+    "y": 4579.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "db99df8c.8021",
+    "id": "546f5300.a4bc44",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4350.566665649414,
-    "y": 4491,
-    "z": "8bc654d2.f0dde",
+    "x": 4386.566665649414,
+    "y": 4535.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fea8fd97.74e2c8",
+    "id": "b36d849f.6b142",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5097.566665649414,
-    "y": 4522,
-    "z": "8bc654d2.f0dde",
+    "x": 5133.566665649414,
+    "y": 4566.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5a0b429f.b8f42c",
+    "id": "df003672.bddd2",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5184.566665649414,
-    "y": 4564,
-    "z": "8bc654d2.f0dde",
+    "x": 5220.566665649414,
+    "y": 4608.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5930a956.25a2b",
+    "id": "dbb46179.c47f78",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\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`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\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`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5132.566665649414,
-    "y": 4612,
-    "z": "8bc654d2.f0dde",
+    "x": 5168.566665649414,
+    "y": 4656.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8f7ba394.827068",
+    "id": "837adbb2.1c01e8",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5260.566665649414,
-    "y": 4659,
-    "z": "8bc654d2.f0dde",
+    "x": 5296.566665649414,
+    "y": 4703.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "828e934c.bce518",
+    "id": "64dc9cdb.f55c8c",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4437.566665649414,
-    "y": 4944,
-    "z": "8bc654d2.f0dde",
+    "x": 4473.566665649414,
+    "y": 4988.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "29a2a107.550e86",
+    "id": "f767aa90.80364",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4420.566665649414,
-    "y": 5006,
-    "z": "8bc654d2.f0dde",
+    "x": 4456.566665649414,
+    "y": 5050.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5181bb49.6fa9a4",
+    "id": "1755eaf4.354305",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4531.566665649414,
-    "y": 5048,
-    "z": "8bc654d2.f0dde",
+    "x": 4567.566665649414,
+    "y": 5092.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "a3e1b718.3ad9",
+    "id": "4953b8d7.b454c8",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 4979.566665649414,
-    "y": 5101,
-    "z": "8bc654d2.f0dde",
+    "x": 5015.566665649414,
+    "y": 5145.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "778aa80b.aa4e1",
+    "id": "b4d97863.c15da",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4289.566665649414,
-    "y": 5799,
-    "z": "8bc654d2.f0dde",
+    "x": 4325.566665649414,
+    "y": 5843.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5829dcc0.7722b4",
+    "id": "d715f85a.00ec7",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='type' value='leaf' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4187.566665649414,
-    "y": 5748,
-    "z": "8bc654d2.f0dde",
+    "x": 4223.566665649414,
+    "y": 5792.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e74f47d7.82472",
+    "id": "5114dbce.799f0c",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4171.566665649414,
-    "y": 5704,
-    "z": "8bc654d2.f0dde",
+    "x": 4207.566665649414,
+    "y": 5748.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "edf4200a.b4f218",
+    "id": "a495cbe2.05f3",
     "type": "save",
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4957.566665649414,
-    "y": 5961,
-    "z": "8bc654d2.f0dde",
+    "x": 4993.566665649414,
+    "y": 6005.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "fd0048f2.8665c8",
+    "id": "bc42d413.82595",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4358.566665649414,
-    "y": 5105,
-    "z": "8bc654d2.f0dde",
+    "x": 4394.566665649414,
+    "y": 5149.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ad0bda8.59e5ba8",
-        "a82a76f3.4e09c"
+        "5a8de4b.cef309c",
+        "99b44375.9d0098"
       ]
     ]
   },
   {
-    "id": "ad0bda8.59e5ba8",
+    "id": "5a8de4b.cef309c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4569.566665649414,
-    "y": 5105,
-    "z": "8bc654d2.f0dde",
+    "x": 4605.566665649414,
+    "y": 5149.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "85a5596f.5bdcf8"
+        "41a866cb.6d5e88"
       ]
     ]
   },
   {
-    "id": "85a5596f.5bdcf8",
+    "id": "41a866cb.6d5e88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4725.566665649414,
-    "y": 5101,
-    "z": "8bc654d2.f0dde",
+    "x": 4761.566665649414,
+    "y": 5145.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "a3e1b718.3ad9",
-        "31466e0d.9a3dba",
-        "19c788e0.a62557"
+        "4953b8d7.b454c8",
+        "5f4b3cc4.eb62f4",
+        "76c11af1.9e9b94"
       ]
     ]
   },
   {
-    "id": "a82a76f3.4e09c",
+    "id": "99b44375.9d0098",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4565.566665649414,
-    "y": 5153,
-    "z": "8bc654d2.f0dde",
+    "x": 4601.566665649414,
+    "y": 5197.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9fc5ee1f.667928"
+        "c40ddff0.38613"
       ]
     ]
   },
   {
-    "id": "9fc5ee1f.667928",
+    "id": "c40ddff0.38613",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 4713.566665649414,
-    "y": 5148,
-    "z": "8bc654d2.f0dde",
+    "x": 4749.566665649414,
+    "y": 5192.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4161f07f.2b4a78",
+    "id": "e8bdf848.077f2",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5221.566665649414,
-    "y": 4730,
-    "z": "8bc654d2.f0dde",
+    "x": 5257.566665649414,
+    "y": 4774.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "90827cac.7f3cc8",
+    "id": "5b668059.1f482",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2387.566665649414,
-    "y": 141,
-    "z": "8bc654d2.f0dde",
+    "x": 2423.566665649414,
+    "y": 185.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e557ce2.09f823",
+    "id": "989a0e11.127538",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 2321.566665649414,
-    "y": 177,
-    "z": "8bc654d2.f0dde",
+    "x": 2357.566665649414,
+    "y": 221.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "47435c42.bdd92c",
+    "id": "e2d9aece.1465f",
     "type": "comment",
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
     "info": "",
     "comments": "",
-    "x": 2506.566665649414,
-    "y": 104,
-    "z": "8bc654d2.f0dde",
+    "x": 2542.566665649414,
+    "y": 148.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b6d8895e.58d1b",
+    "id": "8228476b.dfc93",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 4256.566665649414,
-    "y": 5865,
-    "z": "8bc654d2.f0dde",
+    "x": 4292.566665649414,
+    "y": 5909.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c1456abb.063048",
+    "id": "394125b3.b0b57a",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4389.566665649414,
-    "y": 5913,
-    "z": "8bc654d2.f0dde",
+    "x": 4425.566665649414,
+    "y": 5957.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "da4c1b48.fae9f8",
+    "id": "64250c00.f41444",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4208.566665649414,
-    "y": 5971,
-    "z": "8bc654d2.f0dde",
+    "x": 4244.566665649414,
+    "y": 6015.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "86ae7c06.4b48",
-        "7bcdf21f.be49d4"
+        "24759095.ee144",
+        "cef50f43.3e9f48"
       ]
     ]
   },
   {
-    "id": "86ae7c06.4b48",
+    "id": "24759095.ee144",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4401.566665649414,
-    "y": 5972,
-    "z": "8bc654d2.f0dde",
+    "x": 4437.566665649414,
+    "y": 6016.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "97f7b4f.de4c2c8"
+        "c0599a44.570328"
       ]
     ]
   },
   {
-    "id": "97f7b4f.de4c2c8",
+    "id": "c0599a44.570328",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",
     "comments": "",
-    "x": 4557.566665649414,
-    "y": 5969,
-    "z": "8bc654d2.f0dde",
+    "x": 4593.566665649414,
+    "y": 6013.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7bcdf21f.be49d4",
+    "id": "cef50f43.3e9f48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4405.566665649414,
-    "y": 6016,
-    "z": "8bc654d2.f0dde",
+    "x": 4441.566665649414,
+    "y": 6060.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c9f63d74.2677a"
+        "2c2e6801.1f5998"
       ]
     ]
   },
   {
-    "id": "c9f63d74.2677a",
+    "id": "2c2e6801.1f5998",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4544.566665649414,
-    "y": 6011,
-    "z": "8bc654d2.f0dde",
+    "x": 4580.566665649414,
+    "y": 6055.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "edf4200a.b4f218",
-        "684d5c9e.960e44",
-        "fa17bed2.102338",
-        "4394fc56.b0a524",
-        "c58358a8.9796d8",
-        "f1d05d51.ef74a8",
-        "9dd9cb2c.0f6d38",
-        "e3b520b5.76f3e",
-        "1492db48.4787f5",
-        "4433eaac.652284",
-        "5e482e7e.e4be78",
-        "b03c5831.d4c5f"
+        "a495cbe2.05f3",
+        "d341cf2c.6ddc78",
+        "882a079d.0537c8",
+        "9acad1b0.c8f3c8",
+        "1591d847.9e7b3",
+        "2e348bab.75e0fc",
+        "3c4d6cf1.e2588c",
+        "cf206ffb.cf7668",
+        "5a9ba33a.7d1a8c",
+        "68c1a73b.58dcd8",
+        "221756d1.77b252",
+        "6b274a0f.281994"
       ]
     ]
   },
   {
-    "id": "9dd9cb2c.0f6d38",
+    "id": "3c4d6cf1.e2588c",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4741.566665649414,
-    "y": 6690,
-    "z": "8bc654d2.f0dde",
+    "x": 4777.566665649414,
+    "y": 6734.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1b9180c4.9f766f",
-        "3223a99b.bae36e",
-        "f1d0a095.e9e33"
+        "f71173d.2556e9",
+        "36d425a2.cca582",
+        "63e9e58.35d851c"
       ]
     ]
   },
   {
-    "id": "1b9180c4.9f766f",
+    "id": "f71173d.2556e9",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4946.566665649414,
-    "y": 6687,
-    "z": "8bc654d2.f0dde",
+    "x": 4982.566665649414,
+    "y": 6731.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "901d20b6.63b228"
+        "211a75a9.b19e7a"
       ]
     ]
   },
   {
-    "id": "3223a99b.bae36e",
+    "id": "36d425a2.cca582",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4930.057632446289,
-    "y": 6748.574035644531,
-    "z": "8bc654d2.f0dde",
+    "x": 4966.057632446289,
+    "y": 6793.140701293945,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "74136956.3d8c9"
+        "2ef14bb4.55e2cc"
       ]
     ]
   },
   {
-    "id": "f1d0a095.e9e33",
+    "id": "63e9e58.35d851c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4927.566665649414,
-    "y": 6792,
-    "z": "8bc654d2.f0dde",
+    "x": 4963.566665649414,
+    "y": 6836.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c0df29cc.8ad0d8"
+        "61cb6aef.0faa54"
       ]
     ]
   },
   {
-    "id": "901d20b6.63b228",
+    "id": "211a75a9.b19e7a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5102.566665649414,
-    "y": 6701,
-    "z": "8bc654d2.f0dde",
+    "x": 5138.566665649414,
+    "y": 6745.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1ef77bcc.af8c2c"
+        "1dafef09.17b7d9"
       ]
     ]
   },
   {
-    "id": "74136956.3d8c9",
+    "id": "2ef14bb4.55e2cc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5092.629043579102,
-    "y": 6748.859771728516,
-    "z": "8bc654d2.f0dde",
+    "x": 5128.629043579102,
+    "y": 6793.42643737793,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c0df29cc.8ad0d8",
+    "id": "61cb6aef.0faa54",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5094.566665649414,
-    "y": 6791,
-    "z": "8bc654d2.f0dde",
+    "x": 5130.566665649414,
+    "y": 6835.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1ef77bcc.af8c2c",
+    "id": "1dafef09.17b7d9",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5349.566665649414,
-    "y": 6698,
-    "z": "8bc654d2.f0dde",
+    "x": 5385.566665649414,
+    "y": 6742.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "77c4c783.c3eb4"
+        "33d48bc3.4a3004"
       ]
     ]
   },
   {
-    "id": "77c4c783.c3eb4",
+    "id": "33d48bc3.4a3004",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5586.566665649414,
-    "y": 6694,
-    "z": "8bc654d2.f0dde",
+    "x": 5622.566665649414,
+    "y": 6738.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aa349c90.ef423"
+        "509c6355.839cf4"
       ]
     ]
   },
   {
-    "id": "41bd4d7e.8e8f9c",
+    "id": "9a8b6da5.4a6238",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5829.566665649414,
-    "y": 6666,
-    "z": "8bc654d2.f0dde",
+    "x": 5865.566665649414,
+    "y": 6710.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "858dc053.37b33",
-        "5e74f51.5b7928c"
+        "4704615c.3c69f",
+        "3a6fe540.e42ee2"
       ]
     ]
   },
   {
-    "id": "858dc053.37b33",
+    "id": "4704615c.3c69f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6034.566665649414,
-    "y": 6686,
-    "z": "8bc654d2.f0dde",
+    "x": 6070.566665649414,
+    "y": 6730.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aa349c90.ef423"
+        "509c6355.839cf4"
       ]
     ]
   },
   {
-    "id": "5e74f51.5b7928c",
+    "id": "3a6fe540.e42ee2",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6033.566665649414,
-    "y": 6639,
-    "z": "8bc654d2.f0dde",
+    "x": 6069.566665649414,
+    "y": 6683.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "aa349c90.ef423",
+    "id": "509c6355.839cf4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4777.566665649414,
-    "y": 6961,
-    "z": "8bc654d2.f0dde",
+    "x": 4813.566665649414,
+    "y": 7005.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b674f90b.943ea8"
+        "867fbf45.6b76e8"
       ]
     ]
   },
   {
-    "id": "4b6f312b.4e491",
+    "id": "b664359c.e37a3",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 6239.566635131836,
-    "y": 6898.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6275.566635131836,
+    "y": 6943.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e9dae4fe.64e148",
+    "id": "125d4567.492113",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4839.566665649414,
-    "y": 6637,
-    "z": "8bc654d2.f0dde",
+    "x": 4875.566665649414,
+    "y": 6681.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f1d05d51.ef74a8",
+    "id": "2e348bab.75e0fc",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4721.566665649414,
-    "y": 6525,
-    "z": "8bc654d2.f0dde",
+    "x": 4757.566665649414,
+    "y": 6569.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "87a0032d.5441b8",
+    "id": "cf763643.011b",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5066.566665649414,
-    "y": 6356,
-    "z": "8bc654d2.f0dde",
+    "x": 5102.566665649414,
+    "y": 6400.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e7a622d1.3aac3"
+        "e8f56973.27478"
       ]
     ]
   },
   {
-    "id": "e7a622d1.3aac3",
+    "id": "e8f56973.27478",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5286.566665649414,
-    "y": 6362,
-    "z": "8bc654d2.f0dde",
+    "x": 5322.566665649414,
+    "y": 6406.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d7851175.526278"
+        "fde5a354.539f28"
       ]
     ]
   },
   {
-    "id": "d7851175.526278",
+    "id": "fde5a354.539f28",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5473.566665649414,
-    "y": 6322,
-    "z": "8bc654d2.f0dde",
+    "x": 5509.566665649414,
+    "y": 6366.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "56e3e30c.886de4"
+        "575e4bf2.eff614"
       ]
     ]
   },
   {
-    "id": "56e3e30c.886de4",
+    "id": "575e4bf2.eff614",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5665.566665649414,
-    "y": 6325,
-    "z": "8bc654d2.f0dde",
+    "x": 5701.566665649414,
+    "y": 6369.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c0a5fdcc.0dad4"
+        "d993f92.1703888"
       ]
     ]
   },
   {
-    "id": "c0a5fdcc.0dad4",
+    "id": "d993f92.1703888",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5874.566665649414,
-    "y": 6323,
-    "z": "8bc654d2.f0dde",
+    "x": 5910.566665649414,
+    "y": 6367.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e3b520b5.76f3e",
+    "id": "cf206ffb.cf7668",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4773.566665649414,
-    "y": 6350,
-    "z": "8bc654d2.f0dde",
+    "x": 4809.566665649414,
+    "y": 6394.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "87a0032d.5441b8"
+        "cf763643.011b"
       ]
     ]
   },
   {
-    "id": "fa17bed2.102338",
+    "id": "882a079d.0537c8",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4781.566665649414,
-    "y": 6243,
-    "z": "8bc654d2.f0dde",
+    "x": 4817.566665649414,
+    "y": 6287.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b854c35b.ab4dd8",
-        "6917c22f.3449c4",
-        "56393d6a.f28b34"
+        "bc620ade.df0f58",
+        "6623a49b.f6c65c",
+        "19b34b3d.8c8655"
       ]
     ]
   },
   {
-    "id": "b854c35b.ab4dd8",
+    "id": "bc620ade.df0f58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5017.566665649414,
-    "y": 6226,
-    "z": "8bc654d2.f0dde",
+    "x": 5053.566665649414,
+    "y": 6270.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "6917c22f.3449c4",
+    "id": "6623a49b.f6c65c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5014.566665649414,
-    "y": 6267,
-    "z": "8bc654d2.f0dde",
+    "x": 5050.566665649414,
+    "y": 6311.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "56393d6a.f28b34",
+    "id": "19b34b3d.8c8655",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5028.566665649414,
-    "y": 6307,
-    "z": "8bc654d2.f0dde",
+    "x": 5064.566665649414,
+    "y": 6351.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "4394fc56.b0a524",
+    "id": "9acad1b0.c8f3c8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4717.566665649414,
-    "y": 6402,
-    "z": "8bc654d2.f0dde",
+    "x": 4753.566665649414,
+    "y": 6446.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c58358a8.9796d8",
+    "id": "1591d847.9e7b3",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4725.566665649414,
-    "y": 6460,
-    "z": "8bc654d2.f0dde",
+    "x": 4761.566665649414,
+    "y": 6504.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "684d5c9e.960e44",
+    "id": "d341cf2c.6ddc78",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4730.566665649414,
-    "y": 6200,
-    "z": "8bc654d2.f0dde",
+    "x": 4766.566665649414,
+    "y": 6244.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4f9189d2.f34a8",
+    "id": "2fabd91.b08d0a6",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4845.566665649414,
-    "y": 6152,
-    "z": "8bc654d2.f0dde",
+    "x": 4881.566665649414,
+    "y": 6196.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b674f90b.943ea8",
+    "id": "867fbf45.6b76e8",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5020.566665649414,
-    "y": 6958,
-    "z": "8bc654d2.f0dde",
+    "x": 5056.566665649414,
+    "y": 7002.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f695cd31.082f9",
-        "a92f49c6.640148"
+        "ca20f18b.d4eba8",
+        "a546871e.5bfa7"
       ]
     ]
   },
   {
-    "id": "f695cd31.082f9",
+    "id": "ca20f18b.d4eba8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5249.566665649414,
-    "y": 6935,
-    "z": "8bc654d2.f0dde",
+    "x": 5285.566665649414,
+    "y": 6979.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fe65cd53.d11278"
+        "4274d693.44e7"
       ]
     ]
   },
   {
-    "id": "a92f49c6.640148",
+    "id": "a546871e.5bfa7",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5249.566665649414,
-    "y": 6984,
-    "z": "8bc654d2.f0dde",
+    "x": 5285.566665649414,
+    "y": 7028.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8c69c55b.110248",
+    "id": "9d07c8b0.2ee89",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5982.566635131836,
-    "y": 6989.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6018.566635131836,
+    "y": 7034.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aeda0706.1d102",
-        "4b6f312b.4e491",
-        "eebb4557.9c03c"
+        "90c25785.3a5d5",
+        "b664359c.e37a3",
+        "9e3c844f.310898"
       ]
     ]
   },
   {
-    "id": "ca7dd8b0.fcddf",
+    "id": "8461f132.9df9d8",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6367.566635131836,
-    "y": 6952.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6403.566635131836,
+    "y": 6997.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eebb4557.9c03c",
+    "id": "9e3c844f.310898",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6337.566635131836,
-    "y": 7012.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6373.566635131836,
+    "y": 7057.566635131836,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "aeda0706.1d102",
+    "id": "90c25785.3a5d5",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 6244.566635131836,
-    "y": 6840.999969482422,
-    "z": "8bc654d2.f0dde",
+    "x": 6280.566635131836,
+    "y": 6885.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6c4c0ada.7452e4",
+    "id": "ba444b0.6d090b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3980.566665649414,
-    "y": 5898,
-    "z": "8bc654d2.f0dde",
+    "x": 4016.566665649414,
+    "y": 5942.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5829dcc0.7722b4",
-        "b6d8895e.58d1b",
-        "c1456abb.063048",
-        "da4c1b48.fae9f8",
-        "778aa80b.aa4e1"
+        "d715f85a.00ec7",
+        "8228476b.dfc93",
+        "394125b3.b0b57a",
+        "64250c00.f41444",
+        "b4d97863.c15da"
       ]
     ]
   },
   {
-    "id": "146e3d98.17031a",
+    "id": "c0768f56.37d61",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4722.566665649414,
-    "y": 6300,
-    "z": "8bc654d2.f0dde",
+    "x": 4758.566665649414,
+    "y": 6344.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1492db48.4787f5",
+    "id": "5a9ba33a.7d1a8c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4850.566665649414,
-    "y": 6042,
-    "z": "8bc654d2.f0dde",
+    "x": 4886.566665649414,
+    "y": 6086.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "cc643bc5.4660a",
+    "id": "42948c30.98f5ec",
     "type": "comment",
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "comments": "",
-    "x": 4987.566665649414,
-    "y": 5992,
-    "z": "8bc654d2.f0dde",
+    "x": 5023.566665649414,
+    "y": 6036.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eb6eb29c.21a438",
+    "id": "550c2be9.9018d4",
     "type": "save",
     "name": "save ROOT UNI in AAI",
     "xml": "<save 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='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='type' value='root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3814.566665649414,
-    "y": 3385,
-    "z": "8bc654d2.f0dde",
+    "x": 3850.566665649414,
+    "y": 3429.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3ddb9817.a2345",
+    "id": "371edf0a.6e17f",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3992.566635131836,
-    "y": 1619.9999694824219,
-    "z": "8bc654d2.f0dde",
+    "x": 4028.566635131836,
+    "y": 1664.566635131836,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "87712f4d.617c48",
+    "id": "de567305.4a43d8",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3971.566604614258,
-    "y": 2131.9999389648438,
-    "z": "8bc654d2.f0dde",
+    "x": 4007.566604614258,
+    "y": 2176.566604614258,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4a9500be.eb8d5",
+    "id": "25146472.eb3624",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3806.566665649414,
-    "y": 4006,
-    "z": "8bc654d2.f0dde",
+    "x": 3842.566665649414,
+    "y": 4050.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1cb779c6.3641ce",
+    "id": "c5539a8b.106aa",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3896.566665649414,
-    "y": 6386,
-    "z": "8bc654d2.f0dde",
+    "x": 3932.566665649414,
+    "y": 6430.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "316110e0.e54cc",
+    "id": "e9491637.d51c9",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3698.566665649414,
-    "y": 4915,
-    "z": "8bc654d2.f0dde",
+    "x": 3734.566665649414,
+    "y": 4959.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b160de6d.e8ced8",
+    "id": "ed589f33.dee34",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3831.566665649414,
-    "y": 4963,
-    "z": "8bc654d2.f0dde",
+    "x": 3867.566665649414,
+    "y": 5007.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f0982e54.06c37",
+    "id": "ea96eb7.ae6d798",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4377.566665649414,
-    "y": 4591,
-    "z": "8bc654d2.f0dde",
+    "x": 4413.566665649414,
+    "y": 4635.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c8f13ad.170ba48",
-        "e5fec2af.744f18"
+        "a8f10916.be28b",
+        "f59d19a8.d9c4d8"
       ]
     ]
   },
   {
-    "id": "c8f13ad.170ba48",
+    "id": "a8f10916.be28b",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4570.566665649414,
-    "y": 4592,
-    "z": "8bc654d2.f0dde",
+    "x": 4606.566665649414,
+    "y": 4636.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7d8426b0.28b2e8"
+        "f728dec2.62b3a"
       ]
     ]
   },
   {
-    "id": "e5fec2af.744f18",
+    "id": "f59d19a8.d9c4d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4574.566665649414,
-    "y": 4636,
-    "z": "8bc654d2.f0dde",
+    "x": 4610.566665649414,
+    "y": 4680.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bbb62c5.19c455"
+        "c09bd16a.0b32d"
       ]
     ]
   },
   {
-    "id": "bbb62c5.19c455",
+    "id": "c09bd16a.0b32d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4713.566665649414,
-    "y": 4631,
-    "z": "8bc654d2.f0dde",
+    "x": 4749.566665649414,
+    "y": 4675.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fdbb486.bd6db38",
-        "ecce0ba1.70791",
-        "5cdec210.c3723c"
+        "d9114bfc.f7bce",
+        "6c2541da.5d16b8",
+        "b22f3c73.35c508"
       ]
     ]
   },
   {
-    "id": "7d8426b0.28b2e8",
+    "id": "f728dec2.62b3a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4713.566665649414,
-    "y": 4588,
-    "z": "8bc654d2.f0dde",
+    "x": 4749.566665649414,
+    "y": 4632.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5a0b429f.b8f42c",
-        "5930a956.25a2b",
-        "8f7ba394.827068",
-        "4161f07f.2b4a78"
+        "df003672.bddd2",
+        "dbb46179.c47f78",
+        "837adbb2.1c01e8",
+        "e8bdf848.077f2"
       ]
     ]
   },
   {
-    "id": "fdbb486.bd6db38",
+    "id": "d9114bfc.f7bce",
     "type": "set",
     "name": "set prop.connectivity-domainA-uuid",
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5115.566909790039,
-    "y": 4853,
-    "z": "8bc654d2.f0dde",
+    "x": 5151.566909790039,
+    "y": 4897.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1b42c685.843199",
+    "id": "430a9d16.e4affc",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5122.566909790039,
-    "y": 4807,
-    "z": "8bc654d2.f0dde",
+    "x": 5158.566909790039,
+    "y": 4851.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4433eaac.652284",
+    "id": "68c1a73b.58dcd8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4912.566665649414,
-    "y": 6586,
-    "z": "8bc654d2.f0dde",
+    "x": 4948.566665649414,
+    "y": 6630.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ecce0ba1.70791",
+    "id": "6c2541da.5d16b8",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5233.566909790039,
-    "y": 4895,
-    "z": "8bc654d2.f0dde",
+    "x": 5269.566909790039,
+    "y": 4939.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "31466e0d.9a3dba",
+    "id": "5f4b3cc4.eb62f4",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5108.566665649414,
-    "y": 5153,
-    "z": "8bc654d2.f0dde",
+    "x": 5144.566665649414,
+    "y": 5197.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7cb9f6d.ac734",
+    "id": "c7484b6a.1b27e8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3453.566665649414,
-    "y": 4486,
-    "z": "8bc654d2.f0dde",
+    "x": 3489.566665649414,
+    "y": 4530.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "9ba8b5cc.a415f",
+    "id": "8eb23d5.90166c",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3975.566665649414,
-    "y": 4587,
-    "z": "8bc654d2.f0dde",
+    "x": 4011.566665649414,
+    "y": 4631.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "595e7f4b.3b8bd8",
+    "id": "8bbbb496.3df16",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3432.566665649414,
-    "y": 4530,
-    "z": "8bc654d2.f0dde",
+    "x": 3468.566665649414,
+    "y": 4574.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2a6568f7.a02838",
-        "9843c265.208d4",
-        "db80e493.f550d"
+        "a18c125a.02e14",
+        "7f2705d6.db1694",
+        "a9eb2c91.698e38"
       ]
     ]
   },
   {
-    "id": "9843c265.208d4",
+    "id": "7f2705d6.db1694",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3621.057632446289,
-    "y": 4498.57421875,
-    "z": "8bc654d2.f0dde",
+    "x": 3657.057632446289,
+    "y": 4543.140884399414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d1fd8036.140ed8"
+        "2e3353bd.ee574c"
       ]
     ]
   },
   {
-    "id": "db80e493.f550d",
+    "id": "a9eb2c91.698e38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3609.566665649414,
-    "y": 4538,
-    "z": "8bc654d2.f0dde",
+    "x": 3645.566665649414,
+    "y": 4582.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b0bc7666.9d27d8"
+        "5c8fdc07.865394"
       ]
     ]
   },
   {
-    "id": "d1fd8036.140ed8",
+    "id": "2e3353bd.ee574c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3780.629165649414,
-    "y": 4496.85986328125,
-    "z": "8bc654d2.f0dde",
+    "x": 3816.629165649414,
+    "y": 4541.426528930664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b0bc7666.9d27d8",
+    "id": "5c8fdc07.865394",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3770.566665649414,
-    "y": 4539,
-    "z": "8bc654d2.f0dde",
+    "x": 3806.566665649414,
+    "y": 4583.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "aa03472e.31d4e8",
+    "id": "9ccbfbe.3763808",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3772.566665649414,
-    "y": 4583,
-    "z": "8bc654d2.f0dde",
+    "x": 3808.566665649414,
+    "y": 4627.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4ba9a34f.8b45e4",
-        "9ba8b5cc.a415f"
+        "b718fb4d.1d2eb",
+        "8eb23d5.90166c"
       ]
     ]
   },
   {
-    "id": "2a6568f7.a02838",
+    "id": "a18c125a.02e14",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3614.566665649414,
-    "y": 4575,
-    "z": "8bc654d2.f0dde",
+    "x": 3650.566665649414,
+    "y": 4619.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aa03472e.31d4e8"
+        "9ccbfbe.3763808"
       ]
     ]
   },
   {
-    "id": "4ba9a34f.8b45e4",
+    "id": "b718fb4d.1d2eb",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3933.566665649414,
-    "y": 4515,
-    "z": "8bc654d2.f0dde",
+    "x": 3969.566665649414,
+    "y": 4559.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8bf8bc6f.53ce6",
+    "id": "581d9366.e6ee44",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3798.566665649414,
-    "y": 4854,
-    "z": "8bc654d2.f0dde",
+    "x": 3834.566665649414,
+    "y": 4898.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "d58a2a07.e32878",
+    "id": "3bda63fd.be934c",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5913.449966430664,
-    "y": 6603.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5949.449966430664,
+    "y": 6648.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5cdec210.c3723c",
+    "id": "b22f3c73.35c508",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5113.233901977539,
-    "y": 4991.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5149.233901977539,
+    "y": 5035.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "7d691c73.0a445c",
+    "id": "72bb0449.7c6c4c",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5115.450698852539,
-    "y": 4950.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5151.450698852539,
+    "y": 4995.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "19c788e0.a62557",
+    "id": "76c11af1.9e9b94",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4989.233657836914,
-    "y": 5241.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5025.233657836914,
+    "y": 5285.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b53673c2.40ae68",
+    "id": "9cb7b649.72fc8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4991.450454711914,
-    "y": 5200.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5027.450454711914,
+    "y": 5245.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cb99e55a.09312",
+    "id": "ac700fc2.3e2c98",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5079.033462524414,
-    "y": 5603.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5115.033462524414,
+    "y": 5648.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b6bbe449.e349b8",
+    "id": "9aeab5a.07483c8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4906.033462524414,
-    "y": 5660.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 4942.033462524414,
+    "y": 5705.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9f020db8.9d3b98",
-        "42fb1006.cd98b"
+        "7adad055.f81858",
+        "1c623aa1.b56e9d"
       ]
     ]
   },
   {
-    "id": "9f020db8.9d3b98",
+    "id": "7adad055.f81858",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5117.033462524414,
-    "y": 5660.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5153.033462524414,
+    "y": 5705.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "406d3b53.ee3654"
+        "8b4d22b1.51563"
       ]
     ]
   },
   {
-    "id": "42fb1006.cd98b",
+    "id": "1c623aa1.b56e9d",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5113.033462524414,
-    "y": 5708.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5149.033462524414,
+    "y": 5753.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fa70895e.520cf8"
+        "1d139b8d.b9ffb4"
       ]
     ]
   },
   {
-    "id": "406d3b53.ee3654",
+    "id": "8b4d22b1.51563",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5273.033462524414,
-    "y": 5656.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5309.033462524414,
+    "y": 5701.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8249d2ac.0a73f8",
-        "2838a041.93c678",
-        "45d14641.c6458"
+        "f5948089.056778",
+        "eda1ec63.f88a8",
+        "116803c1.b8c5c4"
       ]
     ]
   },
   {
-    "id": "fa70895e.520cf8",
+    "id": "1d139b8d.b9ffb4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 5261.033462524414,
-    "y": 5703.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5297.033462524414,
+    "y": 5748.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "f332f23.f01a81",
+    "id": "fa3077ab.1dba8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5582.917251586914,
-    "y": 5757.39990234375,
-    "z": "8bc654d2.f0dde",
+    "x": 5618.917251586914,
+    "y": 5801.966567993164,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "45d14641.c6458",
+    "id": "116803c1.b8c5c4",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5586.700454711914,
-    "y": 5795.60009765625,
-    "z": "8bc654d2.f0dde",
+    "x": 5622.700454711914,
+    "y": 5840.166763305664,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "2838a041.93c678",
+    "id": "eda1ec63.f88a8",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5693.033462524414,
-    "y": 5708.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5729.033462524414,
+    "y": 5753.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "8249d2ac.0a73f8",
+    "id": "f5948089.056778",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5577.033462524414,
-    "y": 5656.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5613.033462524414,
+    "y": 5701.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "3aa78165.d5c51e",
+    "id": "d30afa49.07b758",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4968.033462524414,
-    "y": 5561.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 5004.033462524414,
+    "y": 5606.083267211914,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5e482e7e.e4be78",
+    "id": "221756d1.77b252",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4680.366470336914,
-    "y": 5736.5166015625,
-    "z": "8bc654d2.f0dde",
+    "x": 4716.366470336914,
+    "y": 5781.083267211914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "cb99e55a.09312",
-        "b6bbe449.e349b8",
-        "5021b590.5d75e4",
-        "316a2790.87ce5"
+        "ac700fc2.3e2c98",
+        "9aeab5a.07483c8",
+        "986cd5c9.02e9d",
+        "cfe4284f.245dc"
       ]
     ]
   },
   {
-    "id": "b03c5831.d4c5f",
+    "id": "6b274a0f.281994",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 4980.399673461914,
-    "y": 6097.2001953125,
-    "z": "8bc654d2.f0dde",
+    "x": 5016.399673461914,
+    "y": 6141.766860961914,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b60a5a20.1568d",
+    "id": "9356e875.de45c8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5786.683334350586,
-    "y": 6934.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5822.683334350586,
+    "y": 6978.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "fe65cd53.d11278",
+    "id": "4274d693.44e7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5405.683334350586,
-    "y": 6937.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5441.683334350586,
+    "y": 6981.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b60a5a20.1568d",
-        "364f2ed4.be66d2",
-        "3daa885e.628288"
+        "9356e875.de45c8",
+        "f4fb32f5.290118",
+        "fc73441.6e16238"
       ]
     ]
   },
   {
-    "id": "364f2ed4.be66d2",
+    "id": "f4fb32f5.290118",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5631.683334350586,
-    "y": 6989.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5667.683334350586,
+    "y": 7033.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f12c870.4650c"
+        "7d48e95d.36571"
       ]
     ]
   },
   {
-    "id": "1f12c870.4650c",
+    "id": "7d48e95d.36571",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5810.683334350586,
-    "y": 6988.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5846.683334350586,
+    "y": 7032.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8c69c55b.110248"
+        "9d07c8b0.2ee89"
       ]
     ]
   },
   {
-    "id": "3daa885e.628288",
+    "id": "fc73441.6e16238",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 5632.683334350586,
-    "y": 6882.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 5668.683334350586,
+    "y": 6926.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "651f3c1e.ddf684",
+    "id": "c7583bfe.6dbd",
     "type": "notify",
     "name": "notify",
     "xml": "<notify plugin='' resource='' action='' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2626.683334350586,
-    "y": 931.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 2662.683334350586,
+    "y": 975.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "f71bee39.3d2f68",
+    "id": "17e6527f.ea49de",
     "type": "set",
     "name": "set network-route-three",
     "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
     "comments": "",
-    "x": 3304.683334350586,
-    "y": 707.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3340.683334350586,
+    "y": 751.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1f090c0d.f20bac",
+    "id": "4ef95e12.fd687",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3520.683334350586,
-    "y": 1035.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3556.683334350586,
+    "y": 1079.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c96009f.d63af8",
+    "id": "76cbe80c.f4e188",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3516.192398071289,
-    "y": 1077.542724609375,
-    "z": "8bc654d2.f0dde",
+    "x": 3552.192398071289,
+    "y": 1122.109390258789,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "30702b44.ca2744",
+    "id": "2e93ec7e.d04c6c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3520.192367553711,
-    "y": 1125.5426940917969,
-    "z": "8bc654d2.f0dde",
+    "x": 3556.192367553711,
+    "y": 1170.109359741211,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f0fe90c1.1ee158"
+        "b4c3abcb.bb0aa8"
       ]
     ]
   },
   {
-    "id": "f0fe90c1.1ee158",
+    "id": "b4c3abcb.bb0aa8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3677.683334350586,
-    "y": 1125.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3713.683334350586,
+    "y": 1169.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "24f554c8.25b494"
+        "c59d6859.c80d1"
       ]
     ]
   },
   {
-    "id": "24f554c8.25b494",
+    "id": "c59d6859.c80d1",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3847.683364868164,
-    "y": 1128.1168212890625,
-    "z": "8bc654d2.f0dde",
+    "x": 3883.683364868164,
+    "y": 1172.6834869384766,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "92b753af.8b83b",
-        "e0d04b94.0a949",
-        "3f783acd.f1212e"
+        "b806c285.3c1eb",
+        "1890bb58.2d4ee5",
+        "614f0a7f.a53cf4"
       ]
     ]
   },
   {
-    "id": "92b753af.8b83b",
+    "id": "b806c285.3c1eb",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4021.683334350586,
-    "y": 1066.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4057.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "34be9217.24bb7e"
+        "224fa1be.62b94e"
       ]
     ]
   },
   {
-    "id": "e0d04b94.0a949",
+    "id": "1890bb58.2d4ee5",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4023.683334350586,
-    "y": 1120.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4059.683334350586,
+    "y": 1164.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1a5ec0d1.1d1527"
+        "5ec2cf4e.ba2b2"
       ]
     ]
   },
   {
-    "id": "34be9217.24bb7e",
+    "id": "224fa1be.62b94e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4149.683334350586,
-    "y": 1066.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4185.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c2e9a46e.2fa128",
-        "d3171aa3.cb0078"
+        "a900cf11.02bcd",
+        "1c2b8eb2.2e6009"
       ]
     ]
   },
   {
-    "id": "1a5ec0d1.1d1527",
+    "id": "5ec2cf4e.ba2b2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4152.683334350586,
-    "y": 1119.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4188.683334350586,
+    "y": 1163.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1fb8ea51.9b1c8e",
-        "b9df456c.24fc38"
+        "459af4e0.72f56c",
+        "8371ef21.19884"
       ]
     ]
   },
   {
-    "id": "d3171aa3.cb0078",
+    "id": "1c2b8eb2.2e6009",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4310.683334350586,
-    "y": 1090.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4346.683334350586,
+    "y": 1134.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1fb8ea51.9b1c8e",
+    "id": "459af4e0.72f56c",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4327.683334350586,
-    "y": 1132.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4363.683334350586,
+    "y": 1176.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b9df456c.24fc38",
+    "id": "8371ef21.19884",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4312.683334350586,
-    "y": 1170.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4348.683334350586,
+    "y": 1214.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c2e9a46e.2fa128",
+    "id": "a900cf11.02bcd",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4324.683334350586,
-    "y": 1050.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4360.683334350586,
+    "y": 1094.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "dc69c361.915968",
+    "id": "f4867be8.a3739",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4489.683334350586,
-    "y": 1066.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4525.683334350586,
+    "y": 1110.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6cb3b80a.d81b1",
+    "id": "c22e8ab9.0a6b88",
     "type": "save",
     "name": "get network-route-three from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
     "comments": "",
     "outputs": 1,
-    "x": 3280.683334350586,
-    "y": 1052.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3316.683334350586,
+    "y": 1096.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f090c0d.f20bac",
-        "4c96009f.d63af8",
-        "30702b44.ca2744"
+        "4ef95e12.fd687",
+        "76cbe80c.f4e188",
+        "2e93ec7e.d04c6c"
       ]
     ]
   },
   {
-    "id": "3f783acd.f1212e",
+    "id": "614f0a7f.a53cf4",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3966.683334350586,
-    "y": 1184.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4002.683334350586,
+    "y": 1228.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ce69203c.a7c0d"
+        "7f1b4232.b1cfb4"
       ]
     ]
   },
   {
-    "id": "ce69203c.a7c0d",
+    "id": "7f1b4232.b1cfb4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4140.683334350586,
-    "y": 1179.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4176.683334350586,
+    "y": 1223.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "77a19b24.92e3d4",
-        "6c3b4ea8.3b622"
+        "838abc45.59f7a",
+        "db00c52c.5ed268"
       ]
     ]
   },
   {
-    "id": "6c3b4ea8.3b622",
+    "id": "db00c52c.5ed268",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4310.683334350586,
-    "y": 1252.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4346.683334350586,
+    "y": 1296.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "77a19b24.92e3d4",
+    "id": "838abc45.59f7a",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4364.683334350586,
-    "y": 1212.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4400.683334350586,
+    "y": 1256.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "a7c6adcc.5c3908",
+    "id": "ff2b32b5.5b2a08",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4478.683334350586,
-    "y": 1237.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4514.683334350586,
+    "y": 1281.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cb966d3f.bcf358",
+    "id": "56529717.d57cf",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4037.683334350586,
-    "y": 940.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4073.683334350586,
+    "y": 984.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "359af935.19ef46"
+        "ee2de2c6.4f08d8"
       ]
     ]
   },
   {
-    "id": "ca572ac1.2b94f8",
+    "id": "ca426e77.b8a868",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4381.683334350586,
-    "y": 1008.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4417.683334350586,
+    "y": 1052.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "60fff9bd.2ccfe",
+    "id": "f04a072d.a1bc78",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4435.683334350586,
-    "y": 968.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4471.683334350586,
+    "y": 1012.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "74e2fab5.3910b4",
+    "id": "494ac499.527a64",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4579.683334350586,
-    "y": 997.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4615.683334350586,
+    "y": 1041.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "359af935.19ef46",
+    "id": "ee2de2c6.4f08d8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4211.683334350586,
-    "y": 935.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4247.683334350586,
+    "y": 979.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "60fff9bd.2ccfe",
-        "ca572ac1.2b94f8"
+        "f04a072d.a1bc78",
+        "ca426e77.b8a868"
       ]
     ]
   },
   {
-    "id": "dd62b4eb.26fb1",
+    "id": "fbdccf10.5fabc",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4097.683334350586,
-    "y": 678.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4133.683334350586,
+    "y": 722.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "eaab099.c2c5e78"
+        "b0420846.4df49"
       ]
     ]
   },
   {
-    "id": "44f31aac.78bf4c",
+    "id": "6f89ab47.26e854",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4441.683334350586,
-    "y": 746.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4477.683334350586,
+    "y": 790.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "e00b5614.1b212",
+    "id": "bf3e885.5679178",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4495.683334350586,
-    "y": 706.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4531.683334350586,
+    "y": 750.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fb8145.224d2eb8",
+    "id": "fd3136c3.1f9f9",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4609.683334350586,
-    "y": 731.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4645.683334350586,
+    "y": 775.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eaab099.c2c5e78",
+    "id": "b0420846.4df49",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4271.683334350586,
-    "y": 673.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 4307.683334350586,
+    "y": 717.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e00b5614.1b212",
-        "44f31aac.78bf4c"
+        "bf3e885.5679178",
+        "6f89ab47.26e854"
       ]
     ]
   },
   {
-    "id": "47b6d6c0.771098",
+    "id": "d5e167ce.f19998",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3678.683334350586,
-    "y": 2555.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3714.683334350586,
+    "y": 2599.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d5c762a3.e1b22",
-        "cd80f814.c17fb8"
+        "eb74e655.05ff7",
+        "e886ebc1.1661e8"
       ]
     ]
   },
   {
-    "id": "6a53c92c.c39ad8",
+    "id": "47201997.7cc3c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3506.016830444336,
-    "y": 2556.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3542.016830444336,
+    "y": 2600.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "47b6d6c0.771098"
+        "d5e167ce.f19998"
       ]
     ]
   },
   {
-    "id": "15ee64d.915489b",
+    "id": "164be473.b70384",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3515.507797241211,
-    "y": 2598.690704345703,
-    "z": "8bc654d2.f0dde",
+    "x": 3551.507797241211,
+    "y": 2643.257369995117,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "ffc72b13.54b308",
+    "id": "784aa04.7c1dfe",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3504.016830444336,
-    "y": 2645.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3540.016830444336,
+    "y": 2689.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5c762a3.e1b22",
+    "id": "eb74e655.05ff7",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3965.016830444336,
-    "y": 2559.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4001.016830444336,
+    "y": 2603.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "39f97b3f.483dec",
-        "a10b377c.8904d8"
+        "3f64df6c.c641f8",
+        "e65de275.42f878"
       ]
     ]
   },
   {
-    "id": "a10b377c.8904d8",
+    "id": "e65de275.42f878",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4188.016830444336,
-    "y": 2514.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4224.016830444336,
+    "y": 2558.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1c79745.54c4b0c"
+        "34b4944b.960704"
       ]
     ]
   },
   {
-    "id": "39f97b3f.483dec",
+    "id": "3f64df6c.c641f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4190.016830444336,
-    "y": 2578.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4226.016830444336,
+    "y": 2622.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5e26eb53.994624"
+        "699d84d7.6602fc"
       ]
     ]
   },
   {
-    "id": "59ced5c4.1cbb54",
+    "id": "9c75cfb6.9dae68",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3278.016830444336,
-    "y": 2591.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3314.016830444336,
+    "y": 2635.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "6a53c92c.c39ad8",
-        "15ee64d.915489b",
-        "ffc72b13.54b308"
+        "47201997.7cc3c",
+        "164be473.b70384",
+        "784aa04.7c1dfe"
       ]
     ]
   },
   {
-    "id": "bf53a639.73b6d8",
+    "id": "23b8fd1e.0cb2fa",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3239.016830444336,
-    "y": 2535.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3275.016830444336,
+    "y": 2579.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "7411f30.15b1c8c",
+    "id": "647f2e19.e50158",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3298.016830444336,
-    "y": 2331.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3334.016830444336,
+    "y": 2375.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "dd801267.ae8a78",
-        "2c468159.26cb9e"
+        "5e42c344.eae60c",
+        "af9299b9.b3a958"
       ]
     ]
   },
   {
-    "id": "2c468159.26cb9e",
+    "id": "af9299b9.b3a958",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3521.016830444336,
-    "y": 2317.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3557.016830444336,
+    "y": 2361.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f5c2f54.7e50d9"
+        "9102a653.17d73"
       ]
     ]
   },
   {
-    "id": "dd801267.ae8a78",
+    "id": "5e42c344.eae60c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3523.016830444336,
-    "y": 2350.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3559.016830444336,
+    "y": 2394.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "1f5c2f54.7e50d9",
+    "id": "9102a653.17d73",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3669.016830444336,
-    "y": 2310.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3705.016830444336,
+    "y": 2354.683334350586,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "33d7ee91.be9492",
-        "2cd16653.cccd12"
+        "9818833d.58ad9",
+        "288d55d1.6f744a"
       ]
     ]
   },
   {
-    "id": "33d7ee91.be9492",
+    "id": "9818833d.58ad9",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3863.016830444336,
-    "y": 2313.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 3899.016830444336,
+    "y": 2357.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "cd80f814.c17fb8",
+    "id": "e886ebc1.1661e8",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3916.016799926758,
-    "y": 2682.1166381835938,
-    "z": "8bc654d2.f0dde",
+    "x": 3952.016799926758,
+    "y": 2726.683303833008,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f197c90a.b0bfd8"
+        "f013a1b2.101138"
       ]
     ]
   },
   {
-    "id": "f197c90a.b0bfd8",
+    "id": "f013a1b2.101138",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4122.016799926758,
-    "y": 2682.1166381835938,
-    "z": "8bc654d2.f0dde",
+    "x": 4158.016799926758,
+    "y": 2726.683303833008,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ee87c14f.7e00c8"
+        "386bba62.16259e"
       ]
     ]
   },
   {
-    "id": "2cd16653.cccd12",
+    "id": "288d55d1.6f744a",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3885.016830444336,
-    "y": 2381.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 3921.016830444336,
+    "y": 2425.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b86ed6f1.7f482",
-        "f1a441ce.e5665",
-        "de4f03bc.b1dad"
+        "50cea31f.42d1c4",
+        "35a7b03.f8d85d",
+        "21702f57.67315"
       ]
     ]
   },
   {
-    "id": "b86ed6f1.7f482",
+    "id": "50cea31f.42d1c4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.5169525146484,
-    "y": 2333.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4116.516952514648,
+    "y": 2377.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4728dd3.dc78424"
+        "295cc726.ea872"
       ]
     ]
   },
   {
-    "id": "f1a441ce.e5665",
+    "id": "35a7b03.f8d85d",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4072.5169525146484,
-    "y": 2388.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4108.516952514648,
+    "y": 2432.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "250a014d.a07c5e"
+        "2c7fef61.a7451"
       ]
     ]
   },
   {
-    "id": "de4f03bc.b1dad",
+    "id": "21702f57.67315",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4077.5169525146484,
-    "y": 2445.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4113.516952514648,
+    "y": 2489.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c4850afb.039ba"
+        "9bbdca0e.a0cf58"
       ]
     ]
   },
   {
-    "id": "c4850afb.039ba",
+    "id": "9bbdca0e.a0cf58",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4229.516952514648,
-    "y": 2446.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4265.516952514648,
+    "y": 2490.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4728dd3.dc78424",
+    "id": "295cc726.ea872",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4224.899276733398,
-    "y": 2330.7724609375,
-    "z": "8bc654d2.f0dde",
+    "x": 4260.899276733398,
+    "y": 2375.339126586914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f5f74636.92701"
+        "723c9a0.e71c268"
       ]
     ]
   },
   {
-    "id": "b2338e3d.f752e8",
+    "id": "9a8ce081.e6446",
     "type": "set",
     "name": "set SECONDARY-ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
     "comments": "",
-    "x": 3300.683334350586,
-    "y": 2670.116668701172,
-    "z": "8bc654d2.f0dde",
+    "x": 3336.683334350586,
+    "y": 2714.683334350586,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "b3bc28cb.23625",
+    "id": "c2ddeb07.7a6948",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3975.683303833008,
-    "y": 2634.1166381835938,
-    "z": "8bc654d2.f0dde",
+    "x": 4011.683303833008,
+    "y": 2678.683303833008,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5e26eb53.994624",
+    "id": "699d84d7.6602fc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4349.016830444336,
-    "y": 2597.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4385.016830444336,
+    "y": 2641.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "1c79745.54c4b0c",
+    "id": "34b4944b.960704",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4353.016830444336,
-    "y": 2511.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4389.016830444336,
+    "y": 2555.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fe7cdeb0.daac9",
-        "34c0d4b1.5c7dfc"
+        "276189b1.3ed3ce",
+        "a978fa30.e2e848"
       ]
     ]
   },
   {
-    "id": "ee87c14f.7e00c8",
+    "id": "386bba62.16259e",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4339.302444458008,
-    "y": 2680.9384155273438,
-    "z": "8bc654d2.f0dde",
+    "x": 4375.302444458008,
+    "y": 2725.505081176758,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fc8a72d4.98e42"
+        "89559da6.e6cb3"
       ]
     ]
   },
   {
-    "id": "250a014d.a07c5e",
+    "id": "2c7fef61.a7451",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4240.516952514648,
-    "y": 2391.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4276.516952514648,
+    "y": 2435.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fe7cdeb0.daac9",
+    "id": "276189b1.3ed3ce",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
     "comments": "",
-    "x": 4523.016830444336,
-    "y": 2472.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4559.016830444336,
+    "y": 2516.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "34c0d4b1.5c7dfc",
+    "id": "a978fa30.e2e848",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
     "comments": "",
-    "x": 4524.016830444336,
-    "y": 2577.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4560.016830444336,
+    "y": 2621.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "6a8cd207.c1e8c4",
+    "id": "1a2899c1.f9127e",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4519.016830444336,
-    "y": 2526.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4555.016830444336,
+    "y": 2570.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "fc8a72d4.98e42",
+    "id": "89559da6.e6cb3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4546.133987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4582.133987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8f4cacd5.ce6228",
-        "4e56644.a64779c",
-        "68f649.e92691b8"
+        "8f483fd3.15e2b",
+        "5a0d7606.c42ec8",
+        "f5ace162.1d1728"
       ]
     ]
   },
   {
-    "id": "8f4cacd5.ce6228",
+    "id": "8f483fd3.15e2b",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4761.133987426758,
-    "y": 2632.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4797.133987426758,
+    "y": 2677.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "4e56644.a64779c",
+    "id": "5a0d7606.c42ec8",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4758.133987426758,
-    "y": 2671.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4794.133987426758,
+    "y": 2716.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9a6ae8ae.1adf3"
+        "be061b72.c7b818"
       ]
     ]
   },
   {
-    "id": "68f649.e92691b8",
+    "id": "f5ace162.1d1728",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4713.633987426758,
-    "y": 2713.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4749.633987426758,
+    "y": 2758.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d8d22b92.e3f9c8",
+    "id": "b11d681f.057f4",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4807.016830444336,
-    "y": 2349.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4843.016830444336,
+    "y": 2393.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8d5de697.738fb"
+        "530fa7ff.bc17d"
       ]
     ]
   },
   {
-    "id": "f5f74636.92701",
+    "id": "723c9a0.e71c268",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4409.016830444336,
-    "y": 2345.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4445.016830444336,
+    "y": 2389.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "458de584.eb17d4"
+        "46b1f311.91a404"
       ]
     ]
   },
   {
-    "id": "458de584.eb17d4",
+    "id": "46b1f311.91a404",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4604.016830444336,
-    "y": 2345.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4640.016830444336,
+    "y": 2389.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d8d22b92.e3f9c8",
-        "aa17b1cc.ebb808"
+        "b11d681f.057f4",
+        "6f790d02.3c377c"
       ]
     ]
   },
   {
-    "id": "aa17b1cc.ebb808",
+    "id": "6f790d02.3c377c",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4809.016830444336,
-    "y": 2422.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 4845.016830444336,
+    "y": 2466.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "74ed71f8.f337d8"
+        "e6043cfa.36703"
       ]
     ]
   },
   {
-    "id": "9a6ae8ae.1adf3",
+    "id": "be061b72.c7b818",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4938.633987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 4974.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "48cbb65c.c75f18"
+        "ce777f2e.3171a8"
       ]
     ]
   },
   {
-    "id": "48cbb65c.c75f18",
+    "id": "ce777f2e.3171a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5096.633987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 5132.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5d1f9a1.a44f9e4"
+        "b697c93d.c44198"
       ]
     ]
   },
   {
-    "id": "5d1f9a1.a44f9e4",
+    "id": "b697c93d.c44198",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5303.633987426758,
-    "y": 2670.4570922851562,
-    "z": "8bc654d2.f0dde",
+    "x": 5339.633987426758,
+    "y": 2715.0237579345703,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8d5de697.738fb",
+    "id": "530fa7ff.bc17d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4984.016830444336,
-    "y": 2341.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5020.016830444336,
+    "y": 2385.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "557f2b2a.e4488c",
-        "b7eb9cb4.7bd228"
+        "5455e2bb.51abf4",
+        "38fcf2b0.31bbc6"
       ]
     ]
   },
   {
-    "id": "b7eb9cb4.7bd228",
+    "id": "38fcf2b0.31bbc6",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5192.016830444336,
-    "y": 2348.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5228.016830444336,
+    "y": 2392.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2cc0f80f.8e664",
-        "e33c4c36.9c6408",
-        "decf6255.02de4"
+        "46db257f.be5d5c",
+        "10ef5dcf.987c42",
+        "cdb4ea9.23d2198"
       ]
     ]
   },
   {
-    "id": "74ed71f8.f337d8",
+    "id": "e6043cfa.36703",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4986.016830444336,
-    "y": 2414.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5022.016830444336,
+    "y": 2458.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ddc00f08.8fee3"
+        "dba257b1.4bfa28"
       ]
     ]
   },
   {
-    "id": "557f2b2a.e4488c",
+    "id": "5455e2bb.51abf4",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainC id",
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5222.016830444336,
-    "y": 2296.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5258.016830444336,
+    "y": 2340.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "ddc00f08.8fee3",
+    "id": "dba257b1.4bfa28",
     "type": "set",
     "name": "set domainC ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5221.016830444336,
-    "y": 2538.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5257.016830444336,
+    "y": 2582.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "2cc0f80f.8e664",
+    "id": "46db257f.be5d5c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.016830444336,
-    "y": 2339.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5438.016830444336,
+    "y": 2383.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aada8b04.37bbe"
+        "40633d04.a1b504"
       ]
     ]
   },
   {
-    "id": "e33c4c36.9c6408",
+    "id": "10ef5dcf.987c42",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5394.016830444336,
-    "y": 2394.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5430.016830444336,
+    "y": 2438.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "52b0fc34.6385e4"
+        "7af2b98b.8d665"
       ]
     ]
   },
   {
-    "id": "decf6255.02de4",
+    "id": "cdb4ea9.23d2198",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5399.016830444336,
-    "y": 2451.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5435.016830444336,
+    "y": 2495.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1d0f9aee.0f2085"
+        "f683ae7d.1eb048"
       ]
     ]
   },
   {
-    "id": "1d0f9aee.0f2085",
+    "id": "f683ae7d.1eb048",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5551.016830444336,
-    "y": 2452.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5587.016830444336,
+    "y": 2496.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "52b0fc34.6385e4",
+    "id": "7af2b98b.8d665",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5562.016830444336,
-    "y": 2397.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5598.016830444336,
+    "y": 2441.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "aada8b04.37bbe",
+    "id": "40633d04.a1b504",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5546.399154663086,
-    "y": 2336.7724609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5582.399154663086,
+    "y": 2381.339126586914,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b0a8403b.df77f8"
+        "8b20e4dc.c76628"
       ]
     ]
   },
   {
-    "id": "b0a8403b.df77f8",
+    "id": "8b20e4dc.c76628",
     "type": "set",
     "name": "set controller domainC data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5761.016830444336,
-    "y": 2333.1167907714844,
-    "z": "8bc654d2.f0dde",
+    "x": 5797.016830444336,
+    "y": 2377.6834564208984,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8b07e19d.5f94",
+    "id": "c989c621.8b708",
     "type": "switchNode",
     "name": "switch secondary empty?",
     "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3274.683334350586,
-    "y": 806.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3310.683334350586,
+    "y": 850.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "ba76d6d3.05fe9",
-        "fe627d30.e07a9"
+        "c25ccae3.59498",
+        "69b0287f.333378"
       ]
     ]
   },
   {
-    "id": "ba76d6d3.05fe9",
+    "id": "c25ccae3.59498",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3396.683364868164,
-    "y": 751.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 3432.683364868164,
+    "y": 795.6833648681641,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aae22e84.83191"
+        "18001e31.10fe62"
       ]
     ]
   },
   {
-    "id": "fe627d30.e07a9",
+    "id": "69b0287f.333378",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3383.683364868164,
-    "y": 860.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 3419.683364868164,
+    "y": 904.6833648681641,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "652bcf4e.b1513"
+        "643ae015.6b3ff8"
       ]
     ]
   },
   {
-    "id": "aae22e84.83191",
+    "id": "18001e31.10fe62",
     "type": "set",
     "name": "set hasSecondary false",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
     "comments": "",
-    "x": 3611.683334350586,
-    "y": 588.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3647.683334350586,
+    "y": 632.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "652bcf4e.b1513",
+    "id": "643ae015.6b3ff8",
     "type": "set",
     "name": "set hasSecondary true",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 3607.683334350586,
-    "y": 632.1166687011719,
-    "z": "8bc654d2.f0dde",
+    "x": 3643.683334350586,
+    "y": 676.6833343505859,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "8877dbf4.9fef7",
+    "id": "25259a32.c04fe6",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3804.683364868164,
-    "y": 3532.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 3840.683364868164,
+    "y": 3576.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "8a807ecd.e2d688"
+        "e17fd7c.5d8d2a8"
       ]
     ]
   },
   {
-    "id": "8a807ecd.e2d688",
+    "id": "e17fd7c.5d8d2a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3995.683364868164,
-    "y": 3536.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 4031.683364868164,
+    "y": 3580.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "157127d1.cb4078"
+        "6f9d8ee6.40f9a8"
       ]
     ]
   },
   {
-    "id": "157127d1.cb4078",
+    "id": "6f9d8ee6.40f9a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4122.683364868164,
-    "y": 3535.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 4158.683364868164,
+    "y": 3579.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "75df7ed7.bf083",
-        "34e17ebd.74d332"
+        "5d450f44.f186c8",
+        "87679aab.884488"
       ]
     ]
   },
   {
-    "id": "34e17ebd.74d332",
+    "id": "87679aab.884488",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
     "xml": "<save 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='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4344.683364868164,
-    "y": 3424.11669921875,
-    "z": "8bc654d2.f0dde",
+    "x": 4380.683364868164,
+    "y": 3468.683364868164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "877b276.88c73d8",
+    "id": "88b89d66.20648",
     "type": "set",
     "name": "unset secondary related variables",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
     "comments": "",
-    "x": 3349.566665649414,
-    "y": 464,
-    "z": "8bc654d2.f0dde",
+    "x": 3385.566665649414,
+    "y": 508.56666564941406,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "75df7ed7.bf083",
+    "id": "5d450f44.f186c8",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4340.566665649414,
-    "y": 3483,
-    "z": "8bc654d2.f0dde",
+    "x": 4376.566665649414,
+    "y": 3527.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "298158e5.1b02b8",
-        "8816a027.c5ad7"
+        "a8e3fac.bdef108",
+        "d683cc3e.7534e8"
       ]
     ]
   },
   {
-    "id": "298158e5.1b02b8",
+    "id": "a8e3fac.bdef108",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4550.566665649414,
-    "y": 3460,
-    "z": "8bc654d2.f0dde",
+    "x": 4586.566665649414,
+    "y": 3504.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2754d16a.8d72ae"
+        "d7e8440b.3d707"
       ]
     ]
   },
   {
-    "id": "2754d16a.8d72ae",
+    "id": "d7e8440b.3d707",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4676.566665649414,
-    "y": 3460,
-    "z": "8bc654d2.f0dde",
+    "x": 4712.566665649414,
+    "y": 3504.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1ec26074.15dbf"
+        "23eff82f.a0dc88"
       ]
     ]
   },
   {
-    "id": "7bc2899d.3cc8d",
+    "id": "a5367218.35d1e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4681.566665649414,
-    "y": 3509,
-    "z": "8bc654d2.f0dde",
+    "x": 4717.566665649414,
+    "y": 3553.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "4336d7d0.b3e05",
-        "60df6ba0.591fdc",
-        "73d9646c.b91d7c",
-        "81cba3c.9ee8de"
+        "67e71008.eb1898",
+        "df5e72dc.bc108",
+        "728f0d90.8753cc",
+        "8686c784.f837e"
       ]
     ]
   },
   {
-    "id": "8816a027.c5ad7",
+    "id": "d683cc3e.7534e8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4555.566665649414,
-    "y": 3509,
-    "z": "8bc654d2.f0dde",
+    "x": 4591.566665649414,
+    "y": 3553.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7bc2899d.3cc8d"
+        "a5367218.35d1e"
       ]
     ]
   },
   {
-    "id": "1ec26074.15dbf",
+    "id": "23eff82f.a0dc88",
     "type": "save",
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5004.566665649414,
-    "y": 3457,
-    "z": "8bc654d2.f0dde",
+    "x": 5040.566665649414,
+    "y": 3501.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "4336d7d0.b3e05",
+    "id": "67e71008.eb1898",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainC",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4957.566665649414,
-    "y": 3548,
-    "z": "8bc654d2.f0dde",
+    "x": 4993.566665649414,
+    "y": 3592.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "60df6ba0.591fdc",
+    "id": "df5e72dc.bc108",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4905.566665649414,
-    "y": 3590,
-    "z": "8bc654d2.f0dde",
+    "x": 4941.566665649414,
+    "y": 3634.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "73d9646c.b91d7c",
+    "id": "728f0d90.8753cc",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5034.566665649414,
-    "y": 3632,
-    "z": "8bc654d2.f0dde",
+    "x": 5070.566665649414,
+    "y": 3676.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "63767aff.e83474",
+    "id": "41be2f96.b765f8",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 4920.566665649414,
-    "y": 3505,
-    "z": "8bc654d2.f0dde",
+    "x": 4956.566665649414,
+    "y": 3549.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "81cba3c.9ee8de",
+    "id": "8686c784.f837e",
     "type": "save",
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5012.566665649414,
-    "y": 3680,
-    "z": "8bc654d2.f0dde",
+    "x": 5048.566665649414,
+    "y": 3724.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "238550a0.c6cd18",
+    "id": "561c7038.198b5",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3832.566665649414,
-    "y": 3483,
-    "z": "8bc654d2.f0dde",
+    "x": 3868.566665649414,
+    "y": 3527.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "374b533b.d2c934",
+    "id": "b87e18c5.0db5e8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3807.566665649414,
-    "y": 4154,
-    "z": "8bc654d2.f0dde",
+    "x": 3843.566665649414,
+    "y": 4198.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "42d7b44a.367424"
+        "be1f4e62.15aa38"
       ]
     ]
   },
   {
-    "id": "42d7b44a.367424",
+    "id": "be1f4e62.15aa38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3999.566665649414,
-    "y": 4149,
-    "z": "8bc654d2.f0dde",
+    "x": 4035.566665649414,
+    "y": 4193.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "aa122d60.47dec8"
+        "a0659afe.abed3"
       ]
     ]
   },
   {
-    "id": "aa122d60.47dec8",
+    "id": "a0659afe.abed3",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4128.566665649414,
-    "y": 4149,
-    "z": "8bc654d2.f0dde",
+    "x": 4164.566665649414,
+    "y": 4193.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "bc496cc4.1ac428"
+        "aacb47f4.be072"
       ]
     ]
   },
   {
-    "id": "bc496cc4.1ac428",
+    "id": "aacb47f4.be072",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4460.566665649414,
-    "y": 4147,
-    "z": "8bc654d2.f0dde",
+    "x": 4496.566665649414,
+    "y": 4191.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "e008f489.a45f08",
+    "id": "88b90ca8.e250c",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3795.566665649414,
-    "y": 4378,
-    "z": "8bc654d2.f0dde",
+    "x": 3831.566665649414,
+    "y": 4422.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "7e1de7f3.95bcb"
+        "d69507e0.d93c6"
       ]
     ]
   },
   {
-    "id": "7e1de7f3.95bcb",
+    "id": "d69507e0.d93c6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3975.566665649414,
-    "y": 4377,
-    "z": "8bc654d2.f0dde",
+    "x": 4011.566665649414,
+    "y": 4421.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5cd7b855.2a4ef"
+        "280736a4.7aa0f2"
       ]
     ]
   },
   {
-    "id": "5cd7b855.2a4ef",
+    "id": "280736a4.7aa0f2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4104.566665649414,
-    "y": 4377,
-    "z": "8bc654d2.f0dde",
+    "x": 4140.566665649414,
+    "y": 4421.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "e3d19dba.c0bd7"
+        "ff5dea73.98b998"
       ]
     ]
   },
   {
-    "id": "e3d19dba.c0bd7",
+    "id": "ff5dea73.98b998",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4322.449966430664,
-    "y": 4375.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 4358.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "53c7d161.8eb9"
+        "860e2e4b.61a0d8"
       ]
     ]
   },
   {
-    "id": "53c7d161.8eb9",
+    "id": "860e2e4b.61a0d8",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4537.449966430664,
-    "y": 4375.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 4573.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "fbe01cc.5b1afe"
+        "3ff2617b.840e76"
       ]
     ]
   },
   {
-    "id": "fbe01cc.5b1afe",
+    "id": "3ff2617b.840e76",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4669.449966430664,
-    "y": 4375.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 4705.449966430664,
+    "y": 4420.449966430664,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2bf4a87a.e670f8"
+        "96149cb2.d633c"
       ]
     ]
   },
   {
-    "id": "2bf4a87a.e670f8",
+    "id": "96149cb2.d633c",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5033.566665649414,
-    "y": 4375,
-    "z": "8bc654d2.f0dde",
+    "x": 5069.566665649414,
+    "y": 4419.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e2222c.7b917dd",
+    "id": "f0668881.7d6d6",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3470.566665649414,
-    "y": 4633,
-    "z": "8bc654d2.f0dde",
+    "x": 3506.566665649414,
+    "y": 4677.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "99a3a0e8.0b0e08"
+        "2492336a.68b20c"
       ]
     ]
   },
   {
-    "id": "99a3a0e8.0b0e08",
+    "id": "2492336a.68b20c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3650.566665649414,
-    "y": 4632,
-    "z": "8bc654d2.f0dde",
+    "x": 3686.566665649414,
+    "y": 4676.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "34a5a7ab.8782f"
+        "f54b8794.2acdd"
       ]
     ]
   },
   {
-    "id": "34a5a7ab.8782f",
+    "id": "f54b8794.2acdd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3779.566665649414,
-    "y": 4632,
-    "z": "8bc654d2.f0dde",
+    "x": 3815.566665649414,
+    "y": 4676.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "41dd40eb.c66e7"
+        "c3a4f53e.304d78"
       ]
     ]
   },
   {
-    "id": "1e73a5a2.1f85da",
+    "id": "84f57def.b063a",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3515.566665649414,
-    "y": 4691,
-    "z": "8bc654d2.f0dde",
+    "x": 3551.566665649414,
+    "y": 4735.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "d18a7342.6feac8",
+    "id": "cebbd661.72d4b8",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4081.566665649414,
-    "y": 4790,
-    "z": "8bc654d2.f0dde",
+    "x": 4117.566665649414,
+    "y": 4834.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "41dd40eb.c66e7",
+    "id": "c3a4f53e.304d78",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3545.566665649414,
-    "y": 4724,
-    "z": "8bc654d2.f0dde",
+    "x": 3581.566665649414,
+    "y": 4768.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "f4cc70f5.9b6bc",
-        "ce8af9cd.332b9",
-        "130dfbc3.4a6c5c"
+        "9d76d7ba.037948",
+        "c6779daf.7d7a8",
+        "62f3b274.175fb4"
       ]
     ]
   },
   {
-    "id": "ce8af9cd.332b9",
+    "id": "c6779daf.7d7a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3727.057632446289,
-    "y": 4701.57421875,
-    "z": "8bc654d2.f0dde",
+    "x": 3763.057632446289,
+    "y": 4746.140884399414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "3c80b807.6a4d88"
+        "168b9f85.394368"
       ]
     ]
   },
   {
-    "id": "130dfbc3.4a6c5c",
+    "id": "62f3b274.175fb4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3715.566665649414,
-    "y": 4741,
-    "z": "8bc654d2.f0dde",
+    "x": 3751.566665649414,
+    "y": 4785.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c80f59b7.c8277"
+        "6d9d5aec.85fd34"
       ]
     ]
   },
   {
-    "id": "3c80b807.6a4d88",
+    "id": "168b9f85.394368",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3886.629165649414,
-    "y": 4699.85986328125,
-    "z": "8bc654d2.f0dde",
+    "x": 3922.629165649414,
+    "y": 4744.426528930664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c80f59b7.c8277",
+    "id": "6d9d5aec.85fd34",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3876.566665649414,
-    "y": 4742,
-    "z": "8bc654d2.f0dde",
+    "x": 3912.566665649414,
+    "y": 4786.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "96ee8bec.e5c4a8",
+    "id": "1514bf18.105d59",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3878.566665649414,
-    "y": 4786,
-    "z": "8bc654d2.f0dde",
+    "x": 3914.566665649414,
+    "y": 4830.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "60b9b66c.eef658",
-        "d18a7342.6feac8"
+        "16719b54.ca935d",
+        "cebbd661.72d4b8"
       ]
     ]
   },
   {
-    "id": "f4cc70f5.9b6bc",
+    "id": "9d76d7ba.037948",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3720.566665649414,
-    "y": 4778,
-    "z": "8bc654d2.f0dde",
+    "x": 3756.566665649414,
+    "y": 4822.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "96ee8bec.e5c4a8"
+        "1514bf18.105d59"
       ]
     ]
   },
   {
-    "id": "60b9b66c.eef658",
+    "id": "16719b54.ca935d",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4039.566665649414,
-    "y": 4718,
-    "z": "8bc654d2.f0dde",
+    "x": 4075.566665649414,
+    "y": 4762.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "eedd5a70.956fd8",
+    "id": "993866bb.1b2058",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4405.566665649414,
-    "y": 5286,
-    "z": "8bc654d2.f0dde",
+    "x": 4441.566665649414,
+    "y": 5330.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "76d94500.85b34c",
+    "id": "f715ac9f.9b32b8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4560.566665649414,
-    "y": 5327,
-    "z": "8bc654d2.f0dde",
+    "x": 4596.566665649414,
+    "y": 5371.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5f94b51d.236064",
+    "id": "c2d27f90.576768",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5003.566665649414,
-    "y": 5375,
-    "z": "8bc654d2.f0dde",
+    "x": 5039.566665649414,
+    "y": 5419.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "66bf889f.a4f118",
+    "id": "79d51ab0.5a125c",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4376.566665649414,
-    "y": 5385,
-    "z": "8bc654d2.f0dde",
+    "x": 4412.566665649414,
+    "y": 5429.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "b509f4ce.23c808",
-        "425be1a9.ccccd8"
+        "fbb7e2aa.d5f0a8",
+        "7443db3b.00f94c"
       ]
     ]
   },
   {
-    "id": "b509f4ce.23c808",
+    "id": "fbb7e2aa.d5f0a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4612.566665649414,
-    "y": 5369,
-    "z": "8bc654d2.f0dde",
+    "x": 4648.566665649414,
+    "y": 5413.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1cce9d9d.44252a"
+        "2a6159e8.abaf0e"
       ]
     ]
   },
   {
-    "id": "1cce9d9d.44252a",
+    "id": "2a6159e8.abaf0e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4756.566665649414,
-    "y": 5371,
-    "z": "8bc654d2.f0dde",
+    "x": 4792.566665649414,
+    "y": 5415.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "5f94b51d.236064",
-        "efe8a2f7.303938",
-        "b992a481.10f3f"
+        "c2d27f90.576768",
+        "5c6afd36.faf1f4",
+        "86183466.e0956"
       ]
     ]
   },
   {
-    "id": "425be1a9.ccccd8",
+    "id": "7443db3b.00f94c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4611.566665649414,
-    "y": 5417,
-    "z": "8bc654d2.f0dde",
+    "x": 4647.566665649414,
+    "y": 5461.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "efe8a2f7.303938",
+    "id": "5c6afd36.faf1f4",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5124.566665649414,
-    "y": 5422,
-    "z": "8bc654d2.f0dde",
+    "x": 5160.566665649414,
+    "y": 5466.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "b992a481.10f3f",
+    "id": "86183466.e0956",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5006.233657836914,
-    "y": 5507.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5042.233657836914,
+    "y": 5551.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "3dbfccd3.2b6904",
+    "id": "85909b06.96d1d8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5007.450454711914,
-    "y": 5465.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5043.450454711914,
+    "y": 5510.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "c4e3627c.f5b198",
+    "id": "d5d61aed.e9642",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5538.566665649414,
-    "y": 5854,
-    "z": "8bc654d2.f0dde",
+    "x": 5574.566665649414,
+    "y": 5898.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "316a2790.87ce5",
+    "id": "cfe4284f.245dc",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4911.566665649414,
-    "y": 5864,
-    "z": "8bc654d2.f0dde",
+    "x": 4947.566665649414,
+    "y": 5908.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "2b91cb0d.4b878c",
-        "b9e860d6.0863a"
+        "67276eef.04fd3",
+        "9ce9471a.def67"
       ]
     ]
   },
   {
-    "id": "2b91cb0d.4b878c",
+    "id": "67276eef.04fd3",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5144.566665649414,
-    "y": 5858,
-    "z": "8bc654d2.f0dde",
+    "x": 5180.566665649414,
+    "y": 5902.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "617327bf.d18368"
+        "7fd061d3.3dea5"
       ]
     ]
   },
   {
-    "id": "617327bf.d18368",
+    "id": "7fd061d3.3dea5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5291.566665649414,
-    "y": 5866,
-    "z": "8bc654d2.f0dde",
+    "x": 5327.566665649414,
+    "y": 5910.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "c4e3627c.f5b198",
-        "7767e038.8b5bf",
-        "5189b1c7.a8726"
+        "d5d61aed.e9642",
+        "f7e19ea0.d5ede",
+        "ccb01b06.92e6a8"
       ]
     ]
   },
   {
-    "id": "b9e860d6.0863a",
+    "id": "9ce9471a.def67",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5145.566665649414,
-    "y": 5908,
-    "z": "8bc654d2.f0dde",
+    "x": 5181.566665649414,
+    "y": 5952.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "7767e038.8b5bf",
+    "id": "f7e19ea0.d5ede",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5659.566665649414,
-    "y": 5901,
-    "z": "8bc654d2.f0dde",
+    "x": 5695.566665649414,
+    "y": 5945.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "5189b1c7.a8726",
+    "id": "ccb01b06.92e6a8",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5541.233657836914,
-    "y": 5986.08349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 5577.233657836914,
+    "y": 6030.650161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "be3f8000.1758f8",
+    "id": "e15ccbfd.b5904",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5542.450454711914,
-    "y": 5944.88330078125,
-    "z": "8bc654d2.f0dde",
+    "x": 5578.450454711914,
+    "y": 5989.449966430664,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "5021b590.5d75e4",
+    "id": "986cd5c9.02e9d",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5072.566665649414,
-    "y": 5814,
-    "z": "8bc654d2.f0dde",
+    "x": 5108.566665649414,
+    "y": 5858.566665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "92959871.fa0e08",
+    "id": "b4899b08.51e5b",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4906.566665649414,
-    "y": 5775,
-    "z": "8bc654d2.f0dde",
+    "x": 4942.566665649414,
+    "y": 5819.566665649414,
+    "z": "294b5e8a.041612",
     "wires": []
   },
   {
-    "id": "899de386.880988",
+    "id": "c617e6ee.8b983",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3233.816665649414,
-    "y": 6384.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3269.816665649414,
+    "y": 6428.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1f7a42c6.29cf15",
-        "5608d8df.18871"
+        "9cb4bafc.51db",
+        "31675b48.f480a4"
       ]
     ]
   },
   {
-    "id": "1f7a42c6.29cf15",
+    "id": "9cb4bafc.51db",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3424.816665649414,
-    "y": 6388.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3460.816665649414,
+    "y": 6432.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "d6990f3f.a131a8"
+        "4d6a56c7.6a325"
       ]
     ]
   },
   {
-    "id": "d6990f3f.a131a8",
+    "id": "4d6a56c7.6a325",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3551.816665649414,
-    "y": 6387.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3587.816665649414,
+    "y": 6431.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "1cb779c6.3641ce"
+        "c5539a8b.106aa"
       ]
     ]
   },
   {
-    "id": "5608d8df.18871",
+    "id": "31675b48.f480a4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3420.816665649414,
-    "y": 6458.25,
-    "z": "8bc654d2.f0dde",
+    "x": 3456.816665649414,
+    "y": 6502.816665649414,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "9d5d9d30.3fbe28"
+        "8a9f9d03.ba9c7"
       ]
     ]
   },
   {
-    "id": "60292317.f03774",
+    "id": "9f506842.a5d348",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3970.316665649414,
-    "y": 6457.33349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 4006.316665649414,
+    "y": 6501.900161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d5d9d30.3fbe28",
+    "id": "8a9f9d03.ba9c7",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3554.316665649414,
-    "y": 6460.33349609375,
-    "z": "8bc654d2.f0dde",
+    "x": 3590.316665649414,
+    "y": 6504.900161743164,
+    "z": "294b5e8a.041612",
     "wires": [
       [
-        "60292317.f03774"
+        "9f506842.a5d348"
       ]
     ]
   }
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 1a4c8400..5fb058b7 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "d6c73c0b.0d5f48",
+        "id": "b3c61f0e.0e195",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 157.88330078125,
-        "y": 156.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 183.56666564941406,
+        "y": 161.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d49f5b5f.8b9338"
+                "a48494fd.8b7d"
             ]
         ]
     },
     {
-        "id": "d49f5b5f.8b9338",
+        "id": "a48494fd.8b7d",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,11102 +22,11102 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 456.1690216064453,
-        "y": 212.52387523651123,
-        "z": "1806503a.76a7a",
+        "x": 481.8523864746094,
+        "y": 217.8047742843628,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3720330.25593ce"
+                "6868eec5.8eff3"
             ]
         ]
     },
     {
-        "id": "3720330.25593ce",
+        "id": "6868eec5.8eff3",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-delete",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 462.3119354248047,
-        "y": 297.2857971191406,
-        "z": "1806503a.76a7a",
+        "x": 487.99530029296875,
+        "y": 302.5666961669922,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7f694928.267bb8"
+                "42b0c518.6297dc"
             ]
         ]
     },
     {
-        "id": "7f694928.267bb8",
+        "id": "42b0c518.6297dc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 811.8833312988281,
-        "y": 356.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 837.5666961669922,
+        "y": 361.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "14360151.1c2e2f",
-                "2b05d42f.ff48b4",
-                "b833ca08.643e2"
+                "fec7e153.ea24b",
+                "30575656.398222",
+                "189baf2e.d72529"
             ]
         ]
     },
     {
-        "id": "14360151.1c2e2f",
+        "id": "fec7e153.ea24b",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 1113.2168273925781,
-        "y": 627.216064453125,
-        "z": "1806503a.76a7a",
+        "x": 1138.9001922607422,
+        "y": 632.4969635009766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2b05d42f.ff48b4",
+        "id": "30575656.398222",
         "type": "save",
         "name": "get service-instance from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
         "comments": "",
         "outputs": 1,
-        "x": 1134.6452941894531,
-        "y": 329.61907958984375,
-        "z": "1806503a.76a7a",
+        "x": 1160.3286590576172,
+        "y": 334.8999786376953,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "41fb5683.e713a",
-                "80e71c24.60d2d",
-                "fe4111b5.f2228"
+                "27345488.79731c",
+                "7e08d842.a4058",
+                "14b3e2f5.681565"
             ]
         ]
     },
     {
-        "id": "41fb5683.e713a",
+        "id": "27345488.79731c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1359.6452941894531,
-        "y": 187.61907958984375,
-        "z": "1806503a.76a7a",
+        "x": 1385.3286590576172,
+        "y": 192.8999786376953,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "41abc238.ea1884"
+                "a8487fba.2cb09"
             ]
         ]
     },
     {
-        "id": "80e71c24.60d2d",
+        "id": "7e08d842.a4058",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1355.1362609863281,
-        "y": 257.193115234375,
-        "z": "1806503a.76a7a",
+        "x": 1380.8196258544922,
+        "y": 262.47401428222656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "844c0ad5.c095b"
+                "26698778.b41f38"
             ]
         ]
     },
     {
-        "id": "fe4111b5.f2228",
+        "id": "14b3e2f5.681565",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1343.6452941894531,
-        "y": 303.61907958984375,
-        "z": "1806503a.76a7a",
+        "x": 1369.3286590576172,
+        "y": 308.8999786376953,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1e9cd9f4.55835e"
+                "e03cea3a.82881"
             ]
         ]
     },
     {
-        "id": "692bc437.51a034",
+        "id": "b94ba14f.99f16",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1113.6452941894531,
-        "y": 217.61907958984375,
-        "z": "1806503a.76a7a",
+        "x": 1139.3286590576172,
+        "y": 222.8999786376953,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b833ca08.643e2",
+        "id": "189baf2e.d72529",
         "type": "execute",
         "name": "execute properties",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
         "comments": "",
         "outputs": 1,
-        "x": 1101.6452941894531,
-        "y": 269.61907958984375,
-        "z": "1806503a.76a7a",
+        "x": 1127.3286590576172,
+        "y": 274.8999786376953,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "41abc238.ea1884",
+        "id": "a8487fba.2cb09",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1599.8833312988281,
-        "y": 184.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 1625.5666961669922,
+        "y": 189.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "edbcfce1.4d552",
-                "d741e3bd.0b6788"
+                "7bdf94e9.87c2bc",
+                "770405a0.0ddc6c"
             ]
         ]
     },
     {
-        "id": "844c0ad5.c095b",
+        "id": "26698778.b41f38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 1509.9457092285156,
-        "y": 260.1455383300781,
-        "z": "1806503a.76a7a",
+        "x": 1535.6290740966797,
+        "y": 265.4264373779297,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1e9cd9f4.55835e",
+        "id": "e03cea3a.82881",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1513.8833312988281,
-        "y": 304.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 1539.5666961669922,
+        "y": 309.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "edbcfce1.4d552",
+        "id": "7bdf94e9.87c2bc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1804.8833312988281,
-        "y": 221.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 1830.5666961669922,
+        "y": 226.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "589ae77f.807888"
+                "79eb131c.176e44"
             ]
         ]
     },
     {
-        "id": "d741e3bd.0b6788",
+        "id": "770405a0.0ddc6c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1814.8833312988281,
-        "y": 148.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 1840.5666961669922,
+        "y": 153.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "589ae77f.807888",
+        "id": "79eb131c.176e44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1797.8833312988281,
-        "y": 296.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 1823.5666961669922,
+        "y": 301.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "10bd96f7.8fa059",
-                "cb92da4c.da1bb",
-                "cbe49015.ae0dd",
-                "6c495f2.f763aa",
-                "4304e2aa.cc073c"
+                "9d4673ee.891e5",
+                "1a86601d.154a48",
+                "d6a895b8.ea711",
+                "3f0be5e9.f7ecd2",
+                "eca8d05b.38fb78"
             ]
         ]
     },
     {
-        "id": "5f06cb70.adae8c",
+        "id": "fd1dcea.f15be3",
         "type": "save",
         "name": "get allotted-resource from aai",
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2283.883331298828,
-        "y": 347.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2309.566696166992,
+        "y": 352.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c68fbf4e.5d82c",
-                "2146d17e.d0a56e",
-                "f04a7ec7.eb68d"
+                "2555bbc5.26f19c",
+                "93423d46.b14978",
+                "4c790d06.05e3ec"
             ]
         ]
     },
     {
-        "id": "c68fbf4e.5d82c",
+        "id": "2555bbc5.26f19c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2499.883331298828,
-        "y": 414.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2525.566696166992,
+        "y": 419.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cbd25b41.5a644"
+                "cc8af145.1212b8"
             ]
         ]
     },
     {
-        "id": "2146d17e.d0a56e",
+        "id": "93423d46.b14978",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2500.374298095703,
-        "y": 313.8597412109375,
-        "z": "1806503a.76a7a",
+        "x": 2526.057662963867,
+        "y": 319.14064025878906,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d020f647.b48948"
+                "fbfefea4.a2d338"
             ]
         ]
     },
     {
-        "id": "f04a7ec7.eb68d",
+        "id": "4c790d06.05e3ec",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2495.883331298828,
-        "y": 363.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2521.566696166992,
+        "y": 368.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bf60182e.46d6e"
+                "d962a49c.c504b8"
             ]
         ]
     },
     {
-        "id": "10bd96f7.8fa059",
+        "id": "9d4673ee.891e5",
         "type": "for",
         "name": "for each allotted-resource",
         "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2000.8833312988281,
-        "y": 328.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2026.5666961669922,
+        "y": 333.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9d7e7b42.ef2a18",
-                "5f06cb70.adae8c",
-                "b4f5dada.48378",
-                "5db562b1.71111c"
+                "d3206ca7.c31d1",
+                "fd1dcea.f15be3",
+                "426ddfc0.c628b",
+                "d0874bda.7e1ac"
             ]
         ]
     },
     {
-        "id": "9d7e7b42.ef2a18",
+        "id": "d3206ca7.c31d1",
         "type": "set",
         "name": "set the current allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
         "comments": "",
-        "x": 2280.883331298828,
-        "y": 266.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2306.566696166992,
+        "y": 271.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6c495f2.f763aa",
+        "id": "3f0be5e9.f7ecd2",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
         "comments": "",
-        "x": 1974.8833312988281,
-        "y": 278.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2000.5666961669922,
+        "y": 283.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "cb92da4c.da1bb",
+        "id": "1a86601d.154a48",
         "type": "get-resource",
         "name": "get-resource pnfs-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
         "comments": "",
         "outputs": 1,
-        "x": 2017.8833312988281,
-        "y": 137.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2043.5666961669922,
+        "y": 142.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "cbe49015.ae0dd",
+        "id": "d6a895b8.ea711",
         "type": "get-resource",
         "name": "get-resource logical-links",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
         "comments": "",
         "outputs": 1,
-        "x": 2029.8833312988281,
-        "y": 178.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2055.566696166992,
+        "y": 183.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f6d3e50c.b329e8",
+        "id": "c8d3ec04.e3f8a8",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
-        "x": 2054.883331298828,
-        "y": 90.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2080.566696166992,
+        "y": 95.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "300ce0be.29882",
+        "id": "d7434469.de441",
         "type": "set",
         "name": "set tmp.arr",
         "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
         "comments": "",
-        "x": 1974.8833312988281,
-        "y": 224.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2000.5666961669922,
+        "y": 229.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d020f647.b48948",
+        "id": "fbfefea4.a2d338",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2678.883331298828,
-        "y": 316.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2704.566696166992,
+        "y": 321.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "bf60182e.46d6e",
+        "id": "d962a49c.c504b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2678.820831298828,
-        "y": 365.426025390625,
-        "z": "1806503a.76a7a",
+        "x": 2704.504196166992,
+        "y": 370.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "cbd25b41.5a644",
+        "id": "cc8af145.1212b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2680.820831298828,
-        "y": 416.426025390625,
-        "z": "1806503a.76a7a",
+        "x": 2706.504196166992,
+        "y": 421.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "365e9f97.d4a028"
+                "30ad22b3.c0b5e6"
             ]
         ]
     },
     {
-        "id": "365e9f97.d4a028",
+        "id": "30ad22b3.c0b5e6",
         "type": "save",
         "name": "get allotted-resource relationship from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2973.820831298828,
-        "y": 363.426025390625,
-        "z": "1806503a.76a7a",
+        "x": 2999.504196166992,
+        "y": 368.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6e92372c.3a07f8",
-                "c96fb012.9bb888",
-                "95b7cbb5.ac06c8"
+                "5234d98d.9f94d",
+                "83314642.8bc358",
+                "55523c43.af8514"
             ]
         ]
     },
     {
-        "id": "c96fb012.9bb888",
+        "id": "83314642.8bc358",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3277.311767578125,
-        "y": 20,
-        "z": "1806503a.76a7a",
+        "x": 3302.995132446289,
+        "y": 25.280899047851562,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "58ab1443.358994"
+                "f9033318.3a82e"
             ]
         ]
     },
     {
-        "id": "58ab1443.358994",
+        "id": "f9033318.3a82e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3454.88330078125,
-        "y": 20.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3480.566665649414,
+        "y": 25.566665649414062,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "95b7cbb5.ac06c8",
+        "id": "55523c43.af8514",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3272.82080078125,
-        "y": 69.426025390625,
-        "z": "1806503a.76a7a",
+        "x": 3298.504165649414,
+        "y": 74.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1f97dde6.30f20a"
+                "ed442c0e.cae2b8"
             ]
         ]
     },
     {
-        "id": "1f97dde6.30f20a",
+        "id": "ed442c0e.cae2b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3454.82080078125,
-        "y": 69.426025390625,
-        "z": "1806503a.76a7a",
+        "x": 3480.504165649414,
+        "y": 74.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6e92372c.3a07f8",
+        "id": "5234d98d.9f94d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3276.82080078125,
-        "y": 120.426025390625,
-        "z": "1806503a.76a7a",
+        "x": 3302.504165649414,
+        "y": 125.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7a25dc67.63046c"
+                "7ab56666.401778"
             ]
         ]
     },
     {
-        "id": "7a25dc67.63046c",
+        "id": "7ab56666.401778",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3456.82080078125,
-        "y": 120.426025390625,
-        "z": "1806503a.76a7a",
+        "x": 3482.504165649414,
+        "y": 125.70692443847656,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "742cdaa9.4808c4"
+                "6c101067.0de5e8"
             ]
         ]
     },
     {
-        "id": "742cdaa9.4808c4",
+        "id": "6c101067.0de5e8",
         "type": "switchNode",
         "name": "switch allotted-resource.relationship-list not empty",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2992.883331298828,
-        "y": 491.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3018.566696166992,
+        "y": 496.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9afa3e4f.f2f2c8",
-                "ce58b166.b2448"
+                "646ab584.76e45c",
+                "ffe35827.b1255"
             ]
         ]
     },
     {
-        "id": "ce58b166.b2448",
+        "id": "ffe35827.b1255",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3332.88330078125,
-        "y": 262.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3358.566665649414,
+        "y": 267.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "9afa3e4f.f2f2c8",
+        "id": "646ab584.76e45c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3331.88330078125,
-        "y": 316.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3357.566665649414,
+        "y": 321.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "aba0f7b5.b64ec8"
+                "7579f2ad.787884"
             ]
         ]
     },
     {
-        "id": "50f7604e.0c4dc8",
+        "id": "76ff4ece.4716a",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4076.88330078125,
-        "y": 270.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4102.566665649414,
+        "y": 275.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e079a6c2.9c941"
+                "522d04a5.cf337c"
             ]
         ]
     },
     {
-        "id": "e079a6c2.9c941",
+        "id": "522d04a5.cf337c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4253.8831787109375,
-        "y": 263.28564453125,
-        "z": "1806503a.76a7a",
+        "x": 4279.566543579102,
+        "y": 268.56654357910156,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "83280d27.4bae7",
-                "92c6fb1f.05a328"
+                "ff700b35.f88fd",
+                "a95b674a.f71a"
             ]
         ]
     },
     {
-        "id": "aba0f7b5.b64ec8",
+        "id": "7579f2ad.787884",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3495.88330078125,
-        "y": 242.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3521.566665649414,
+        "y": 247.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a8c08369.0aef78",
-                "98755b5f.40e4a"
+                "687e4dd8.df6004",
+                "7a6c4648.75b9a"
             ]
         ]
     },
     {
-        "id": "a8c08369.0aef78",
+        "id": "687e4dd8.df6004",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3776.88330078125,
-        "y": 198.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3802.566665649414,
+        "y": 203.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "64ebbb1e.14821c"
+                "498ba81e.b961f8"
             ]
         ]
     },
     {
-        "id": "64ebbb1e.14821c",
+        "id": "498ba81e.b961f8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4038.88330078125,
-        "y": 198.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4064.566665649414,
+        "y": 203.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "50f7604e.0c4dc8"
+                "76ff4ece.4716a"
             ]
         ]
     },
     {
-        "id": "83280d27.4bae7",
+        "id": "ff700b35.f88fd",
         "type": "set",
         "name": "set the 1st network-policy-id",
         "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 4496.8831787109375,
-        "y": 220.28564453125,
-        "z": "1806503a.76a7a",
+        "x": 4522.566543579102,
+        "y": 225.56654357910156,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "92c6fb1f.05a328",
+        "id": "a95b674a.f71a",
         "type": "save",
         "name": "get network-policy from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
         "comments": "",
         "outputs": 1,
-        "x": 4485.8831787109375,
-        "y": 275.28564453125,
-        "z": "1806503a.76a7a",
+        "x": 4511.566543579102,
+        "y": 280.56654357910156,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "26a63936.d2dcb6",
-                "935c2a76.01522",
-                "61809f6c.f102a"
+                "4864ccac.4c9fb4",
+                "b78f5441.c1bfd",
+                "4088ff64.ba745"
             ]
         ]
     },
     {
-        "id": "61809f6c.f102a",
+        "id": "4088ff64.ba745",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4738.88330078125,
-        "y": 161.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4764.566665649414,
+        "y": 166.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8483d549.4ff1d8"
+                "745cd258.155a8c"
             ]
         ]
     },
     {
-        "id": "8483d549.4ff1d8",
+        "id": "745cd258.155a8c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4887.454833984375,
-        "y": 161.571533203125,
-        "z": "1806503a.76a7a",
+        "x": 4913.138198852539,
+        "y": 166.85243225097656,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "79f73429.37a0f4",
+        "id": "d814f814.02812",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4886.392333984375,
-        "y": 205.7117919921875,
-        "z": "1806503a.76a7a",
+        "x": 4912.075698852539,
+        "y": 210.99269104003906,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "935c2a76.01522",
+        "id": "b78f5441.c1bfd",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4727.392333984375,
-        "y": 205.7117919921875,
-        "z": "1806503a.76a7a",
+        "x": 4753.075698852539,
+        "y": 210.99269104003906,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "79f73429.37a0f4"
+                "d814f814.02812"
             ]
         ]
     },
     {
-        "id": "26a63936.d2dcb6",
+        "id": "4864ccac.4c9fb4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4734.392333984375,
-        "y": 284.7117919921875,
-        "z": "1806503a.76a7a",
+        "x": 4760.075698852539,
+        "y": 289.99269104003906,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4efa868e.4aaf8"
+                "efd9fdb1.0f83a"
             ]
         ]
     },
     {
-        "id": "4efa868e.4aaf8",
+        "id": "efd9fdb1.0f83a",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4873.392333984375,
-        "y": 284.7117919921875,
-        "z": "1806503a.76a7a",
+        "x": 4899.075698852539,
+        "y": 289.99269104003906,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ac693539.f50e98",
-                "9a31854c.efaef8"
+                "f2ffc2c8.9c3d6",
+                "ca4f06f7.bf7198"
             ]
         ]
     },
     {
-        "id": "ac693539.f50e98",
+        "id": "f2ffc2c8.9c3d6",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 5078.88330078125,
-        "y": 282.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5104.566665649414,
+        "y": 287.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9a31854c.efaef8",
+        "id": "ca4f06f7.bf7198",
         "type": "set",
         "name": "set the max bandwidth",
         "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
         "comments": "",
-        "x": 5077.88330078125,
-        "y": 328.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5103.566665649414,
+        "y": 333.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "98755b5f.40e4a",
+        "id": "7a6c4648.75b9a",
         "type": "for",
         "name": "for each allotted-resource relationship",
         "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3593.88330078125,
-        "y": 314.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3619.566665649414,
+        "y": 319.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a599949c.47c2"
+                "2b038d01.8bcf5a"
             ]
         ]
     },
     {
-        "id": "a599949c.47c2",
+        "id": "2b038d01.8bcf5a",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3873.88330078125,
-        "y": 314.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3899.566665649414,
+        "y": 319.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9f30fb79.9864f8"
+                "924692b1.dbe118"
             ]
         ]
     },
     {
-        "id": "9f30fb79.9864f8",
+        "id": "924692b1.dbe118",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2256.8834533691406,
-        "y": 803.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 2282.5668182373047,
+        "y": 808.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4497a7be.db159"
+                "e627a5b7.666348"
             ]
         ]
     },
     {
-        "id": "4497a7be.db159",
+        "id": "e627a5b7.666348",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2433.883331298828,
-        "y": 796.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2459.566696166992,
+        "y": 801.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "748da704.3dc228",
-                "132fdd9a.6a584a"
+                "abe018e3.2ab958",
+                "b299dbd0.7106d8"
             ]
         ]
     },
     {
-        "id": "748da704.3dc228",
+        "id": "abe018e3.2ab958",
         "type": "set",
         "name": "set the current logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 2676.883331298828,
-        "y": 753.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2702.566696166992,
+        "y": 758.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "132fdd9a.6a584a",
+        "id": "b299dbd0.7106d8",
         "type": "save",
         "name": "get logical-link from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
         "comments": "",
         "outputs": 1,
-        "x": 2665.883331298828,
-        "y": 808.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2691.566696166992,
+        "y": 813.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1d5c52ad.8a4fcd",
-                "c6fd8eb5.369a58",
-                "b0ba9e98.5ef29"
+                "73425fcf.6d608",
+                "9a2fb745.49c558",
+                "c8c584c4.60469"
             ]
         ]
     },
     {
-        "id": "1d5c52ad.8a4fcd",
+        "id": "73425fcf.6d608",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2957.374298095703,
-        "y": 786.8597412109375,
-        "z": "1806503a.76a7a",
+        "x": 2983.057662963867,
+        "y": 792.1406402587891,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "81786826.f1adc"
+                "11a6918b.0ed79e"
             ]
         ]
     },
     {
-        "id": "c6fd8eb5.369a58",
+        "id": "9a2fb745.49c558",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2945.883331298828,
-        "y": 831.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2971.566696166992,
+        "y": 836.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "568abbfd.c78f14"
+                "147fb75c.cecad1"
             ]
         ]
     },
     {
-        "id": "81786826.f1adc",
+        "id": "11a6918b.0ed79e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3105.945831298828,
-        "y": 787.1455078125,
-        "z": "1806503a.76a7a",
+        "x": 3131.629196166992,
+        "y": 792.4264068603516,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "568abbfd.c78f14",
+        "id": "147fb75c.cecad1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3104.883331298828,
-        "y": 831.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3130.566696166992,
+        "y": 836.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b0ba9e98.5ef29",
+        "id": "c8c584c4.60469",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2952.883331298828,
-        "y": 910.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2978.566696166992,
+        "y": 915.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "56d4032d.446f0c"
+                "18430aa7.b0cd65"
             ]
         ]
     },
     {
-        "id": "56d4032d.446f0c",
+        "id": "18430aa7.b0cd65",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3091.883331298828,
-        "y": 910.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3117.566696166992,
+        "y": 915.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a588efb1.b17fd",
-                "9c7e31dc.43bc2",
-                "64cc49aa.338118",
-                "a266d487.c02dd",
-                "f1099f4d.7efe5",
-                "6aa3951e.157a4c",
-                "4618e1c0.461d88",
-                "d38e0865.514348",
-                "eef6ad07.9c7d5",
-                "78d4922e.8ebe04",
-                "c220ecdf.76a978",
-                "940f9aa.5464fe8",
-                "14f1d608.fff342",
-                "5e5dd175.2ee1b",
-                "95f11825.f517d8",
-                "79dba259.2612cc",
-                "11c024cf.1cb7db",
-                "8bfce836.dcd148",
-                "ec6aad53.7d628",
-                "c02bc34.16c814",
-                "ad2e0fde.b44de8",
-                "d87e7a94.9bda08"
+                "a56438ce.7b3648",
+                "cd9c4fe8.e67498",
+                "b8cad49c.dd7ca",
+                "768c9bf8.5beb74",
+                "6f1a328d.ae400c",
+                "b16688a0.4defc",
+                "2c1d8b21.e96e8c",
+                "63cddf09.26d868",
+                "9d9de9db.5c38b8",
+                "e5f9b3dc.c2f9f",
+                "169ca3b9.4d31a4",
+                "1c28fc30.faaf74",
+                "19822907.e2052f",
+                "e8ad32eb.9df94",
+                "cf9533e5.c2371",
+                "22a945f9.085212",
+                "94938481.855978",
+                "7edb995a.421908",
+                "f054f8f8.d1b3a",
+                "dab7847.8f75af8",
+                "71a7eba7.ddb6fc",
+                "a71111e6.40602"
             ]
         ]
     },
     {
-        "id": "6986f9e3.b25bc8",
+        "id": "ece3c8dc.fca8e",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3435.883270263672,
-        "y": 384.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3461.566635131836,
+        "y": 389.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a588efb1.b17fd",
+        "id": "a56438ce.7b3648",
         "type": "execute",
         "name": "execute UUID generator for otn-tunnel-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3416.883270263672,
-        "y": 484.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3442.566635131836,
+        "y": 489.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "940f9aa.5464fe8",
+        "id": "1c28fc30.faaf74",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
-        "x": 3370.883270263672,
-        "y": 535.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3396.566635131836,
+        "y": 540.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9c7e31dc.43bc2",
+        "id": "cd9c4fe8.e67498",
         "type": "set",
         "name": "set network-route-one",
         "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
         "comments": "",
-        "x": 3344.883270263672,
-        "y": 584.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3370.566635131836,
+        "y": 589.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "64cc49aa.338118",
+        "id": "b8cad49c.dd7ca",
         "type": "set",
         "name": "set network-route-two",
         "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
-        "x": 3343.883270263672,
-        "y": 633.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3369.566635131836,
+        "y": 638.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a266d487.c02dd",
+        "id": "768c9bf8.5beb74",
         "type": "save",
         "name": "get network-route-one from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
         "comments": "",
         "outputs": 1,
-        "x": 3352.883270263672,
-        "y": 771.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3378.566635131836,
+        "y": 776.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1276721a.95abce",
-                "59c480c0.a5bb2",
-                "56433b78.3dde04"
+                "fe7f9a9e.cf1db8",
+                "156916f6.f1ec61",
+                "66ef43c6.2e3d64"
             ]
         ]
     },
     {
-        "id": "f1099f4d.7efe5",
+        "id": "6f1a328d.ae400c",
         "type": "save",
         "name": "get network-route-two from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
         "comments": "",
         "outputs": 1,
-        "x": 3345.883270263672,
-        "y": 832.28564453125,
-        "z": "1806503a.76a7a",
+        "x": 3371.566635131836,
+        "y": 837.5665435791016,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "194bfca3.59d3d3",
-                "f16b27ad.e4a0d",
-                "a3a5e961.07f0a"
+                "6dadc494.d9aa04",
+                "672f337a.746964",
+                "bcaed2fe.1f9ae"
             ]
         ]
     },
     {
-        "id": "1276721a.95abce",
+        "id": "fe7f9a9e.cf1db8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3601.883026123047,
-        "y": 666.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3627.566390991211,
+        "y": 671.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5d3d475c.e8e038"
+                "cc05b9e7.0fc9a"
             ]
         ]
     },
     {
-        "id": "59c480c0.a5bb2",
+        "id": "156916f6.f1ec61",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3595.392059326172,
-        "y": 707.7117919921875,
-        "z": "1806503a.76a7a",
+        "x": 3621.075424194336,
+        "y": 712.9926910400391,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c3e2bb46.01e6a"
+                "4587637b.94db5c"
             ]
         ]
     },
     {
-        "id": "56433b78.3dde04",
+        "id": "66ef43c6.2e3d64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3590.392059326172,
-        "y": 757.7117919921875,
-        "z": "1806503a.76a7a",
+        "x": 3616.075424194336,
+        "y": 762.9926910400391,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1b66d741.6f4631"
+                "1eb5ad40.d06413"
             ]
         ]
     },
     {
-        "id": "5d3d475c.e8e038",
+        "id": "cc05b9e7.0fc9a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3750.454559326172,
-        "y": 665.571533203125,
-        "z": "1806503a.76a7a",
+        "x": 3776.137924194336,
+        "y": 670.8524322509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c3e2bb46.01e6a",
+        "id": "4587637b.94db5c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3740.392059326172,
-        "y": 715.7117919921875,
-        "z": "1806503a.76a7a",
+        "x": 3766.075424194336,
+        "y": 720.9926910400391,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "194bfca3.59d3d3",
+        "id": "6dadc494.d9aa04",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3566.883270263672,
-        "y": 818.28564453125,
-        "z": "1806503a.76a7a",
+        "x": 3592.566635131836,
+        "y": 823.5665435791016,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8a4c46dd.2c996"
+                "1b1304b9.a5e66b"
             ]
         ]
     },
     {
-        "id": "f16b27ad.e4a0d",
+        "id": "672f337a.746964",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3562.392303466797,
-        "y": 867.711669921875,
-        "z": "1806503a.76a7a",
+        "x": 3588.075668334961,
+        "y": 872.9925689697266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "171f1743.fcb899"
+                "e774fced.6104a8"
             ]
         ]
     },
     {
-        "id": "a3a5e961.07f0a",
+        "id": "bcaed2fe.1f9ae",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3563.392303466797,
-        "y": 920.711669921875,
-        "z": "1806503a.76a7a",
+        "x": 3589.075668334961,
+        "y": 925.9925689697266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c731b8e7.238d38"
+                "c076d47b.eaded"
             ]
         ]
     },
     {
-        "id": "8a4c46dd.2c996",
+        "id": "1b1304b9.a5e66b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3719.4546508789062,
-        "y": 823.5714111328125,
-        "z": "1806503a.76a7a",
+        "x": 3745.1380157470703,
+        "y": 828.8523101806641,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "171f1743.fcb899",
+        "id": "e774fced.6104a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3705.392303466797,
-        "y": 867.711669921875,
-        "z": "1806503a.76a7a",
+        "x": 3731.075668334961,
+        "y": 872.9925689697266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1b66d741.6f4631",
+        "id": "1eb5ad40.d06413",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3762.883026123047,
-        "y": 768.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3788.566390991211,
+        "y": 773.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cecd018.605a88"
+                "7f2b8c9b.099c14"
             ]
         ]
     },
     {
-        "id": "c731b8e7.238d38",
+        "id": "c076d47b.eaded",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3716.883270263672,
-        "y": 920.28564453125,
-        "z": "1806503a.76a7a",
+        "x": 3742.566635131836,
+        "y": 925.5665435791016,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f9f52da3.b95878"
+                "8445401a.e44628"
             ]
         ]
     },
     {
-        "id": "cecd018.605a88",
+        "id": "7f2b8c9b.099c14",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3923.883270263672,
-        "y": 655.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3949.566635131836,
+        "y": 660.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f0539c95.2ea1d",
-                "44b1b904.08834",
-                "41d8ce05.5caae"
+                "b0a8e75a.0829b8",
+                "40b074e3.b8cf9c",
+                "9b9082d.d33238"
             ]
         ]
     },
     {
-        "id": "f9f52da3.b95878",
+        "id": "8445401a.e44628",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3915.883270263672,
-        "y": 840.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3941.566635131836,
+        "y": 845.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "abd0f375.c30ff",
-                "eba9832a.ffee4",
-                "4bc67983.47c6f"
+                "65174d4b.beb5c4",
+                "b443365d.1a3bf",
+                "a01fe37.2547ea"
             ]
         ]
     },
     {
-        "id": "f0539c95.2ea1d",
+        "id": "b0a8e75a.0829b8",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4147.883758544922,
-        "y": 359.28570556640625,
-        "z": "1806503a.76a7a",
+        "x": 4173.567123413086,
+        "y": 364.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "653aef18.035f68"
+                "9aca5d50.3d0028"
             ]
         ]
     },
     {
-        "id": "44b1b904.08834",
+        "id": "40b074e3.b8cf9c",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4149.883758544922,
-        "y": 413.28570556640625,
-        "z": "1806503a.76a7a",
+        "x": 4175.567123413086,
+        "y": 418.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4456e14a.c61538"
+                "d411ea2f.0fea6"
             ]
         ]
     },
     {
-        "id": "abd0f375.c30ff",
+        "id": "65174d4b.beb5c4",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4113.883758544922,
-        "y": 619.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4139.567123413086,
+        "y": 624.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "dc25cb2f.e0da48"
+                "b1818ac5.01eff"
             ]
         ]
     },
     {
-        "id": "eba9832a.ffee4",
+        "id": "b443365d.1a3bf",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4115.883758544922,
-        "y": 673.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4141.567123413086,
+        "y": 678.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7b200b08.d1724c"
+                "7efc1cf.1fed664"
             ]
         ]
     },
     {
-        "id": "a11ab8.c3c2f548",
+        "id": "f6cae941.406738",
         "type": "set",
         "name": "set network-route-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4457.883758544922,
-        "y": 311.28570556640625,
-        "z": "1806503a.76a7a",
+        "x": 4483.567123413086,
+        "y": 316.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7e53eaf1.53c434",
+        "id": "71276df1.c00474",
         "type": "set",
         "name": "set network-route-LEAF",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4450.883758544922,
-        "y": 409.28570556640625,
-        "z": "1806503a.76a7a",
+        "x": 4476.567123413086,
+        "y": 414.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "231b0ffb.372688",
+        "id": "18b30ce8.3b3b9b",
         "type": "set",
         "name": "set network-route-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4429.883758544922,
-        "y": 592.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4455.567123413086,
+        "y": 597.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1b4ef1ae.221bae",
+        "id": "bdb5a388.dc57d",
         "type": "set",
         "name": "set network-route-LEAF",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4433.883758544922,
-        "y": 685.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4459.567123413086,
+        "y": 690.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f61c43e6.4dbe28",
+        "id": "365f833d.25b8d4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3609.88330078125,
-        "y": 1345.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3635.566665649414,
+        "y": 1350.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "58e01c76.2a233c"
+                "9fbce841.2e2e5"
             ]
         ]
     },
     {
-        "id": "f239d755.e3888",
+        "id": "374e0e92.acb9ca",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3619.374267578125,
-        "y": 1387.8598022460938,
-        "z": "1806503a.76a7a",
+        "x": 3645.057632446289,
+        "y": 1393.1407012939453,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ffe24b12.95af4"
+                "544f9b1.6ea9ce4"
             ]
         ]
     },
     {
-        "id": "7fecb9.d188bb48",
+        "id": "a1cbd1ad.ad2c18",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3607.88330078125,
-        "y": 1434.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3633.566665649414,
+        "y": 1439.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6af9609c.4c1ea"
+                "875bb611.eebb3"
             ]
         ]
     },
     {
-        "id": "6132f0e6.1cd1a8",
+        "id": "def43ac8.216f6",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3309.88330078125,
-        "y": 1307.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3335.566665649414,
+        "y": 1312.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "4618e1c0.461d88",
+        "id": "2c1d8b21.e96e8c",
         "type": "save",
         "name": "get p-interface-src from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3352.88330078125,
-        "y": 1372.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3378.566665649414,
+        "y": 1377.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f61c43e6.4dbe28",
-                "f239d755.e3888",
-                "7fecb9.d188bb48"
+                "365f833d.25b8d4",
+                "374e0e92.acb9ca",
+                "a1cbd1ad.ad2c18"
             ]
         ]
     },
     {
-        "id": "6aa3951e.157a4c",
+        "id": "b16688a0.4defc",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3353.883270263672,
-        "y": 1124.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3379.566635131836,
+        "y": 1129.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "273ca4a1.1ba064",
-                "4a30eba.076bb14"
+                "34aa1b4f.ba281c",
+                "141fecfc.2b9053"
             ]
         ]
     },
     {
-        "id": "4a30eba.076bb14",
+        "id": "141fecfc.2b9053",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3576.883270263672,
-        "y": 1110.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3602.566635131836,
+        "y": 1115.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3b0c1a6c.5d807e"
+                "6c70ba9f.edd1f4"
             ]
         ]
     },
     {
-        "id": "273ca4a1.1ba064",
+        "id": "34aa1b4f.ba281c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3578.883270263672,
-        "y": 1143.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3604.566635131836,
+        "y": 1148.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1277d9f.69171a6"
+                "809a76b0.69bfb"
             ]
         ]
     },
     {
-        "id": "58e01c76.2a233c",
+        "id": "9fbce841.2e2e5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3782.5498046875,
-        "y": 1344.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3808.233169555664,
+        "y": 1349.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f718a065.a6f86",
-                "66055190.fb6538"
+                "d947a96b.ec0e98",
+                "78e35528.26de5c"
             ]
         ]
     },
     {
-        "id": "ffe24b12.95af4",
+        "id": "544f9b1.6ea9ce4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3772.9456787109375,
-        "y": 1391.1455383300781,
-        "z": "1806503a.76a7a",
+        "x": 3798.6290435791016,
+        "y": 1396.4264373779297,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6af9609c.4c1ea",
+        "id": "875bb611.eebb3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3776.88330078125,
-        "y": 1435.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3802.566665649414,
+        "y": 1440.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f718a065.a6f86",
+        "id": "d947a96b.ec0e98",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4046.88330078125,
-        "y": 1328.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4072.566665649414,
+        "y": 1333.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "97c35025.9a9a9",
-                "3a478d5e.f8179a"
+                "15bba4b9.d2a05b",
+                "3ad9867a.e42d4a"
             ]
         ]
     },
     {
-        "id": "3a478d5e.f8179a",
+        "id": "3ad9867a.e42d4a",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4269.88330078125,
-        "y": 1283.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4295.566665649414,
+        "y": 1288.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e66b8dbe.739f2"
+                "6b929f53.c8f4f8"
             ]
         ]
     },
     {
-        "id": "97c35025.9a9a9",
+        "id": "15bba4b9.d2a05b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4271.88330078125,
-        "y": 1347.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4297.566665649414,
+        "y": 1352.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8b5a4d36.3a2bb8"
+                "1ee9816c.cbffbf"
             ]
         ]
     },
     {
-        "id": "8b5a4d36.3a2bb8",
+        "id": "1ee9816c.cbffbf",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4433.88330078125,
-        "y": 1343.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4459.566665649414,
+        "y": 1348.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e66b8dbe.739f2",
+        "id": "6b929f53.c8f4f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4434.88330078125,
-        "y": 1280.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4460.566665649414,
+        "y": 1285.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9ab6076f.b64fb",
-                "39801818.ba2ad"
+                "2ecc2d46.f12c7a",
+                "9183827d.0d9718"
             ]
         ]
     },
     {
-        "id": "1277d9f.69171a6",
+        "id": "809a76b0.69bfb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3721.883270263672,
-        "y": 1140.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3747.566635131836,
+        "y": 1145.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3b0c1a6c.5d807e",
+        "id": "6c70ba9f.edd1f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3724.883270263672,
-        "y": 1103.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3750.566635131836,
+        "y": 1108.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "67f68b93.dc06f4",
-                "41f439c7.6c07f8"
+                "920604a0.fd0cf",
+                "ad826b52.8e9fa"
             ]
         ]
     },
     {
-        "id": "67f68b93.dc06f4",
+        "id": "920604a0.fd0cf",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3916.883270263672,
-        "y": 1105.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3942.566635131836,
+        "y": 1110.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "66055190.fb6538",
+        "id": "78e35528.26de5c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4006.88330078125,
-        "y": 1460.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4032.566665649414,
+        "y": 1465.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c328fdc0.a05af"
+                "75c2427c.8c10cc"
             ]
         ]
     },
     {
-        "id": "c328fdc0.a05af",
+        "id": "75c2427c.8c10cc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4212.88330078125,
-        "y": 1460.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4238.566665649414,
+        "y": 1465.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "23ec2727.c8e7f"
+                "5fbadc48.b9fad4"
             ]
         ]
     },
     {
-        "id": "23ec2727.c8e7f",
+        "id": "5fbadc48.b9fad4",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4428.1689453125,
-        "y": 1460.1075439453125,
-        "z": "1806503a.76a7a",
+        "x": 4453.852310180664,
+        "y": 1465.388442993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e1b77e00.282c4"
+                "4d8b1a53.4482f4"
             ]
         ]
     },
     {
-        "id": "41f439c7.6c07f8",
+        "id": "ad826b52.8e9fa",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3913.883270263672,
-        "y": 1170.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3939.566635131836,
+        "y": 1175.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "89a8d2d0.88f3",
-                "6334a351.696854",
-                "c542e0e0.bf42b"
+                "70c21f01.ccf8c",
+                "fd021df7.11e338",
+                "df54403.64867c"
             ]
         ]
     },
     {
-        "id": "89a8d2d0.88f3",
+        "id": "70c21f01.ccf8c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4109.383392333984,
-        "y": 1122.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4135.066757202148,
+        "y": 1127.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c62cbf2d.6fa458"
+                "37006658.3814c2"
             ]
         ]
     },
     {
-        "id": "6334a351.696854",
+        "id": "fd021df7.11e338",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4101.383392333984,
-        "y": 1177.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4127.066757202148,
+        "y": 1182.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "143c4bf3.014b4c"
+                "24c12ef7.012c52"
             ]
         ]
     },
     {
-        "id": "c542e0e0.bf42b",
+        "id": "df54403.64867c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4106.383392333984,
-        "y": 1234.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4132.066757202148,
+        "y": 1239.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ca788cf9.3c8038"
+                "2b777797.09f0b8"
             ]
         ]
     },
     {
-        "id": "ca788cf9.3c8038",
+        "id": "2b777797.09f0b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4258.383392333984,
-        "y": 1235.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4284.066757202148,
+        "y": 1240.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "143c4bf3.014b4c",
+        "id": "24c12ef7.012c52",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4269.383392333984,
-        "y": 1180.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4295.066757202148,
+        "y": 1185.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c62cbf2d.6fa458",
+        "id": "37006658.3814c2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4253.765716552734,
-        "y": 1119.9414367675781,
-        "z": "1806503a.76a7a",
+        "x": 4279.449081420898,
+        "y": 1125.2223358154297,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "aab3feab.bcb5b"
+                "9c96e054.d5da8"
             ]
         ]
     },
     {
-        "id": "aab3feab.bcb5b",
+        "id": "9c96e054.d5da8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4447.883270263672,
-        "y": 1164.2857055664062,
-        "z": "1806503a.76a7a",
+        "x": 4473.566635131836,
+        "y": 1169.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ac9dba33.9ee3a8"
+                "efaf74dd.57cd28"
             ]
         ]
     },
     {
-        "id": "39801818.ba2ad",
+        "id": "9183827d.0d9718",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 4604.88330078125,
-        "y": 1238.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4630.566665649414,
+        "y": 1243.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9ab6076f.b64fb",
+        "id": "2ecc2d46.f12c7a",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
-        "x": 4605.88330078125,
-        "y": 1346.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4631.566665649414,
+        "y": 1351.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6381354a.11146c",
+        "id": "e06b7ada.eb82e8",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4606.88330078125,
-        "y": 1295.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4632.566665649414,
+        "y": 1300.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e1b77e00.282c4",
+        "id": "4d8b1a53.4482f4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4635.00048828125,
-        "y": 1460.6260986328125,
-        "z": "1806503a.76a7a",
+        "x": 4660.683853149414,
+        "y": 1465.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a1ad6a91.cdad1",
-                "bef51671.772a1",
-                "55e08f7a.b87978"
+                "dced3e1c.40e48",
+                "5a4be8c3.e9f088",
+                "301c508b.710a5"
             ]
         ]
     },
     {
-        "id": "a1ad6a91.cdad1",
+        "id": "dced3e1c.40e48",
         "type": "set",
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4850.00048828125,
-        "y": 1422.6260986328125,
-        "z": "1806503a.76a7a",
+        "x": 4875.683853149414,
+        "y": 1427.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "bef51671.772a1",
+        "id": "5a4be8c3.e9f088",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4847.00048828125,
-        "y": 1461.6260986328125,
-        "z": "1806503a.76a7a",
+        "x": 4872.683853149414,
+        "y": 1466.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "db81e8e0.68e13"
+                "34a88173.395bbe"
             ]
         ]
     },
     {
-        "id": "55e08f7a.b87978",
+        "id": "301c508b.710a5",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4802.50048828125,
-        "y": 1503.6260986328125,
-        "z": "1806503a.76a7a",
+        "x": 4828.183853149414,
+        "y": 1508.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "db81e8e0.68e13",
+        "id": "34a88173.395bbe",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5027.50048828125,
-        "y": 1460.6260986328125,
-        "z": "1806503a.76a7a",
+        "x": 5053.183853149414,
+        "y": 1465.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "52661a57.fe0a3c"
+                "91aa780.576ce08"
             ]
         ]
     },
     {
-        "id": "409a042d.2fadac",
+        "id": "46f94459.4a6e34",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4835.88330078125,
-        "y": 1056.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4861.566665649414,
+        "y": 1061.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f76f51b8.a98b3"
+                "eb72bb20.19559"
             ]
         ]
     },
     {
-        "id": "f76f51b8.a98b3",
+        "id": "eb72bb20.19559",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5012.88330078125,
-        "y": 1048.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5038.566665649414,
+        "y": 1053.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f1cd5bd3.ddbdb8",
-                "b8b89faf.7ac19"
+                "32b5afac.4ae738",
+                "92ed0f08.6c0c2"
             ]
         ]
     },
     {
-        "id": "ac9dba33.9ee3a8",
+        "id": "efaf74dd.57cd28",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4638.883270263672,
-        "y": 1154.2857055664062,
-        "z": "1806503a.76a7a",
+        "x": 4664.566635131836,
+        "y": 1159.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "409a042d.2fadac",
-                "80f5aaec.b0ffc8"
+                "46f94459.4a6e34",
+                "95ea5c2d.7d46e8"
             ]
         ]
     },
     {
-        "id": "80f5aaec.b0ffc8",
+        "id": "95ea5c2d.7d46e8",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4838.88330078125,
-        "y": 1130.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4864.566665649414,
+        "y": 1135.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bf72647d.49f538"
+                "93430c1b.104ce"
             ]
         ]
     },
     {
-        "id": "bf72647d.49f538",
+        "id": "93430c1b.104ce",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5015.88330078125,
-        "y": 1122.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5041.566665649414,
+        "y": 1127.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "97239b14.6f12c8"
+                "78b310b8.dd74"
             ]
         ]
     },
     {
-        "id": "52661a57.fe0a3c",
+        "id": "91aa780.576ce08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5185.50048828125,
-        "y": 1460.6260986328125,
-        "z": "1806503a.76a7a",
+        "x": 5211.183853149414,
+        "y": 1465.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5700a19e.1dbeb8"
+                "5b4e25f5.7b14e4"
             ]
         ]
     },
     {
-        "id": "5700a19e.1dbeb8",
+        "id": "5b4e25f5.7b14e4",
         "type": "set",
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5392.50048828125,
-        "y": 1460.6260986328125,
-        "z": "1806503a.76a7a",
+        "x": 5418.183853149414,
+        "y": 1465.906997680664,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b8b89faf.7ac19",
+        "id": "92ed0f08.6c0c2",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5220.88330078125,
-        "y": 1055.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5246.566665649414,
+        "y": 1060.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5d74c4c9.fd207c",
-                "bdb7d238.f96a08",
-                "7cf71a83.19030c"
+                "322d8e2.13d36f2",
+                "a2041883.aae29",
+                "fe986e1.586ed1"
             ]
         ]
     },
     {
-        "id": "f1cd5bd3.ddbdb8",
+        "id": "32b5afac.4ae738",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5250.88330078125,
-        "y": 1003.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5276.566665649414,
+        "y": 1008.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5d74c4c9.fd207c",
+        "id": "322d8e2.13d36f2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5430.88330078125,
-        "y": 1046.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5456.566665649414,
+        "y": 1051.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e430f4b5.90b5d"
+                "9ca79008.c70bf8"
             ]
         ]
     },
     {
-        "id": "bdb7d238.f96a08",
+        "id": "a2041883.aae29",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5422.88330078125,
-        "y": 1101.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5448.566665649414,
+        "y": 1106.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "46b0e213.0f69d4"
+                "ec84ed8c.59c368"
             ]
         ]
     },
     {
-        "id": "7cf71a83.19030c",
+        "id": "fe986e1.586ed1",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5427.88330078125,
-        "y": 1158.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5453.566665649414,
+        "y": 1163.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "99bfc958.cc2928"
+                "ae200af1.d5e5c8"
             ]
         ]
     },
     {
-        "id": "99bfc958.cc2928",
+        "id": "ae200af1.d5e5c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5579.88330078125,
-        "y": 1159.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5605.566665649414,
+        "y": 1164.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "46b0e213.0f69d4",
+        "id": "ec84ed8c.59c368",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5590.88330078125,
-        "y": 1104.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5616.566665649414,
+        "y": 1109.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e430f4b5.90b5d",
+        "id": "9ca79008.c70bf8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5575.265625,
-        "y": 1043.9414367675781,
-        "z": "1806503a.76a7a",
+        "x": 5600.948989868164,
+        "y": 1049.2223358154297,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3d0751e6.cf382e"
+                "e75f84ea.1b627"
             ]
         ]
     },
     {
-        "id": "97239b14.6f12c8",
+        "id": "78b310b8.dd74",
         "type": "set",
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5250.88330078125,
-        "y": 1246.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5276.566665649414,
+        "y": 1251.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3d0751e6.cf382e",
+        "id": "e75f84ea.1b627",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5789.88330078125,
-        "y": 1040.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5815.566665649414,
+        "y": 1045.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "33b11d1b.98a69a",
+        "id": "d425ccce.04f6a",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4445.883758544922,
-        "y": 347.28570556640625,
-        "z": "1806503a.76a7a",
+        "x": 4471.567123413086,
+        "y": 352.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2dc9cffb.3878b8",
+        "id": "72647ac9.fcc034",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4446.883728027344,
-        "y": 451.28570556640625,
-        "z": "1806503a.76a7a",
+        "x": 4472.567092895508,
+        "y": 456.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "653aef18.035f68",
+        "id": "9aca5d50.3d0028",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4270.883758544922,
-        "y": 353.28570556640625,
-        "z": "1806503a.76a7a",
+        "x": 4296.567123413086,
+        "y": 358.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a11ab8.c3c2f548",
-                "33b11d1b.98a69a"
+                "f6cae941.406738",
+                "d425ccce.04f6a"
             ]
         ]
     },
     {
-        "id": "4456e14a.c61538",
+        "id": "d411ea2f.0fea6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4276.883758544922,
-        "y": 417.28570556640625,
-        "z": "1806503a.76a7a",
+        "x": 4302.567123413086,
+        "y": 422.5666046142578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7e53eaf1.53c434",
-                "2dc9cffb.3878b8"
+                "71276df1.c00474",
+                "72647ac9.fcc034"
             ]
         ]
     },
     {
-        "id": "dc25cb2f.e0da48",
+        "id": "b1818ac5.01eff",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4241.883758544922,
-        "y": 619.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4267.567123413086,
+        "y": 624.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "231b0ffb.372688",
-                "3979d153.538ee6"
+                "18b30ce8.3b3b9b",
+                "e0b34ba1.74f538"
             ]
         ]
     },
     {
-        "id": "7b200b08.d1724c",
+        "id": "7efc1cf.1fed664",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4244.883758544922,
-        "y": 672.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4270.567123413086,
+        "y": 677.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1b4ef1ae.221bae",
-                "49dc9fac.676fe"
+                "bdb5a388.dc57d",
+                "f08a6dfd.10adf"
             ]
         ]
     },
     {
-        "id": "3979d153.538ee6",
+        "id": "e0b34ba1.74f538",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4415.883758544922,
-        "y": 632.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4441.567123413086,
+        "y": 637.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "49dc9fac.676fe",
+        "id": "f08a6dfd.10adf",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4418.883758544922,
-        "y": 723.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4444.567123413086,
+        "y": 728.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f7cb7391.6f67a",
+        "id": "e27939d4.dc1f9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3741.88330078125,
-        "y": 1802.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 3767.566665649414,
+        "y": 1807.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9a5ca37c.910178",
-                "2a8d98c8.2c78a"
+                "e945ebed.eb7548",
+                "77e0d458.7dce6c"
             ]
         ]
     },
     {
-        "id": "fd44019f.688f6",
+        "id": "f47a2634.b211d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3569.216796875,
-        "y": 1803.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 3594.900161743164,
+        "y": 1808.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f7cb7391.6f67a"
+                "e27939d4.dc1f9"
             ]
         ]
     },
     {
-        "id": "3eb019bb.1ee706",
+        "id": "4a8297d6.2a928",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3578.707763671875,
-        "y": 1845.8599243164062,
-        "z": "1806503a.76a7a",
+        "x": 3604.391128540039,
+        "y": 1851.1408233642578,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f4d10bee.1b32c"
+                "5c13cfc7.d7d798"
             ]
         ]
     },
     {
-        "id": "ef74e13b.116b3",
+        "id": "aeb5511b.98c418",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3567.216796875,
-        "y": 1892.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 3592.900161743164,
+        "y": 1897.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7a977b6c.124a74"
+                "6967c0f4.670908"
             ]
         ]
     },
     {
-        "id": "f4d10bee.1b32c",
+        "id": "5c13cfc7.d7d798",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3732.2791748046875,
-        "y": 1849.1456604003906,
-        "z": "1806503a.76a7a",
+        "x": 3757.9625396728516,
+        "y": 1854.4265594482422,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7a977b6c.124a74",
+        "id": "6967c0f4.670908",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3736.216796875,
-        "y": 1893.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 3761.900161743164,
+        "y": 1898.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9a5ca37c.910178",
+        "id": "e945ebed.eb7548",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4028.216796875,
-        "y": 1806.2860107421875,
-        "z": "1806503a.76a7a",
+        "x": 4053.900161743164,
+        "y": 1811.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "efd0a9b7.e547a8",
-                "caaf5e66.b1cb"
+                "e55a817f.49527",
+                "d5120a58.c5add"
             ]
         ]
     },
     {
-        "id": "caaf5e66.b1cb",
+        "id": "d5120a58.c5add",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4251.216796875,
-        "y": 1761.2860107421875,
-        "z": "1806503a.76a7a",
+        "x": 4276.900161743164,
+        "y": 1766.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5ec876cd.f1dea8"
+                "754abe34.cc3b8"
             ]
         ]
     },
     {
-        "id": "efd0a9b7.e547a8",
+        "id": "e55a817f.49527",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4253.216796875,
-        "y": 1825.2860107421875,
-        "z": "1806503a.76a7a",
+        "x": 4278.900161743164,
+        "y": 1830.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "72d34df6.13ce64"
+                "1b1e2d9b.600bda"
             ]
         ]
     },
     {
-        "id": "72d34df6.13ce64",
+        "id": "1b1e2d9b.600bda",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4412.216796875,
-        "y": 1844.2860107421875,
-        "z": "1806503a.76a7a",
+        "x": 4437.900161743164,
+        "y": 1849.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5ec876cd.f1dea8",
+        "id": "754abe34.cc3b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4416.216796875,
-        "y": 1758.2860107421875,
-        "z": "1806503a.76a7a",
+        "x": 4441.900161743164,
+        "y": 1763.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2854b6e2.b50402",
-                "1fbd987b.e2c578"
+                "e1fca79d.bcc158",
+                "d062e564.f9cc3"
             ]
         ]
     },
     {
-        "id": "eef6ad07.9c7d5",
+        "id": "9d9de9db.5c38b8",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3341.216796875,
-        "y": 1838.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 3366.900161743164,
+        "y": 1843.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fd44019f.688f6",
-                "3eb019bb.1ee706",
-                "ef74e13b.116b3"
+                "f47a2634.b211d8",
+                "4a8297d6.2a928",
+                "aeb5511b.98c418"
             ]
         ]
     },
     {
-        "id": "46101f8f.1fb8b8",
+        "id": "dcd55e2.3f6482",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3302.216796875,
-        "y": 1782.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 3327.900161743164,
+        "y": 1787.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d38e0865.514348",
+        "id": "63cddf09.26d868",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3353.216796875,
-        "y": 1577.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3378.900161743164,
+        "y": 1582.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f536d783.2e1028",
-                "54ea75a9.fca1c4"
+                "43aff4f9.b6b3e4",
+                "25e76471.03af04"
             ]
         ]
     },
     {
-        "id": "54ea75a9.fca1c4",
+        "id": "25e76471.03af04",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3576.216796875,
-        "y": 1563.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3601.900161743164,
+        "y": 1568.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3ffa66c6.048e62"
+                "a96745eb.fd51a8"
             ]
         ]
     },
     {
-        "id": "f536d783.2e1028",
+        "id": "43aff4f9.b6b3e4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3578.216796875,
-        "y": 1596.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3603.900161743164,
+        "y": 1601.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "73c7be78.48771"
+                "65d2388d.31966"
             ]
         ]
     },
     {
-        "id": "73c7be78.48771",
+        "id": "65d2388d.31966",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3721.216796875,
-        "y": 1593.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3746.900161743164,
+        "y": 1598.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3ffa66c6.048e62",
+        "id": "a96745eb.fd51a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3724.216796875,
-        "y": 1556.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3749.900161743164,
+        "y": 1561.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "116bcef1.41b689",
-                "bd9fbc09.ccb15"
+                "e299d57.a910ca8",
+                "f2c7502b.08699"
             ]
         ]
     },
     {
-        "id": "116bcef1.41b689",
+        "id": "e299d57.a910ca8",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3918.216796875,
-        "y": 1559.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 3943.900161743164,
+        "y": 1564.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2a8d98c8.2c78a",
+        "id": "77e0d458.7dce6c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3969.216766357422,
-        "y": 1939.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3994.900131225586,
+        "y": 1944.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "821e2eef.7d9ce8"
+                "e086896d.a84a3"
             ]
         ]
     },
     {
-        "id": "821e2eef.7d9ce8",
+        "id": "e086896d.a84a3",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4175.216766357422,
-        "y": 1939.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4200.900131225586,
+        "y": 1944.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b9228d23.f35b1"
+                "7b35902c.38cf98"
             ]
         ]
     },
     {
-        "id": "b9228d23.f35b1",
+        "id": "7b35902c.38cf98",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4392.502410888672,
-        "y": 1938.1075439453125,
-        "z": "1806503a.76a7a",
+        "x": 4418.185775756836,
+        "y": 1943.388442993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1db12922.ce9147"
+                "3adb3c4.e1dbc44"
             ]
         ]
     },
     {
-        "id": "bd9fbc09.ccb15",
+        "id": "f2c7502b.08699",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3940.216796875,
-        "y": 1627.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 3965.900161743164,
+        "y": 1632.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "71a75cfd.cb2324",
-                "c5a92d1c.748898",
-                "d4c41231.0d38f"
+                "816c398a.a95008",
+                "793de235.310dbc",
+                "438956b5.03e5"
             ]
         ]
     },
     {
-        "id": "71a75cfd.cb2324",
+        "id": "816c398a.a95008",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4135.7169189453125,
-        "y": 1579.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4161.400283813477,
+        "y": 1584.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "55c143a3.bf5e9c"
+                "c1f38920.d25ea"
             ]
         ]
     },
     {
-        "id": "c5a92d1c.748898",
+        "id": "793de235.310dbc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4127.7169189453125,
-        "y": 1634.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4153.400283813477,
+        "y": 1639.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a19a5afd.bfc2c"
+                "cab6de35.b52228"
             ]
         ]
     },
     {
-        "id": "d4c41231.0d38f",
+        "id": "438956b5.03e5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4132.7169189453125,
-        "y": 1691.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4158.400283813477,
+        "y": 1696.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5c56b620.c82d88"
+                "a8484dc0.47884"
             ]
         ]
     },
     {
-        "id": "5c56b620.c82d88",
+        "id": "a8484dc0.47884",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4284.7169189453125,
-        "y": 1692.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4310.400283813477,
+        "y": 1697.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a19a5afd.bfc2c",
+        "id": "cab6de35.b52228",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4295.7169189453125,
-        "y": 1637.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4321.400283813477,
+        "y": 1642.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "55c143a3.bf5e9c",
+        "id": "c1f38920.d25ea",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4280.0992431640625,
-        "y": 1576.9415588378906,
-        "z": "1806503a.76a7a",
+        "x": 4305.782608032227,
+        "y": 1582.2224578857422,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "79a34acd.c9a0bc"
+                "afe15cf0.f36818"
             ]
         ]
     },
     {
-        "id": "2854b6e2.b50402",
+        "id": "e1fca79d.bcc158",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 4586.216796875,
-        "y": 1719.2860107421875,
-        "z": "1806503a.76a7a",
+        "x": 4611.900161743164,
+        "y": 1724.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1fbd987b.e2c578",
+        "id": "d062e564.f9cc3",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
-        "x": 4587.216796875,
-        "y": 1824.2860107421875,
-        "z": "1806503a.76a7a",
+        "x": 4612.900161743164,
+        "y": 1829.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8823cb9b.b21f5",
+        "id": "808f1d51.43ea1",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4582.216796875,
-        "y": 1773.2860107421875,
-        "z": "1806503a.76a7a",
+        "x": 4607.900161743164,
+        "y": 1778.566909790039,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1db12922.ce9147",
+        "id": "3adb3c4.e1dbc44",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4599.333953857422,
-        "y": 1927.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 4625.017318725586,
+        "y": 1932.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4fe8713d.4f503",
-                "c4b73dd8.f86748",
-                "cf5e37a1.834b48"
+                "d9f1d004.ab36e8",
+                "c34231fa.58e828",
+                "e0d690d7.a8c998"
             ]
         ]
     },
     {
-        "id": "4fe8713d.4f503",
+        "id": "d9f1d004.ab36e8",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4814.333953857422,
-        "y": 1889.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 4840.017318725586,
+        "y": 1894.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c4b73dd8.f86748",
+        "id": "c34231fa.58e828",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4811.333953857422,
-        "y": 1928.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 4837.017318725586,
+        "y": 1933.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fd454717.5864e8"
+                "1c725cd0.b941cb"
             ]
         ]
     },
     {
-        "id": "cf5e37a1.834b48",
+        "id": "e0d690d7.a8c998",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4766.833953857422,
-        "y": 1970.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 4792.517318725586,
+        "y": 1975.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "fd454717.5864e8",
+        "id": "1c725cd0.b941cb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4991.833953857422,
-        "y": 1927.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 5017.517318725586,
+        "y": 1932.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6021f32a.54d8fc"
+                "d4ead200.f358d"
             ]
         ]
     },
     {
-        "id": "6021f32a.54d8fc",
+        "id": "d4ead200.f358d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5149.833953857422,
-        "y": 1927.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 5175.517318725586,
+        "y": 1932.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1a613df3.ff444a"
+                "21d1a6b2.01b042"
             ]
         ]
     },
     {
-        "id": "1a613df3.ff444a",
+        "id": "21d1a6b2.01b042",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5356.833953857422,
-        "y": 1927.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 5382.517318725586,
+        "y": 1932.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1465bad2.a0d805",
+        "id": "4c098907.41a99",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4862.216796875,
-        "y": 1595.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4887.900161743164,
+        "y": 1600.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f75a0195.2a4c5"
+                "801eca00.935f68"
             ]
         ]
     },
     {
-        "id": "f75a0195.2a4c5",
+        "id": "801eca00.935f68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5039.216796875,
-        "y": 1587.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5064.900161743164,
+        "y": 1592.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1de23279.e8bad6",
-                "95237093.1f1c18"
+                "387f801c.205ae8",
+                "9175f1b.049129"
             ]
         ]
     },
     {
-        "id": "79a34acd.c9a0bc",
+        "id": "afe15cf0.f36818",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4464.216796875,
-        "y": 1591.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4489.900161743164,
+        "y": 1596.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b5cddb2a.47fb5"
+                "311e9242.e1d87e"
             ]
         ]
     },
     {
-        "id": "b5cddb2a.47fb5",
+        "id": "311e9242.e1d87e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4659.216796875,
-        "y": 1591.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4684.900161743164,
+        "y": 1596.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1465bad2.a0d805",
-                "a6e303e4.3eb668"
+                "4c098907.41a99",
+                "349df30f.7cba04"
             ]
         ]
     },
     {
-        "id": "95237093.1f1c18",
+        "id": "9175f1b.049129",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5247.216796875,
-        "y": 1594.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5272.900161743164,
+        "y": 1599.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2d3d2acb.c107b6",
-                "fb5337e0.94ced8",
-                "752448e6.ec72a8"
+                "42985b25.52fcec",
+                "e5b701e3.8392b",
+                "3efd20ec.3f4778"
             ]
         ]
     },
     {
-        "id": "6879e9be.d7aee",
+        "id": "b70a777b.22a5f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5041.216796875,
-        "y": 1660.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5066.900161743164,
+        "y": 1665.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8691b2ec.22b9d8"
+                "8a34b29e.6de5e8"
             ]
         ]
     },
     {
-        "id": "a6e303e4.3eb668",
+        "id": "349df30f.7cba04",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4864.216796875,
-        "y": 1668.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4889.900161743164,
+        "y": 1673.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6879e9be.d7aee"
+                "b70a777b.22a5f8"
             ]
         ]
     },
     {
-        "id": "1de23279.e8bad6",
+        "id": "387f801c.205ae8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5277.216796875,
-        "y": 1542.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5302.900161743164,
+        "y": 1547.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8691b2ec.22b9d8",
+        "id": "8a34b29e.6de5e8",
         "type": "set",
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5254.216796875,
-        "y": 1726.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5279.900161743164,
+        "y": 1731.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2d3d2acb.c107b6",
+        "id": "42985b25.52fcec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5457.216796875,
-        "y": 1585.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5482.900161743164,
+        "y": 1590.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a3e7410.2b3c44"
+                "16d18a71.6daf16"
             ]
         ]
     },
     {
-        "id": "fb5337e0.94ced8",
+        "id": "e5b701e3.8392b",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5449.216796875,
-        "y": 1640.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5474.900161743164,
+        "y": 1645.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "656cbbf6.41438c"
+                "6ba1c131.2a9348"
             ]
         ]
     },
     {
-        "id": "752448e6.ec72a8",
+        "id": "3efd20ec.3f4778",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5454.216796875,
-        "y": 1697.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5479.900161743164,
+        "y": 1702.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6bb525a1.9cb52c"
+                "e5aceb1d.a2ff7"
             ]
         ]
     },
     {
-        "id": "6bb525a1.9cb52c",
+        "id": "e5aceb1d.a2ff7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5606.216796875,
-        "y": 1698.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5631.900161743164,
+        "y": 1703.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "656cbbf6.41438c",
+        "id": "6ba1c131.2a9348",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5617.216796875,
-        "y": 1643.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5642.900161743164,
+        "y": 1648.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a3e7410.2b3c44",
+        "id": "16d18a71.6daf16",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5601.59912109375,
-        "y": 1582.9415588378906,
-        "z": "1806503a.76a7a",
+        "x": 5627.282485961914,
+        "y": 1588.2224578857422,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "99742e42.2fdbd8"
+                "c4efa7e8.819f98"
             ]
         ]
     },
     {
-        "id": "99742e42.2fdbd8",
+        "id": "c4efa7e8.819f98",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5816.216796875,
-        "y": 1579.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5841.900161743164,
+        "y": 1584.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "78d4922e.8ebe04",
+        "id": "e5f9b3dc.c2f9f",
         "type": "set",
         "name": "set LEAF stuff",
         "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
         "comments": "",
-        "x": 3314.88330078125,
-        "y": 1449.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3340.566665649414,
+        "y": 1454.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c220ecdf.76a978",
+        "id": "169ca3b9.4d31a4",
         "type": "set",
         "name": "set ROOT stuff",
         "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
         "comments": "",
-        "x": 3301.88330078125,
-        "y": 1969.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 3327.566665649414,
+        "y": 1974.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b4f5dada.48378",
+        "id": "426ddfc0.c628b",
         "type": "execute",
         "name": "execute UUID generator for ethernet-service-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2426.883331298828,
-        "y": 162.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2452.566696166992,
+        "y": 167.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5db562b1.71111c",
+        "id": "d0874bda.7e1ac",
         "type": "set",
         "name": "set new ethernet-service-name",
         "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
         "comments": "",
-        "x": 2360.883331298828,
-        "y": 198.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2386.566696166992,
+        "y": 203.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3f2dec8d.5c3844",
+        "id": "2daf88d4.4069b",
         "type": "comment",
         "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
         "info": "",
         "comments": "",
-        "x": 2545.883331298828,
-        "y": 125.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 2571.566696166992,
+        "y": 130.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8ae1ae92.9d4708",
+        "id": "4d0caa12.a83adc",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4072.88330078125,
-        "y": 1427.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4098.566665649414,
+        "y": 1432.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f4b4f4b0.73db2",
+        "id": "325da1a4.661aa6",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4028.883270263672,
-        "y": 1891.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4054.566635131836,
+        "y": 1896.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "4304e2aa.cc073c",
+        "id": "eca8d05b.38fb78",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2737.8836669921875,
-        "y": 7259.28564453125,
-        "z": "1806503a.76a7a",
+        "x": 2763.5670318603516,
+        "y": 7264.566543579102,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f849984b.dddac",
+        "id": "9a99585.3b52728",
         "type": "comment",
         "name": "START OF DELETE OPERATION",
         "info": "",
         "comments": "",
-        "x": 3296.88330078125,
-        "y": 2451.2857360839844,
-        "z": "1806503a.76a7a",
+        "x": 3322.566665649414,
+        "y": 2456.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ff6310d.2048a7",
+        "id": "e1bb190b.e249c8",
         "type": "save",
         "name": "delete LEAF uni resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3880.566650390625,
-        "y": 2552.6858520507812,
-        "z": "1806503a.76a7a",
+        "x": 3906.250015258789,
+        "y": 2557.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "14f1d608.fff342",
+        "id": "19822907.e2052f",
         "type": "save",
         "name": "get LEAF uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.LEAF.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.leafuni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3251.566650390625,
-        "y": 2532.6858520507812,
-        "z": "1806503a.76a7a",
+        "x": 3277.250015258789,
+        "y": 2537.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "30a4f59e.3fde12",
-                "98adc704.004778",
-                "91611e7f.d3eaa8"
+                "3e98cd57.b05732",
+                "c601135d.8ebcb8",
+                "224a5da0.cc93c2"
             ]
         ]
     },
     {
-        "id": "98adc704.004778",
+        "id": "c601135d.8ebcb8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3479.0576171875,
-        "y": 2505.2598266601562,
-        "z": "1806503a.76a7a",
+        "x": 3504.740982055664,
+        "y": 2510.540725708008,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "94257401.34831"
+                "ad084de2.e988e8"
             ]
         ]
     },
     {
-        "id": "91611e7f.d3eaa8",
+        "id": "224a5da0.cc93c2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3474.566650390625,
-        "y": 2549.685791015625,
-        "z": "1806503a.76a7a",
+        "x": 3500.250015258789,
+        "y": 2554.9666900634766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c2c26a41.57e9c"
+                "dcac28ad.d4a36"
             ]
         ]
     },
     {
-        "id": "94257401.34831",
+        "id": "ad084de2.e988e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 3641.629150390625,
-        "y": 2504.5455322265625,
-        "z": "1806503a.76a7a",
+        "x": 3667.312515258789,
+        "y": 2509.826431274414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c2c26a41.57e9c",
+        "id": "dcac28ad.d4a36",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3642.566650390625,
-        "y": 2549.685791015625,
-        "z": "1806503a.76a7a",
+        "x": 3668.250015258789,
+        "y": 2554.9666900634766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "30a4f59e.3fde12",
+        "id": "3e98cd57.b05732",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3486.566650390625,
-        "y": 2599.6858520507812,
-        "z": "1806503a.76a7a",
+        "x": 3512.250015258789,
+        "y": 2604.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4d0f2575.137edc"
+                "eb73cd4.3d8393"
             ]
         ]
     },
     {
-        "id": "4d0f2575.137edc",
+        "id": "eb73cd4.3d8393",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3638.88330078125,
-        "y": 2603.2857055664062,
-        "z": "1806503a.76a7a",
+        "x": 3664.566665649414,
+        "y": 2608.566604614258,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "589d867c.eeacb",
-                "ff6310d.2048a7",
-                "84152b78.a442c8",
-                "1e88543b.84a814"
+                "24f11631.71c6d2",
+                "e1bb190b.e249c8",
+                "5066cd38.1c6414",
+                "5dc3af5e.92a278"
             ]
         ]
     },
     {
-        "id": "589d867c.eeacb",
+        "id": "24f11631.71c6d2",
         "type": "set",
         "name": "set bwToBeDecreased tpid cvlan",
         "xml": "<set>\n<parameter name='bwToBeDecreased' value=\"`$tmp.aai.leafuni.data-source`\" />\n<parameter name='tpid' value='`$tmp.aai.leafuni.tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.leafuni.cvlan`' />\n\n\n",
         "comments": "",
-        "x": 3883.566650390625,
-        "y": 2495.6858520507812,
-        "z": "1806503a.76a7a",
+        "x": 3909.250015258789,
+        "y": 2500.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "243640c4.1190f8",
+        "id": "80dbb6de.b49838",
         "type": "comment",
         "name": "Update ROOT UNI's bw",
         "info": "",
         "comments": "",
-        "x": 3845.566650390625,
-        "y": 2606.4857177734375,
-        "z": "1806503a.76a7a",
+        "x": 3871.250015258789,
+        "y": 2611.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "83d2a0c.fbf83e",
+        "id": "45c0e5f4.f4ad34",
         "type": "save",
         "name": "update ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4523.566650390625,
-        "y": 2649.4857177734375,
-        "z": "1806503a.76a7a",
+        "x": 4549.250015258789,
+        "y": 2654.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "84152b78.a442c8",
+        "id": "5066cd38.1c6414",
         "type": "save",
         "name": "get root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3837.56640625,
-        "y": 2652.4857177734375,
-        "z": "1806503a.76a7a",
+        "x": 3863.249771118164,
+        "y": 2657.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ee63dcff.30bad",
-                "80208a9d.4e9bb",
-                "3e7ba9dc.c77e76"
+                "a6e50ef0.8e2c5",
+                "13029608.69349a",
+                "208dd481.7b2554"
             ]
         ]
     },
     {
-        "id": "80208a9d.4e9bb",
+        "id": "13029608.69349a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4141.057373046875,
-        "y": 2563.0596923828125,
-        "z": "1806503a.76a7a",
+        "x": 4166.740737915039,
+        "y": 2568.340591430664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ee49c3d8.4041d8"
+                "a4cd8e0.5d99ef"
             ]
         ]
     },
     {
-        "id": "3e7ba9dc.c77e76",
+        "id": "208dd481.7b2554",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4136.56640625,
-        "y": 2607.4856567382812,
-        "z": "1806503a.76a7a",
+        "x": 4162.249771118164,
+        "y": 2612.766555786133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e34757d5.3f1ff8"
+                "a8fd408a.63278"
             ]
         ]
     },
     {
-        "id": "ee49c3d8.4041d8",
+        "id": "a4cd8e0.5d99ef",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4303.62890625,
-        "y": 2562.3453979492188,
-        "z": "1806503a.76a7a",
+        "x": 4329.312271118164,
+        "y": 2567.6262969970703,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e34757d5.3f1ff8",
+        "id": "a8fd408a.63278",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4304.56640625,
-        "y": 2607.4856567382812,
-        "z": "1806503a.76a7a",
+        "x": 4330.249771118164,
+        "y": 2612.766555786133,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "be9d3338.5121d",
+        "id": "108d95bc.e243b2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4301.56640625,
-        "y": 2657.4857177734375,
-        "z": "1806503a.76a7a",
+        "x": 4327.249771118164,
+        "y": 2662.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "933a8e8f.7ef918",
-                "83d2a0c.fbf83e"
+                "6fb618e0.320358",
+                "45c0e5f4.f4ad34"
             ]
         ]
     },
     {
-        "id": "ee63dcff.30bad",
+        "id": "a6e50ef0.8e2c5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4132.56640625,
-        "y": 2657.4857177734375,
-        "z": "1806503a.76a7a",
+        "x": 4158.249771118164,
+        "y": 2662.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "be9d3338.5121d"
+                "108d95bc.e243b2"
             ]
         ]
     },
     {
-        "id": "933a8e8f.7ef918",
+        "id": "6fb618e0.320358",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
-        "x": 4483.567138671875,
-        "y": 2599.4857177734375,
-        "z": "1806503a.76a7a",
+        "x": 4509.250503540039,
+        "y": 2604.766616821289,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "21e69316.d31a3c",
+        "id": "501ef6fe.de27d8",
         "type": "comment",
         "name": "Delete LEAF UNI",
         "info": "",
         "comments": "",
-        "x": 3831.88330078125,
-        "y": 2437.2857055664062,
-        "z": "1806503a.76a7a",
+        "x": 3857.566665649414,
+        "y": 2442.566604614258,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "45cb1d93.9cef0c",
+        "id": "13751b77.2d6a35",
         "type": "set",
         "name": "set current-provider-id and current-cvlan-id",
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
         "comments": "",
-        "x": 3311.749969482422,
-        "y": 3769.8858032226562,
-        "z": "1806503a.76a7a",
+        "x": 3337.433334350586,
+        "y": 3775.166702270508,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "95cc6144.fb6bd8",
+        "id": "42ae91e0.cfd958",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3444.749969482422,
-        "y": 3817.8858032226562,
-        "z": "1806503a.76a7a",
+        "x": 3470.433334350586,
+        "y": 3823.166702270508,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "21aeddc1.06f77a",
+        "id": "f0c980e9.4c97f",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3266.749969482422,
-        "y": 3869.6858520507812,
-        "z": "1806503a.76a7a",
+        "x": 3292.433334350586,
+        "y": 3874.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "218077ad.f30d3",
-                "a4239ce5.8829c"
+                "ddd00137.0625f8",
+                "49bc5de5.143edc"
             ]
         ]
     },
     {
-        "id": "218077ad.f30d3",
+        "id": "ddd00137.0625f8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3459.749969482422,
-        "y": 3870.6858520507812,
-        "z": "1806503a.76a7a",
+        "x": 3485.433334350586,
+        "y": 3875.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "dcbbe6d2.fa9028"
+                "baae6201.7fdf3"
             ]
         ]
     },
     {
-        "id": "dcbbe6d2.fa9028",
+        "id": "baae6201.7fdf3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
         "comments": "",
-        "x": 3603.749969482422,
-        "y": 3866.8858032226562,
-        "z": "1806503a.76a7a",
+        "x": 3629.433334350586,
+        "y": 3872.166702270508,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a4239ce5.8829c",
+        "id": "49bc5de5.143edc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3463.749969482422,
-        "y": 3914.6858520507812,
-        "z": "1806503a.76a7a",
+        "x": 3489.433334350586,
+        "y": 3919.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "338c28da.4908c8"
+                "8955d942.ba6bc"
             ]
         ]
     },
     {
-        "id": "338c28da.4908c8",
+        "id": "8955d942.ba6bc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3602.749969482422,
-        "y": 3909.6858520507812,
-        "z": "1806503a.76a7a",
+        "x": 3628.433334350586,
+        "y": 3914.966751098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "40a81b6.e879ce4",
-                "fe7c3ff6.ce34b8",
-                "af03ee84.d16068"
+                "2c8b9b3a.156d1c",
+                "942c3741.17e638",
+                "ea29b2fb.fa9b"
             ]
         ]
     },
     {
-        "id": "40a81b6.e879ce4",
+        "id": "2c8b9b3a.156d1c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3853.149627685547,
-        "y": 3918.2024536132812,
-        "z": "1806503a.76a7a",
+        "x": 3878.832992553711,
+        "y": 3923.483352661133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3fc00cbe.f344f4"
+                "829ce491.bb75d8"
             ]
         ]
     },
     {
-        "id": "3fc00cbe.f344f4",
+        "id": "829ce491.bb75d8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4075.149627685547,
-        "y": 3896.2024536132812,
-        "z": "1806503a.76a7a",
+        "x": 4100.832992553711,
+        "y": 3901.483352661133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "57d9d04a.beb888"
+                "b35a1aab.3a595"
             ]
         ]
     },
     {
-        "id": "57d9d04a.beb888",
+        "id": "b35a1aab.3a595",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4235.149139404297,
-        "y": 3876.2024536132812,
-        "z": "1806503a.76a7a",
+        "x": 4260.832504272461,
+        "y": 3881.483352661133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5fa67fdd.e511b8"
+                "335ed745.f60fb8"
             ]
         ]
     },
     {
-        "id": "b9bbd69a.136aa8",
+        "id": "f8921006.06e1a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4388.149658203125,
-        "y": 3857.2024841308594,
-        "z": "1806503a.76a7a",
+        "x": 4413.833023071289,
+        "y": 3862.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "17e2ea6.f8df196",
-                "947c4850.aa8df"
+                "8d9ae5c3.a9c288",
+                "b59230eb.4dd598"
             ]
         ]
     },
     {
-        "id": "17e2ea6.f8df196",
+        "id": "8d9ae5c3.a9c288",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
-        "x": 4584.649871826172,
-        "y": 3825.2857055664062,
-        "z": "1806503a.76a7a",
+        "x": 4610.333236694336,
+        "y": 3830.566604614258,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "fe7c3ff6.ce34b8",
+        "id": "942c3741.17e638",
         "type": "set",
         "name": "set tmp.stillHasUn tmp.keepVPNBs to FALSE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='false' />\n<parameter name='tmp.keepVPNBs' value='false' />\n",
         "comments": "",
-        "x": 3959.64990234375,
-        "y": 3837.2857360839844,
-        "z": "1806503a.76a7a",
+        "x": 3985.333267211914,
+        "y": 3842.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "af03ee84.d16068",
+        "id": "ea29b2fb.fa9b",
         "type": "switchNode",
         "name": "switch tmp.keepVPNBs?",
         "xml": "\n<switch test=\"`$tmp.keepVPNBs`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3767.64990234375,
-        "y": 4258.285980224609,
-        "z": "1806503a.76a7a",
+        "x": 3793.333267211914,
+        "y": 4263.566879272461,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "77a80484.fb13cc",
-                "a722846c.585ad"
+                "1074f3a1.e40104",
+                "49cd5621.2fb45"
             ]
         ]
     },
     {
-        "id": "947c4850.aa8df",
+        "id": "b59230eb.4dd598",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4552.88330078125,
-        "y": 3893.2857360839844,
-        "z": "1806503a.76a7a",
+        "x": 4578.566665649414,
+        "y": 3898.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a722846c.585ad",
+        "id": "49cd5621.2fb45",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 154.65066528320312,
-        "y": 5322.286224365234,
-        "z": "1806503a.76a7a",
+        "x": 180.3340301513672,
+        "y": 5327.567123413086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c0a1014a.3ea75"
+                "94db503d.b50288"
             ]
         ]
     },
     {
-        "id": "77a80484.fb13cc",
+        "id": "1074f3a1.e40104",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3988.650634765625,
-        "y": 4360.285980224609,
-        "z": "1806503a.76a7a",
+        "x": 4014.333999633789,
+        "y": 4365.566879272461,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8774c38d.ee5b7"
+                "98bce2a7.eae0e8"
             ]
         ]
     },
     {
-        "id": "8774c38d.ee5b7",
+        "id": "98bce2a7.eae0e8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4131.650634765625,
-        "y": 4356.285980224609,
-        "z": "1806503a.76a7a",
+        "x": 4157.333999633789,
+        "y": 4361.566879272461,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f67d6e8d.c4ab",
-                "1d885097.bf6b2f",
-                "bd8e5c03.dfc108",
-                "19328269.e896be",
-                "93e60704.65dbd",
-                "8b3d1eff.18e008",
-                "ffd8a757.b8a3f",
-                "b33560b0.1278c",
-                "fc616200.2baf58"
+                "700868f.6d62d18",
+                "9e6ef63b.470c28",
+                "98c15798.fc2c28",
+                "a474eb09.bdcea",
+                "4e75594e.323fe8",
+                "8985192.1ed6868",
+                "bbed6bed.031a08",
+                "9b06d9ac.c2c2b",
+                "35800841.c29e7"
             ]
         ]
     },
     {
-        "id": "9c91ac5e.705b8",
+        "id": "7a0c4e0f.7452f",
         "type": "comment",
         "name": "keepVPNBs == false, then check tmp.stillHasUni",
         "info": "(2) keepVPNBs == false, means there are no other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\ncheck if tmp.stillHasUni is True or False?\n\nif TRUE --> means this domain (connectivity) still has other UNIs\n- delete VPNBs\n- delete LEAF UNI in AAI -- DONE\n- upadte bw in ROOT UNI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC\n- change ROOT conn status to Modified\n--- mark LEAF connectivity as Modified because the underlay OTN tunnel list of this connectivity is now different\n\nif FALSE --> means this domain (connectivity) has no other UNIs\n\nif MMstillHasUni == TRUE, means scenario (3), else, means scenario (4)\n\n(3) & (4) both:\n- delete VPNBs\n- delete LEAF connectivity\n- delete LEAF Ethernet Service from PNC\n\n(3) only:\n- change ROOT conn status to Modified\n- Keep the middle-man-conn and DON'T delete\n\n(4) only:\n- delete ROOT UNI\n- delete ROOT conn from AAI\n- delete ROOT Ethernet Service from PNC\n- delete middle-man-conn from AAI\n\n",
         "comments": "",
-        "x": 181,
-        "y": 5278.286224365234,
-        "z": "1806503a.76a7a",
+        "x": 206.68336486816406,
+        "y": 5283.567123413086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "fa1b93d9.936e7",
+        "id": "7ce224df.f32d34",
         "type": "comment",
         "name": "There are still other UNIs in this connectivity that share same OLT node. Only update bw of the vpn-bindings involved",
         "info": "(1) keepVPNBs == true, means there are still other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\n- Only update bw of the vpn-bindings involved -- DONE\n- upadte bw in ROOT UNI -- DONE\n- change ROOT conn status to Modified -- DONE\n- delete LEAF UNI in AAI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC -- DONE\n- DON'T delete the connectivities of LEAF and ROOT -- DONE\nAlso update the ethernet services",
         "comments": "",
-        "x": 4007.884033203125,
-        "y": 4323.285980224609,
-        "z": "1806503a.76a7a",
+        "x": 4033.567398071289,
+        "y": 4328.566879272461,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "30095233.787426",
+        "id": "eb1e9e05.cb15c8",
         "type": "set",
         "name": "set srcTtp OTN layer",
         "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
         "comments": "",
-        "x": 4820.667724609375,
-        "y": 4514.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 4846.351089477539,
+        "y": 4519.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "298f2b5b.0aab2c",
+        "id": "1fff7e41.5e97da",
         "type": "switchNode",
         "name": "switch provider-id domainA",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5165.667724609375,
-        "y": 4376.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 5191.351089477539,
+        "y": 4381.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1597a82b.d6bf2"
+                "384897a.b5a9568"
             ]
         ]
     },
     {
-        "id": "1126bc47.b4d98c",
+        "id": "3095386e.cc8938",
         "type": "for",
         "name": "for netwidx..allNetworksList_length",
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 4872.667724609375,
-        "y": 4370.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 4898.351089477539,
+        "y": 4375.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "298f2b5b.0aab2c"
+                "1fff7e41.5e97da"
             ]
         ]
     },
     {
-        "id": "9ba49429.2785d",
+        "id": "31c473ae.f4e764",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5127.667724609375,
-        "y": 4327.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 5153.351089477539,
+        "y": 4332.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "ace3cbea.15731",
+        "id": "ca81f202.b30418",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
         "comments": "",
-        "x": 4816.667724609375,
-        "y": 4422.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 4842.351089477539,
+        "y": 4427.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1d3af694.aab3a1",
+        "id": "b2478692.ea1d6",
         "type": "set",
         "name": "set tmp.pce-src-node",
         "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
         "comments": "",
-        "x": 4824.667724609375,
-        "y": 4467.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 4850.351089477539,
+        "y": 4472.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7a0d3acc.4e0354",
+        "id": "eb2b76ee.d20fa8",
         "type": "set",
         "name": "unset otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
         "comments": "",
-        "x": 4821.667724609375,
-        "y": 4320.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 4847.351089477539,
+        "y": 4325.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1597a82b.d6bf2",
+        "id": "384897a.b5a9568",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5074.667724609375,
-        "y": 4444.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 5100.351089477539,
+        "y": 4449.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "247fb61.2b27f4a"
+                "a1cf1e6d.96424"
             ]
         ]
     },
     {
-        "id": "247fb61.2b27f4a",
+        "id": "a1cf1e6d.96424",
         "type": "switchNode",
         "name": "switch te-topo-id",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5259.667724609375,
-        "y": 4443.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 5285.351089477539,
+        "y": 4448.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d2d679f0.fa9e7"
+                "e54e7c9a.d7146"
             ]
         ]
     },
     {
-        "id": "d2d679f0.fa9e7",
+        "id": "e54e7c9a.d7146",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5451.667724609375,
-        "y": 4446.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 5477.351089477539,
+        "y": 4451.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7d11177c.7fa498"
+                "88338270.bbe028"
             ]
         ]
     },
     {
-        "id": "7d11177c.7fa498",
+        "id": "88338270.bbe028",
         "type": "set",
         "name": "set otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 5623.667724609375,
-        "y": 4442.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 5649.351089477539,
+        "y": 4447.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b338f208.2e8e8",
+        "id": "5518c3fe.6c8f7c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4999.667724609375,
-        "y": 4557.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 5025.351089477539,
+        "y": 4562.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f67d6e8d.c4ab",
+        "id": "700868f.6d62d18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4516.667724609375,
-        "y": 4342.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 4542.351089477539,
+        "y": 4347.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6c238e2f.cfa52",
-                "97e28bb1.9f6bb8",
-                "ace3cbea.15731",
-                "1d3af694.aab3a1",
-                "30095233.787426",
-                "1126bc47.b4d98c",
-                "b338f208.2e8e8"
+                "7996b8d7.d892b8",
+                "fc1f2ae1.cce1f",
+                "ca81f202.b30418",
+                "b2478692.ea1d6",
+                "eb1e9e05.cb15c8",
+                "3095386e.cc8938",
+                "5518c3fe.6c8f7c"
             ]
         ]
     },
     {
-        "id": "44415c7f.4f5f24",
+        "id": "aec75daf.8805f",
         "type": "comment",
         "name": "The following section is to find srcTtp OTN layer (its long name)",
         "info": "The following section is to find srcTtp OTN layer (its long name)",
         "comments": "",
-        "x": 4501.667724609375,
-        "y": 4276.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 4527.351089477539,
+        "y": 4281.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "97e28bb1.9f6bb8",
+        "id": "fc1f2ae1.cce1f",
         "type": "get-resource",
         "name": "get-resource network-resources-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
         "comments": "",
         "outputs": 1,
-        "x": 4880.667724609375,
-        "y": 4263.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 4906.351089477539,
+        "y": 4268.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "153999c3.0eb42e",
-                "a208bb99.66b2e8",
-                "9ba49429.2785d"
+                "74fcf491.6cb18c",
+                "27200085.4f11f",
+                "31c473ae.f4e764"
             ]
         ]
     },
     {
-        "id": "153999c3.0eb42e",
+        "id": "74fcf491.6cb18c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5116.667724609375,
-        "y": 4246.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 5142.351089477539,
+        "y": 4251.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "a208bb99.66b2e8",
+        "id": "27200085.4f11f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5113.667724609375,
-        "y": 4287.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 5139.351089477539,
+        "y": 4292.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "6c238e2f.cfa52",
+        "id": "7996b8d7.d892b8",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
         "comments": "",
-        "x": 4829.667724609375,
-        "y": 4220.069427490234,
-        "z": "1806503a.76a7a",
+        "x": 4855.351089477539,
+        "y": 4225.350326538086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1d885097.bf6b2f",
+        "id": "9e6ef63b.470c28",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
         "comments": "",
-        "x": 4336.667724609375,
-        "y": 4674.469329833984,
-        "z": "1806503a.76a7a",
+        "x": 4362.351089477539,
+        "y": 4679.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "582ea235.e6de1c",
+        "id": "d0de5ca9.0d9ed8",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",
         "info": "",
         "comments": "",
-        "x": 4459.968017578125,
-        "y": 4713.469329833984,
-        "z": "1806503a.76a7a",
+        "x": 4485.651382446289,
+        "y": 4718.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "bd8e5c03.dfc108",
+        "id": "98c15798.fc2c28",
         "type": "save",
         "name": "get all-vpn-bindings from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4357.968017578125,
-        "y": 4748.469329833984,
-        "z": "1806503a.76a7a",
+        "x": 4383.651382446289,
+        "y": 4753.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d0e71616.8c817",
-                "148e0bed.377164",
-                "3b175283.95d6be"
+                "435ca159.b40ef",
+                "d725cba9.49bb",
+                "47bda61e.d52e08"
             ]
         ]
     },
     {
-        "id": "d0e71616.8c817",
+        "id": "435ca159.b40ef",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4562.968017578125,
-        "y": 4745.469329833984,
-        "z": "1806503a.76a7a",
+        "x": 4588.651382446289,
+        "y": 4750.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "39c739fc.a6fe6e"
+                "293c4671.01eaaa"
             ]
         ]
     },
     {
-        "id": "148e0bed.377164",
+        "id": "d725cba9.49bb",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4546.458984375,
-        "y": 4807.043365478516,
-        "z": "1806503a.76a7a",
+        "x": 4572.142349243164,
+        "y": 4812.324264526367,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3e1fb649.3101ea"
+                "107ae3d6.bea87c"
             ]
         ]
     },
     {
-        "id": "3b175283.95d6be",
+        "id": "47bda61e.d52e08",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4543.968017578125,
-        "y": 4850.469329833984,
-        "z": "1806503a.76a7a",
+        "x": 4569.651382446289,
+        "y": 4855.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "681b836.365687c"
+                "b006b7ef.442db8"
             ]
         ]
     },
     {
-        "id": "39c739fc.a6fe6e",
+        "id": "293c4671.01eaaa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4730.96826171875,
-        "y": 4740.469329833984,
-        "z": "1806503a.76a7a",
+        "x": 4756.651626586914,
+        "y": 4745.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "93e92e1a.778be8"
+                "94070507.2dec4"
             ]
         ]
     },
     {
-        "id": "3e1fb649.3101ea",
+        "id": "107ae3d6.bea87c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4709.0303955078125,
-        "y": 4807.3291015625,
-        "z": "1806503a.76a7a",
+        "x": 4734.713760375977,
+        "y": 4812.610000610352,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "681b836.365687c",
+        "id": "b006b7ef.442db8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4710.968017578125,
-        "y": 4849.469329833984,
-        "z": "1806503a.76a7a",
+        "x": 4736.651382446289,
+        "y": 4854.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "93e92e1a.778be8",
+        "id": "94070507.2dec4",
         "type": "for",
         "name": "for vpnidx in all-vpn-bindings",
         "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4968.96826171875,
-        "y": 4745.469329833984,
-        "z": "1806503a.76a7a",
+        "x": 4994.651626586914,
+        "y": 4750.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "27f30922.4e6a66"
+                "db3073d6.6320c8"
             ]
         ]
     },
     {
-        "id": "27f30922.4e6a66",
+        "id": "db3073d6.6320c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5202.968017578125,
-        "y": 4752.469329833984,
-        "z": "1806503a.76a7a",
+        "x": 5228.651382446289,
+        "y": 4757.750228881836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e449a33.b8b696"
+                "37f340bd.0a3438"
             ]
         ]
     },
     {
-        "id": "e77a7161.49d068",
+        "id": "fcec711e.ca4568",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
         "info": "",
         "comments": "",
-        "x": 5119.783935546875,
-        "y": 4823.635650634766,
-        "z": "1806503a.76a7a",
+        "x": 5145.467300415039,
+        "y": 4828.916549682617,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e449a33.b8b696",
+        "id": "37f340bd.0a3438",
         "type": "switchNode",
         "name": "switch ops-note is srcTtpOtnLayer",
         "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5063.783935546875,
-        "y": 4872.635650634766,
-        "z": "1806503a.76a7a",
+        "x": 5089.467300415039,
+        "y": 4877.916549682617,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "62a1336b.ab309c",
-                "57ed2482.36942c"
+                "ab022fe7.308e68",
+                "3eb6abc9.a7b9b4"
             ]
         ]
     },
     {
-        "id": "57ed2482.36942c",
+        "id": "3eb6abc9.a7b9b4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5306.784423828125,
-        "y": 4913.635162353516,
-        "z": "1806503a.76a7a",
+        "x": 5332.467788696289,
+        "y": 4918.916061401367,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "62a1336b.ab309c",
+        "id": "ab022fe7.308e68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5317.7841796875,
-        "y": 4870.6353759765625,
-        "z": "1806503a.76a7a",
+        "x": 5343.467544555664,
+        "y": 4875.916275024414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6f96293b.020fc"
+                "82036bd3.d2b678"
             ]
         ]
     },
     {
-        "id": "48fa24ff.a12f6c",
+        "id": "8f49a5ce.76f168",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5544.767578125,
-        "y": 4878.0518798828125,
-        "z": "1806503a.76a7a",
+        "x": 5570.450942993164,
+        "y": 4883.332778930664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d949e407.7d96c8",
-                "ba00ef86.599998",
-                "e04480f3.8af1b"
+                "c997366c.5a655",
+                "3dbdc2ab.0fbd3e",
+                "bd51e31d.644ad8"
             ]
         ]
     },
     {
-        "id": "a4fcb041.b0aaf8",
+        "id": "cd343233.3d4178",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5709.8173828125,
-        "y": 4763.052337646484,
-        "z": "1806503a.76a7a",
+        "x": 5735.500747680664,
+        "y": 4768.333236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "dc33bc78.b33dc"
+                "355f9f95.f927e8"
             ]
         ]
     },
     {
-        "id": "dc33bc78.b33dc",
+        "id": "355f9f95.f927e8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5901.8173828125,
-        "y": 4752.052581787109,
-        "z": "1806503a.76a7a",
+        "x": 5927.500747680664,
+        "y": 4757.333480834961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "88251130.694fa8"
+                "d2bb482a.6b0258"
             ]
         ]
     },
     {
-        "id": "d949e407.7d96c8",
+        "id": "c997366c.5a655",
         "type": "set",
         "name": "unset tmp.aai.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 5658.334228515625,
-        "y": 4653.269378662109,
-        "z": "1806503a.76a7a",
+        "x": 5684.017593383789,
+        "y": 4658.550277709961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ba00ef86.599998",
+        "id": "3dbdc2ab.0fbd3e",
         "type": "set",
         "name": "set tmp.aai.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
         "comments": "",
-        "x": 5650.334228515625,
-        "y": 4702.269378662109,
-        "z": "1806503a.76a7a",
+        "x": 5676.017593383789,
+        "y": 4707.550277709961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e04480f3.8af1b",
+        "id": "bd51e31d.644ad8",
         "type": "save",
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5881.751220703125,
-        "y": 4883.435394287109,
-        "z": "1806503a.76a7a",
+        "x": 5907.434585571289,
+        "y": 4888.716293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e369ae1d.045348",
+        "id": "284b8a46.878cde",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 5833.401123046875,
-        "y": 4930.752288818359,
-        "z": "1806503a.76a7a",
+        "x": 5859.084487915039,
+        "y": 4936.033187866211,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "7bcaed73.c4335c",
+        "id": "d8829575.9f3a28",
         "type": "comment",
         "name": "decrease the bw of the-vpn-binding and change status to modified",
         "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
         "comments": "",
-        "x": 5905.751220703125,
-        "y": 4844.435394287109,
-        "z": "1806503a.76a7a",
+        "x": 5931.434585571289,
+        "y": 4849.716293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "88251130.694fa8",
+        "id": "d2bb482a.6b0258",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6083.8173828125,
-        "y": 4731.052581787109,
-        "z": "1806503a.76a7a",
+        "x": 6109.500747680664,
+        "y": 4736.333480834961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3faa0ed9.e49512"
+                "c2a155f5.9faa88"
             ]
         ]
     },
     {
-        "id": "3faa0ed9.e49512",
+        "id": "c2a155f5.9faa88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6245.8173828125,
-        "y": 4720.052581787109,
-        "z": "1806503a.76a7a",
+        "x": 6271.500747680664,
+        "y": 4725.333480834961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1f4e4f1d.0faeb9",
-                "71f57a2d.ed1434"
+                "560d06d2.09f708",
+                "97054905.242338"
             ]
         ]
     },
     {
-        "id": "1f4e4f1d.0faeb9",
+        "id": "560d06d2.09f708",
         "type": "set",
         "name": "unset tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
         "comments": "",
-        "x": 6442.8173828125,
-        "y": 4649.052581787109,
-        "z": "1806503a.76a7a",
+        "x": 6468.500747680664,
+        "y": 4654.333480834961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "71f57a2d.ed1434",
+        "id": "97054905.242338",
         "type": "set",
         "name": "set tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
-        "x": 6440.2841796875,
-        "y": 4748.269378662109,
-        "z": "1806503a.76a7a",
+        "x": 6465.967544555664,
+        "y": 4753.550277709961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5e5dd175.2ee1b",
+        "id": "e8ad32eb.9df94",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3097.800048828125,
-        "y": 3207.0857849121094,
-        "z": "1806503a.76a7a",
+        "x": 3123.483413696289,
+        "y": 3212.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "95f11825.f517d8",
+        "id": "cf9533e5.c2371",
         "type": "switchNode",
         "name": "switch found-middle-man?",
         "xml": "<switch test='`$found-middle-man`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2974.800048828125,
-        "y": 3317.0857849121094,
-        "z": "1806503a.76a7a",
+        "x": 3000.483413696289,
+        "y": 3322.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "eda02ee3.547818",
-                "24ae5a23.6efcde"
+                "6d545915.394bc",
+                "8fea5bf9.a101b8"
             ]
         ]
     },
     {
-        "id": "eda02ee3.547818",
+        "id": "6d545915.394bc",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3158.800048828125,
-        "y": 3296.0857849121094,
-        "z": "1806503a.76a7a",
+        "x": 3184.483413696289,
+        "y": 3301.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "25d89b5b.fea624"
+                "a2317561.56953"
             ]
         ]
     },
     {
-        "id": "25d89b5b.fea624",
+        "id": "a2317561.56953",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3301.800048828125,
-        "y": 3296.0857849121094,
-        "z": "1806503a.76a7a",
+        "x": 3327.483413696289,
+        "y": 3301.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a5e21959.30c488"
+                "a264af99.117e28"
             ]
         ]
     },
     {
-        "id": "a5e21959.30c488",
+        "id": "a264af99.117e28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
         "comments": "",
-        "x": 3477.800048828125,
-        "y": 3294.0857849121094,
-        "z": "1806503a.76a7a",
+        "x": 3503.483413696289,
+        "y": 3299.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "24ae5a23.6efcde",
+        "id": "8fea5bf9.a101b8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3156.800048828125,
-        "y": 3351.0857849121094,
-        "z": "1806503a.76a7a",
+        "x": 3182.483413696289,
+        "y": 3356.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2aa846fb.1fdfe2"
+                "3fcc1946.2227c6"
             ]
         ]
     },
     {
-        "id": "2aa846fb.1fdfe2",
+        "id": "3fcc1946.2227c6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3003.800048828125,
-        "y": 3484.0857849121094,
-        "z": "1806503a.76a7a",
+        "x": 3029.483413696289,
+        "y": 3489.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "45cb1d93.9cef0c",
-                "95cc6144.fb6bd8",
-                "21aeddc1.06f77a",
-                "ab0940a1.911a68",
-                "6d6cc518.e0ec9c",
-                "3c679d7f.fbbb22"
+                "13751b77.2d6a35",
+                "42ae91e0.cfd958",
+                "f0c980e9.4c97f",
+                "15cfd0d2.c7223f",
+                "566cdb6f.69a6a4",
+                "130e3d11.8bda33"
             ]
         ]
     },
     {
-        "id": "522b1854.031bc",
+        "id": "b391ba6b.5d625",
         "type": "comment",
         "name": "Find LEAF connectivity",
         "info": "",
         "comments": "",
-        "x": 3225.88330078125,
-        "y": 3724.2857360839844,
-        "z": "1806503a.76a7a",
+        "x": 3251.566665649414,
+        "y": 3729.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ab0940a1.911a68",
+        "id": "15cfd0d2.c7223f",
         "type": "set",
         "name": "set tmp.MMstillHasUni to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",
         "comments": "",
-        "x": 3308.333251953125,
-        "y": 3497.0857849121094,
-        "z": "1806503a.76a7a",
+        "x": 3334.016616821289,
+        "y": 3502.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6d6cc518.e0ec9c",
+        "id": "566cdb6f.69a6a4",
         "type": "for",
         "name": "for each relationship of middle-man-conn",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3306.8330078125,
-        "y": 3543.0025329589844,
-        "z": "1806503a.76a7a",
+        "x": 3332.516372680664,
+        "y": 3548.283432006836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f5f202e7.9ae08"
+                "69987cbf.ba882c"
             ]
         ]
     },
     {
-        "id": "f5f202e7.9ae08",
+        "id": "69987cbf.ba882c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3569.8330078125,
-        "y": 3538.0025329589844,
-        "z": "1806503a.76a7a",
+        "x": 3595.516372680664,
+        "y": 3543.283432006836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "186eedb6.79ae82"
+                "6b4b309c.a784f8"
             ]
         ]
     },
     {
-        "id": "186eedb6.79ae82",
+        "id": "6b4b309c.a784f8",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3729.83251953125,
-        "y": 3518.0025329589844,
-        "z": "1806503a.76a7a",
+        "x": 3755.515884399414,
+        "y": 3523.283432006836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e8fee7bd.fc2ef8"
+                "537f8032.a139c8"
             ]
         ]
     },
     {
-        "id": "774ecc4a.3ad124",
+        "id": "608ff90c.2e5fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5066.834228515625,
-        "y": 3549.0025634765625,
-        "z": "1806503a.76a7a",
+        "x": 5092.517593383789,
+        "y": 3554.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9464a805.69d21",
-                "af3bd9a1.948688",
-                "da386631.67d8c8"
+                "b2d28e5c.e8fb18",
+                "d55c5cbc.26dad8",
+                "99b14097.a9c1b8"
             ]
         ]
     },
     {
-        "id": "9464a805.69d21",
+        "id": "b2d28e5c.e8fb18",
         "type": "set",
         "name": "set tmp.MMstillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",
         "comments": "",
-        "x": 5306.334716796875,
-        "y": 3498.0858154296875,
-        "z": "1806503a.76a7a",
+        "x": 5332.018081665039,
+        "y": 3503.366714477539,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "af3bd9a1.948688",
+        "id": "d55c5cbc.26dad8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5239.568145751953,
-        "y": 3571.0858459472656,
-        "z": "1806503a.76a7a",
+        "x": 5265.251510620117,
+        "y": 3576.366744995117,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "17da0805.f3e8a8",
+        "id": "3b35e0ea.5843e8",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
-        "x": 4432.88427734375,
-        "y": 5105.285980224609,
-        "z": "1806503a.76a7a",
+        "x": 4458.567642211914,
+        "y": 5110.566879272461,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "19328269.e896be",
+        "id": "a474eb09.bdcea",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
-        "x": 4331.317138671875,
-        "y": 5157.202484130859,
-        "z": "1806503a.76a7a",
+        "x": 4357.000503540039,
+        "y": 5162.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ffd8a757.b8a3f",
+        "id": "bbed6bed.031a08",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4482.317138671875,
-        "y": 5600.202484130859,
-        "z": "1806503a.76a7a",
+        "x": 4508.000503540039,
+        "y": 5605.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "b33560b0.1278c",
+        "id": "9b06d9ac.c2c2b",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4297.317138671875,
-        "y": 5667.202484130859,
-        "z": "1806503a.76a7a",
+        "x": 4323.000503540039,
+        "y": 5672.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e0079417.8b765",
-                "94134a14.38a09"
+                "da6e8509.7a87a8",
+                "16a08f38.4e9a49"
             ]
         ]
     },
     {
-        "id": "e0079417.8b765",
+        "id": "da6e8509.7a87a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4562.317138671875,
-        "y": 5652.202484130859,
-        "z": "1806503a.76a7a",
+        "x": 4588.000503540039,
+        "y": 5657.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c191059e.ace948"
+                "c2e76143.b6b218"
             ]
         ]
     },
     {
-        "id": "94134a14.38a09",
+        "id": "16a08f38.4e9a49",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4558.317138671875,
-        "y": 5700.202484130859,
-        "z": "1806503a.76a7a",
+        "x": 4584.000503540039,
+        "y": 5705.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "21c0ccb3.89b3cc"
+                "8fe2e656.247af"
             ]
         ]
     },
     {
-        "id": "c191059e.ace948",
+        "id": "c2e76143.b6b218",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4718.317138671875,
-        "y": 5648.202484130859,
-        "z": "1806503a.76a7a",
+        "x": 4744.000503540039,
+        "y": 5653.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ea983e85.321ce"
+                "9d183ed0.0c624"
             ]
         ]
     },
     {
-        "id": "21c0ccb3.89b3cc",
+        "id": "8fe2e656.247af",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
-        "x": 4706.317138671875,
-        "y": 5695.202484130859,
-        "z": "1806503a.76a7a",
+        "x": 4732.000503540039,
+        "y": 5700.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "11ee9928.b9a3cf",
+        "id": "2c1c4698.bb1b8a",
         "type": "set",
         "name": "set tmp.rootconn.",
         "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",
         "comments": "",
-        "x": 5138.3173828125,
-        "y": 5590.202484130859,
-        "z": "1806503a.76a7a",
+        "x": 5164.000747680664,
+        "y": 5595.483383178711,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3a447acf.2b1f0e",
+        "id": "39f2eed6.a40982",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",
         "comments": "",
-        "x": 4540.734130859375,
-        "y": 5186.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 4566.417495727539,
+        "y": 5191.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "93e60704.65dbd",
+        "id": "4e75594e.323fe8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4311.734130859375,
-        "y": 5275.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 4337.417495727539,
+        "y": 5280.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3a447acf.2b1f0e",
-                "a0d0d144.703df8"
+                "39f2eed6.a40982",
+                "ec0a5547.230718"
             ]
         ]
     },
     {
-        "id": "a0d0d144.703df8",
+        "id": "ec0a5547.230718",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4547.734130859375,
-        "y": 5268.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 4573.417495727539,
+        "y": 5273.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "93bdcc8d.eca238",
-                "76b31045.74e9",
-                "e9dc2865.72e928"
+                "f4f0abfb.959d98",
+                "6d247b2e.c14f4c",
+                "ac6604fb.6b0698"
             ]
         ]
     },
     {
-        "id": "93bdcc8d.eca238",
+        "id": "f4f0abfb.959d98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4743.2342529296875,
-        "y": 5220.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 4768.917617797852,
+        "y": 5225.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "87ddaf65.395498"
+                "7a4a15ea.cb5f7c"
             ]
         ]
     },
     {
-        "id": "76b31045.74e9",
+        "id": "6d247b2e.c14f4c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4735.2342529296875,
-        "y": 5275.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 4760.917617797852,
+        "y": 5280.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fe3d7591.8ed12"
+                "9d792ff5.12f1d8"
             ]
         ]
     },
     {
-        "id": "87ddaf65.395498",
+        "id": "7a4a15ea.cb5f7c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4887.6165771484375,
-        "y": 5220.141845703125,
-        "z": "1806503a.76a7a",
+        "x": 4913.299942016602,
+        "y": 5225.422744750977,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ad455c8f.ae00e8"
+                "22a044c0.3de0ec"
             ]
         ]
     },
     {
-        "id": "ad455c8f.ae00e8",
+        "id": "22a044c0.3de0ec",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5071.734130859375,
-        "y": 5218.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 5097.417495727539,
+        "y": 5223.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d25e267a.3e533"
+                "afda241e.dc7d4"
             ]
         ]
     },
     {
-        "id": "d25e267a.3e533",
+        "id": "afda241e.dc7d4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5266.734130859375,
-        "y": 5218.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 5292.417495727539,
+        "y": 5223.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "93445f98.6a2b88"
+                "7162d2d.84a60ac"
             ]
         ]
     },
     {
-        "id": "e9dc2865.72e928",
+        "id": "ac6604fb.6b0698",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4740.2342529296875,
-        "y": 5332.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 4765.917617797852,
+        "y": 5337.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d3c476f6.a94bf"
+                "cc0a2fe1.d0b358"
             ]
         ]
     },
     {
-        "id": "d3c476f6.a94bf",
+        "id": "cc0a2fe1.d0b358",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4892.2342529296875,
-        "y": 5333.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 4917.917617797852,
+        "y": 5338.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "fe3d7591.8ed12",
+        "id": "9d792ff5.12f1d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4903.2342529296875,
-        "y": 5276.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 4928.917617797852,
+        "y": 5281.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a6955939.7a731",
+        "id": "9e3505a2.ad7f68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5648.734130859375,
-        "y": 5222.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 5674.417495727539,
+        "y": 5227.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9484e895.44a448",
-                "50aee0a4.445958",
-                "f7a12344.c8bde8"
+                "ea7ae99e.7714a",
+                "97767b77.532b48",
+                "bd9bb3b2.0d8698"
             ]
         ]
     },
     {
-        "id": "93445f98.6a2b88",
+        "id": "7162d2d.84a60ac",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5469.734130859375,
-        "y": 5222.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 5495.417495727539,
+        "y": 5227.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a6955939.7a731"
+                "9e3505a2.ad7f68"
             ]
         ]
     },
     {
-        "id": "50aee0a4.445958",
+        "id": "97767b77.532b48",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5854.734130859375,
-        "y": 5235.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 5880.417495727539,
+        "y": 5240.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1af8bb44.7d7ad5",
-                "48532c3d.63b2f4",
-                "af6d67e.1e33f98"
+                "8ede340c.5a66c8",
+                "74477750.32976",
+                "ea5203af.a882c8"
             ]
         ]
     },
     {
-        "id": "9484e895.44a448",
+        "id": "ea7ae99e.7714a",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5884.734130859375,
-        "y": 5183.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 5910.417495727539,
+        "y": 5188.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1af8bb44.7d7ad5",
+        "id": "8ede340c.5a66c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6064.734130859375,
-        "y": 5226.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 6090.417495727539,
+        "y": 5231.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "751438ac.f3ea9"
+                "5e0e6cb.070b594"
             ]
         ]
     },
     {
-        "id": "48532c3d.63b2f4",
+        "id": "74477750.32976",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6056.734130859375,
-        "y": 5281.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 6082.417495727539,
+        "y": 5286.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1ab525ea.2aee0a"
+                "8bfb7c50.692e68"
             ]
         ]
     },
     {
-        "id": "af6d67e.1e33f98",
+        "id": "ea5203af.a882c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6061.734130859375,
-        "y": 5338.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 6087.417495727539,
+        "y": 5343.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "658bf37d.2cc724"
+                "1d7cc732.18ead1"
             ]
         ]
     },
     {
-        "id": "658bf37d.2cc724",
+        "id": "1d7cc732.18ead1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 6213.734130859375,
-        "y": 5339.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 6239.417495727539,
+        "y": 5344.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1ab525ea.2aee0a",
+        "id": "8bfb7c50.692e68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 6224.734130859375,
-        "y": 5284.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 6250.417495727539,
+        "y": 5289.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "751438ac.f3ea9",
+        "id": "5e0e6cb.070b594",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6209.116455078125,
-        "y": 5224.141845703125,
-        "z": "1806503a.76a7a",
+        "x": 6234.799819946289,
+        "y": 5229.422744750977,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3d7e0062.7d2af"
+                "20b06727.e2f538"
             ]
         ]
     },
     {
-        "id": "3d7e0062.7d2af",
+        "id": "20b06727.e2f538",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 6423.734130859375,
-        "y": 5220.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 6449.417495727539,
+        "y": 5225.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f7a12344.c8bde8",
+        "id": "bd9bb3b2.0d8698",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5804.734130859375,
-        "y": 5299.486175537109,
-        "z": "1806503a.76a7a",
+        "x": 5830.417495727539,
+        "y": 5304.767074584961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8b3d1eff.18e008",
+        "id": "8985192.1ed6868",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4453.234375,
-        "y": 5380.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 4478.917739868164,
+        "y": 5385.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ee0f617b.5bd02",
-                "8e2d6022.079658"
+                "62c705b1.502d1c",
+                "1b875464.e01f44"
             ]
         ]
     },
     {
-        "id": "ee0f617b.5bd02",
+        "id": "62c705b1.502d1c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4813.734130859375,
-        "y": 5388.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 4839.417495727539,
+        "y": 5393.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e5f9197d.04b6c"
+                "d191549e.030218"
             ]
         ]
     },
     {
-        "id": "e5f9197d.04b6c",
+        "id": "d191549e.030218",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4971.734130859375,
-        "y": 5388.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 4997.417495727539,
+        "y": 5393.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b5f90852.29b69",
+        "id": "18bca107.e50237",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4975.234130859375,
-        "y": 5428.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 5000.917495727539,
+        "y": 5433.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "8e2d6022.079658",
+        "id": "1b875464.e01f44",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4817.734130859375,
-        "y": 5428.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 4843.417495727539,
+        "y": 5433.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b5f90852.29b69"
+                "18bca107.e50237"
             ]
         ]
     },
     {
-        "id": "ffe0ea3.8a4d998",
+        "id": "8380c690.faafc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5126.451171875,
-        "y": 5642.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 5152.134536743164,
+        "y": 5647.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6146efb2.cf13d",
-                "9351cf54.365048"
+                "1f713bf9.1daaec",
+                "39b06195.a8d3be"
             ]
         ]
     },
     {
-        "id": "9351cf54.365048",
+        "id": "39b06195.a8d3be",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 5368.450927734375,
-        "y": 5592.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 5394.134292602539,
+        "y": 5597.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d35be3cf.cc2028",
-                "74f2b735.4a4b38",
-                "4e1edc90.74b29c"
+                "fbd8ede5.0e2c68",
+                "fe4285c6.cb2308",
+                "3fecf8f4.4ce3f"
             ]
         ]
     },
     {
-        "id": "d35be3cf.cc2028",
+        "id": "fbd8ede5.0e2c68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5563.951171875,
-        "y": 5526.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 5589.634536743164,
+        "y": 5531.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8c6be2ce.3abef8"
+                "10a1ac3d.04aa44"
             ]
         ]
     },
     {
-        "id": "74f2b735.4a4b38",
+        "id": "fe4285c6.cb2308",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5559.951171875,
-        "y": 5582.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 5585.634536743164,
+        "y": 5587.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "17a91916.50ea6f"
+                "f166d116.9a8368"
             ]
         ]
     },
     {
-        "id": "8c6be2ce.3abef8",
+        "id": "10a1ac3d.04aa44",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5708.3333740234375,
-        "y": 5543.741455078125,
-        "z": "1806503a.76a7a",
+        "x": 5734.016738891602,
+        "y": 5549.022354125977,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "41f50adf.154854"
+                "2f38d9ab.5bfbbe"
             ]
         ]
     },
     {
-        "id": "41f50adf.154854",
+        "id": "2f38d9ab.5bfbbe",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 5892.450927734375,
-        "y": 5542.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 5918.134292602539,
+        "y": 5547.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "92f6a716.223fa8"
+                "e1d73c4d.409db8"
             ]
         ]
     },
     {
-        "id": "4e1edc90.74b29c",
+        "id": "3fecf8f4.4ce3f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5569.951171875,
-        "y": 5627.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 5595.634536743164,
+        "y": 5632.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9e924b4c.b75db"
+                "ba50366d.81301"
             ]
         ]
     },
     {
-        "id": "9e924b4c.b75db",
+        "id": "ba50366d.81301",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5748.951171875,
-        "y": 5643.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 5774.634536743164,
+        "y": 5648.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "17a91916.50ea6f",
+        "id": "f166d116.9a8368",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5730.951171875,
-        "y": 5595.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 5756.634536743164,
+        "y": 5600.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "21c4fa1a.b93b46",
+        "id": "1d5ce61.ba31c9a",
         "type": "execute",
         "name": "execute RestApiCallNode Delete UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.rootconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.ROOT.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5279.951171875,
-        "y": 5697.685394287109,
-        "z": "1806503a.76a7a",
+        "x": 5305.634536743164,
+        "y": 5702.966293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "95033c2a.09c67",
-                "f1a877c4.a203d8"
+                "8374d45d.c41588",
+                "6d72c625.482d5"
             ]
         ]
     },
     {
-        "id": "95033c2a.09c67",
+        "id": "8374d45d.c41588",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5628.451171875,
-        "y": 5679.685394287109,
-        "z": "1806503a.76a7a",
+        "x": 5654.134536743164,
+        "y": 5684.966293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "76c41eff.4cfe88"
+                "53e0b67e.6fc768"
             ]
         ]
     },
     {
-        "id": "76c41eff.4cfe88",
+        "id": "53e0b67e.6fc768",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 5884.451171875,
-        "y": 5682.685394287109,
-        "z": "1806503a.76a7a",
+        "x": 5910.134536743164,
+        "y": 5687.966293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "eb3b6335.123de8",
+        "id": "1ee806c.abb34f9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5836.951171875,
-        "y": 5723.685394287109,
-        "z": "1806503a.76a7a",
+        "x": 5862.634536743164,
+        "y": 5728.966293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f1a877c4.a203d8",
+        "id": "6d72c625.482d5",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5638.451171875,
-        "y": 5728.685394287109,
-        "z": "1806503a.76a7a",
+        "x": 5664.134536743164,
+        "y": 5733.966293334961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "eb3b6335.123de8"
+                "1ee806c.abb34f9"
             ]
         ]
     },
     {
-        "id": "6146efb2.cf13d",
+        "id": "1f713bf9.1daaec",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.rootconn.access-provider-id + '-clientId-' +\n                                                   $tmp.rootconn.access-client-id + '-topologyId-' +\n                                                   $tmp.rootconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.rootconn.access-node-id`\" />\n",
         "comments": "",
-        "x": 5361.450927734375,
-        "y": 5510.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 5387.134292602539,
+        "y": 5515.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "92f6a716.223fa8",
+        "id": "e1d73c4d.409db8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6087.450927734375,
-        "y": 5542.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 6113.134292602539,
+        "y": 5547.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bd55517c.f87f1"
+                "b323e9c9.c4083"
             ]
         ]
     },
     {
-        "id": "8bf8b16.3c18f5",
+        "id": "be7ed337.773238",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 6469.450927734375,
-        "y": 5546.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 6495.134292602539,
+        "y": 5551.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1bd48f8a.cba628",
-                "1ea10909.ec8b57",
-                "ecac1508.b763"
+                "1a0db354.43c10d",
+                "711b7fd1.39246",
+                "1b22d01c.0f5988"
             ]
         ]
     },
     {
-        "id": "bd55517c.f87f1",
+        "id": "b323e9c9.c4083",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6290.450927734375,
-        "y": 5546.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 6316.134292602539,
+        "y": 5551.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8bf8b16.3c18f5"
+                "be7ed337.773238"
             ]
         ]
     },
     {
-        "id": "1ea10909.ec8b57",
+        "id": "711b7fd1.39246",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 6675.450927734375,
-        "y": 5559.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 6701.134292602539,
+        "y": 5564.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "830127bc.8c4c18",
-                "adc00906.538428",
-                "5c009e0.e4c98e4"
+                "d1222469.959ab8",
+                "2ce3fcd5.8dd1cc",
+                "95dec9e7.124ae"
             ]
         ]
     },
     {
-        "id": "1bd48f8a.cba628",
+        "id": "1a0db354.43c10d",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 6705.450927734375,
-        "y": 5507.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 6731.134292602539,
+        "y": 5512.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "830127bc.8c4c18",
+        "id": "d1222469.959ab8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6885.450927734375,
-        "y": 5550.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 6911.134292602539,
+        "y": 5555.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ea1d97d5.52d0a"
+                "15af61ce.93dc56"
             ]
         ]
     },
     {
-        "id": "adc00906.538428",
+        "id": "2ce3fcd5.8dd1cc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6877.450927734375,
-        "y": 5605.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 6903.134292602539,
+        "y": 5610.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "283c974a.c2fc28"
+                "85d2a0c5.7b74c"
             ]
         ]
     },
     {
-        "id": "5c009e0.e4c98e4",
+        "id": "95dec9e7.124ae",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 6882.450927734375,
-        "y": 5662.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 6908.134292602539,
+        "y": 5667.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "dbf169ab.c4c478"
+                "6c15ae6.0ebeb5"
             ]
         ]
     },
     {
-        "id": "dbf169ab.c4c478",
+        "id": "6c15ae6.0ebeb5",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 7034.450927734375,
-        "y": 5663.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 7060.134292602539,
+        "y": 5668.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "283c974a.c2fc28",
+        "id": "85d2a0c5.7b74c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 7045.450927734375,
-        "y": 5608.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 7071.134292602539,
+        "y": 5613.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ea1d97d5.52d0a",
+        "id": "15af61ce.93dc56",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 7029.833251953125,
-        "y": 5547.741455078125,
-        "z": "1806503a.76a7a",
+        "x": 7055.516616821289,
+        "y": 5553.022354125977,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "eea057d1.d2c178"
+                "370a475d.301248"
             ]
         ]
     },
     {
-        "id": "eea057d1.d2c178",
+        "id": "370a475d.301248",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 7244.450927734375,
-        "y": 5544.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 7270.134292602539,
+        "y": 5549.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ecac1508.b763",
+        "id": "1b22d01c.0f5988",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 6625.450927734375,
-        "y": 5623.085784912109,
-        "z": "1806503a.76a7a",
+        "x": 6651.134292602539,
+        "y": 5628.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e8fee7bd.fc2ef8",
+        "id": "537f8032.a139c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3854.88330078125,
-        "y": 3512.2857360839844,
-        "z": "1806503a.76a7a",
+        "x": 3880.566665649414,
+        "y": 3517.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4b07eb9e.ad1084",
-                "449a6f75.ecc4d"
+                "4c0087b1.a54ff",
+                "543f9693.a47c"
             ]
         ]
     },
     {
-        "id": "4b07eb9e.ad1084",
+        "id": "4c0087b1.a54ff",
         "type": "set",
         "name": "set tmp.mmUNI-id-long",
         "xml": "<set>\n<parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
-        "x": 4045.466552734375,
-        "y": 3455.0857849121094,
-        "z": "1806503a.76a7a",
+        "x": 4071.149917602539,
+        "y": 3460.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "449a6f75.ecc4d",
+        "id": "543f9693.a47c",
         "type": "switchNode",
         "name": "switch tmp.mmUNI-id-long != ROOT UNI",
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4092.466552734375,
-        "y": 3526.0857849121094,
-        "z": "1806503a.76a7a",
+        "x": 4118.149917602539,
+        "y": 3531.366683959961,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a5622a5e.b03c68",
-                "1b2b72f4.a20bdd"
+                "e4164ac6.db6c38",
+                "5e838a6b.5e0f0c"
             ]
         ]
     },
     {
-        "id": "a5622a5e.b03c68",
+        "id": "e4164ac6.db6c38",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4330.884033203125,
-        "y": 3485.2857360839844,
-        "z": "1806503a.76a7a",
+        "x": 4356.567398071289,
+        "y": 3490.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d22a60e2.fd2778"
+                "4d697267.53d1ec"
             ]
         ]
     },
     {
-        "id": "1b2b72f4.a20bdd",
+        "id": "5e838a6b.5e0f0c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4337.884246826172,
-        "y": 3542.2857055664062,
-        "z": "1806503a.76a7a",
+        "x": 4363.567611694336,
+        "y": 3547.566604614258,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b7814ecb.1580d"
+                "fa76b584.bdbd9"
             ]
         ]
     },
     {
-        "id": "d22a60e2.fd2778",
+        "id": "4d697267.53d1ec",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4458.884521484375,
-        "y": 3481.2857360839844,
-        "z": "1806503a.76a7a",
+        "x": 4484.567886352539,
+        "y": 3486.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "3c679d7f.fbbb22",
+        "id": "130e3d11.8bda33",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",
         "comments": "",
-        "x": 3314.083251953125,
-        "y": 3439.6858825683594,
-        "z": "1806503a.76a7a",
+        "x": 3339.766616821289,
+        "y": 3444.966781616211,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "da386631.67d8c8",
+        "id": "99b14097.a9c1b8",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",
         "comments": "",
-        "x": 5295.91748046875,
-        "y": 3441.6859130859375,
-        "z": "1806503a.76a7a",
+        "x": 5321.600845336914,
+        "y": 3446.966812133789,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5fa67fdd.e511b8",
+        "id": "335ed745.f60fb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4407.6669921875,
-        "y": 3961.9024353027344,
-        "z": "1806503a.76a7a",
+        "x": 4433.350357055664,
+        "y": 3967.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a814439f.bac2e",
-                "f8d770ba.37d44"
+                "64f170e7.ccc2d",
+                "d03c542e.06f138"
             ]
         ]
     },
     {
-        "id": "a814439f.bac2e",
+        "id": "64f170e7.ccc2d",
         "type": "set",
         "name": "set tmp.uni.id",
         "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
-        "x": 4580.5498046875,
-        "y": 3957.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 4606.233169555664,
+        "y": 3962.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f8d770ba.37d44",
+        "id": "d03c542e.06f138",
         "type": "save",
         "name": "get uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.uni.id\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4583.5498046875,
-        "y": 4004.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 4609.233169555664,
+        "y": 4009.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7fc95f5b.ec381",
-                "28603ae9.d6e726",
-                "f736ad43.136778"
+                "d5d4471e.75f138",
+                "fea86c4e.6eb66",
+                "9876b951.6d5f9"
             ]
         ]
     },
     {
-        "id": "7fc95f5b.ec381",
+        "id": "d5d4471e.75f138",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4755.5498046875,
-        "y": 3988.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 4781.233169555664,
+        "y": 3993.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "47e06d70.96544c"
+                "c08f73d3.bbadb"
             ]
         ]
     },
     {
-        "id": "28603ae9.d6e726",
+        "id": "fea86c4e.6eb66",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4756.040771484375,
-        "y": 4034.1361389160156,
-        "z": "1806503a.76a7a",
+        "x": 4781.724136352539,
+        "y": 4039.417037963867,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "f736ad43.136778",
+        "id": "9876b951.6d5f9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4756.5498046875,
-        "y": 4074.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 4782.233169555664,
+        "y": 4079.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "47e06d70.96544c",
+        "id": "c08f73d3.bbadb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4916.5498046875,
-        "y": 3984.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 4942.233169555664,
+        "y": 3989.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "db3d2916.05167",
-                "b1e93bbf.154be8",
-                "2727d594.264d9a"
+                "71418de6.0d2394",
+                "d8794541.6fe0d",
+                "69521be3.cd51ac"
             ]
         ]
     },
     {
-        "id": "3055c73f.990de",
+        "id": "7f40068a.c630c8",
         "type": "comment",
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",
         "info": "",
         "comments": "",
-        "x": 5249.5498046875,
-        "y": 3915.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 5275.233169555664,
+        "y": 3920.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b1e93bbf.154be8",
+        "id": "d8794541.6fe0d",
         "type": "execute",
         "name": "execute split id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.uni.id`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-uni-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5184.5498046875,
-        "y": 3972.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 5210.233169555664,
+        "y": 3977.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8ed99d07.46ccf",
-                "dfad78a0.2e2798"
+                "eb66d929.7d0b9",
+                "25fd01e0.613c0e"
             ]
         ]
     },
     {
-        "id": "dfad78a0.2e2798",
+        "id": "25fd01e0.613c0e",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5407.5498046875,
-        "y": 3958.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 5433.233169555664,
+        "y": 3963.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "40b7643c.aa9b44"
+                "b7f38bd8.a0bf3"
             ]
         ]
     },
     {
-        "id": "8ed99d07.46ccf",
+        "id": "eb66d929.7d0b9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5409.5498046875,
-        "y": 3991.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 5435.233169555664,
+        "y": 3996.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2c3f5774.427218"
+                "23361310.a1a764"
             ]
         ]
     },
     {
-        "id": "40b7643c.aa9b44",
+        "id": "b7f38bd8.a0bf3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5555.5498046875,
-        "y": 3951.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 5581.233169555664,
+        "y": 3956.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "49b755b0.ff456c"
+                "16198ed9.69ab49"
             ]
         ]
     },
     {
-        "id": "2c3f5774.427218",
+        "id": "23361310.a1a764",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 5552.5498046875,
-        "y": 3988.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 5578.233169555664,
+        "y": 3993.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "49b755b0.ff456c",
+        "id": "16198ed9.69ab49",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.uni.pnf-name' value=\"`$param-prefix-uni-pnfName[0] + '-' +\n                                                   $param-prefix-uni-pnfName[1] + '-' +\n                                                   $param-prefix-uni-pnfName[2] + '-' +\n                                                   $param-prefix-uni-pnfName[3] + '-' +\n                                                   $param-prefix-uni-pnfName[4] + '-' +\n                                                   $param-prefix-uni-pnfName[5] + '-' +\n                                                   $param-prefix-uni-pnfName[6] + '-' +\n                                                   $param-prefix-uni-pnfName[7] + '-' +\n                                                   $param-prefix-uni-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 5732.5498046875,
-        "y": 3951.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 5758.233169555664,
+        "y": 3956.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "db3d2916.05167",
+        "id": "71418de6.0d2394",
         "type": "switchNode",
         "name": "switch uni-tp-id-node-part is the same as the LEAF node",
         "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5228.5498046875,
-        "y": 4106.562103271484,
-        "z": "1806503a.76a7a",
+        "x": 5254.233169555664,
+        "y": 4111.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "76a8963f.4621b8",
-                "22179ab4.cea27e"
+                "adaeb862.473368",
+                "2ff17e89.b4833a"
             ]
         ]
     },
     {
-        "id": "76a8963f.4621b8",
+        "id": "adaeb862.473368",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5509.5498046875,
-        "y": 4083.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 5535.233169555664,
+        "y": 4088.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cdc60b24.0ad9a8"
+                "b52ce206.918da8"
             ]
         ]
     },
     {
-        "id": "22179ab4.cea27e",
+        "id": "2ff17e89.b4833a",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5502.5498046875,
-        "y": 4142.562103271484,
-        "z": "1806503a.76a7a",
+        "x": 5528.233169555664,
+        "y": 4147.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5846229.a88c65c"
+                "b7c68567.02237"
             ]
         ]
     },
     {
-        "id": "cdc60b24.0ad9a8",
+        "id": "b52ce206.918da8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5639.5498046875,
-        "y": 4087.5621032714844,
-        "z": "1806503a.76a7a",
+        "x": 5665.233169555664,
+        "y": 4092.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5846229.a88c65c",
+        "id": "b7c68567.02237",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5644.5498046875,
-        "y": 4141.562103271484,
-        "z": "1806503a.76a7a",
+        "x": 5670.233169555664,
+        "y": 4146.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a9c7c427.af4688",
-                "fe9fa034.5cb01"
+                "e0f7b55.335ff48",
+                "cb97a1e2.dfe9f8"
             ]
         ]
     },
     {
-        "id": "a9c7c427.af4688",
+        "id": "e0f7b55.335ff48",
         "type": "set",
         "name": "set no-pce-call",
         "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",
         "comments": "",
-        "x": 5836.5498046875,
-        "y": 4108.562103271484,
-        "z": "1806503a.76a7a",
+        "x": 5862.233169555664,
+        "y": 4113.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "98a16c7e.29ab68",
+        "id": "8511bfc9.24e818",
         "type": "set",
         "name": "set middle-man-conn",
         "xml": "<set>\n<parameter name='middle-man-conn.' value='`$tmp.aai.all-connectivities.connectivity[$connidx].`' />\n",
         "comments": "",
-        "x": 5852.5498046875,
-        "y": 4160.562103271484,
-        "z": "1806503a.76a7a",
+        "x": 5878.233169555664,
+        "y": 4165.843002319336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "fe9fa034.5cb01",
+        "id": "cb97a1e2.dfe9f8",
         "type": "set",
         "name": "set tmp.stillHasUni and tmp.keepVPNBs to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n<parameter name='tmp.keepVPNBs' value='true' />\n",
         "comments": "",
-        "x": 5870.83349609375,
-        "y": 4230.152435302734,
-        "z": "1806503a.76a7a",
+        "x": 5896.516860961914,
+        "y": 4235.433334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2727d594.264d9a",
+        "id": "69521be3.cd51ac",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
-        "x": 5147.533203125,
-        "y": 4056.0523376464844,
-        "z": "1806503a.76a7a",
+        "x": 5173.216567993164,
+        "y": 4061.333236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c0a1014a.3ea75",
+        "id": "94db503d.b50288",
         "type": "switchNode",
         "name": "switch tmp.stillHasUni?",
         "xml": "\n<switch test=\"`$tmp.stillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 383.7339172363281,
-        "y": 5326.252044677734,
-        "z": "1806503a.76a7a",
+        "x": 409.4172821044922,
+        "y": 5331.532943725586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5bc4629f.a764e4",
-                "36ea940e.f6b704"
+                "98c37402.345048",
+                "44b19987.103118"
             ]
         ]
     },
     {
-        "id": "529ae160.378f78",
+        "id": "5e023344.61a9f4",
         "type": "save",
         "name": "get root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4288.516357421875,
-        "y": 5490.135833740234,
-        "z": "1806503a.76a7a",
+        "x": 4314.199722290039,
+        "y": 5495.416732788086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e3e4b7ad.cfce5",
-                "2311d61f.89de52",
-                "cab68c6b.abd21"
+                "76f7324c.5ab6f4",
+                "92aa08d0.816178",
+                "84add947.e60b78"
             ]
         ]
     },
     {
-        "id": "2b4c8a8a.8bc066",
+        "id": "26cdc27d.9e4c6e",
         "type": "comment",
         "name": "Update ROOT UNI's bw -- ALREADY DONE",
         "info": "",
         "comments": "",
-        "x": 4286.516845703125,
-        "y": 5442.136077880859,
-        "z": "1806503a.76a7a",
+        "x": 4312.200210571289,
+        "y": 5447.416976928711,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "89e149ab.f2e7c8",
+        "id": "eb8b95c0.79475",
         "type": "save",
         "name": "update ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4903.5166015625,
-        "y": 5560.136077880859,
-        "z": "1806503a.76a7a",
+        "x": 4929.199966430664,
+        "y": 5565.416976928711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "2311d61f.89de52",
+        "id": "92aa08d0.816178",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4506.007568359375,
-        "y": 5460.710052490234,
-        "z": "1806503a.76a7a",
+        "x": 4531.690933227539,
+        "y": 5465.990951538086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "983c2552.f1f49"
+                "8b26daec.dead98"
             ]
         ]
     },
     {
-        "id": "cab68c6b.abd21",
+        "id": "84add947.e60b78",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4501.5166015625,
-        "y": 5505.136016845703,
-        "z": "1806503a.76a7a",
+        "x": 4527.199966430664,
+        "y": 5510.416915893555,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "62a8aa1.663f1d4"
+                "6ddd64cd.a4b574"
             ]
         ]
     },
     {
-        "id": "983c2552.f1f49",
+        "id": "8b26daec.dead98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4668.5791015625,
-        "y": 5459.995758056641,
-        "z": "1806503a.76a7a",
+        "x": 4694.262466430664,
+        "y": 5465.276657104492,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "62a8aa1.663f1d4",
+        "id": "6ddd64cd.a4b574",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4669.5166015625,
-        "y": 5505.136016845703,
-        "z": "1806503a.76a7a",
+        "x": 4695.199966430664,
+        "y": 5510.416915893555,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d78e13a5.01de9",
+        "id": "5ac227ed.4c0b7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4666.5166015625,
-        "y": 5555.136077880859,
-        "z": "1806503a.76a7a",
+        "x": 4692.199966430664,
+        "y": 5560.416976928711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7bde7792.d9b138",
-                "89e149ab.f2e7c8"
+                "176f7b0f.04a15d",
+                "eb8b95c0.79475"
             ]
         ]
     },
     {
-        "id": "e3e4b7ad.cfce5",
+        "id": "76f7324c.5ab6f4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4497.5166015625,
-        "y": 5555.136077880859,
-        "z": "1806503a.76a7a",
+        "x": 4523.199966430664,
+        "y": 5560.416976928711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d78e13a5.01de9"
+                "5ac227ed.4c0b7"
             ]
         ]
     },
     {
-        "id": "7bde7792.d9b138",
+        "id": "176f7b0f.04a15d",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
-        "x": 4859.517578125,
-        "y": 5480.136077880859,
-        "z": "1806503a.76a7a",
+        "x": 4885.200942993164,
+        "y": 5485.416976928711,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "cf4ce975.93215",
+        "id": "2932b285.c1e58e",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 5288.216796875,
-        "y": 5417.902679443359,
-        "z": "1806503a.76a7a",
+        "x": 5313.900161743164,
+        "y": 5423.183578491211,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ea983e85.321ce",
+        "id": "9d183ed0.0c624",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5314,
-        "y": 5460.102874755859,
-        "z": "1806503a.76a7a",
+        "x": 5339.683364868164,
+        "y": 5465.383773803711,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5bc4629f.a764e4",
+        "id": "98c37402.345048",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 567.8836059570312,
-        "y": 5377.285736083984,
-        "z": "1806503a.76a7a",
+        "x": 593.5669708251953,
+        "y": 5382.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "867bdfac.94705"
+                "e53158e8.a8e898"
             ]
         ]
     },
     {
-        "id": "36ea940e.f6b704",
+        "id": "44b19987.103118",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 550.883544921875,
-        "y": 5299.285736083984,
-        "z": "1806503a.76a7a",
+        "x": 576.5669097900391,
+        "y": 5304.566635131836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ab9e57cf.8ef448"
+                "d82acda1.7d932"
             ]
         ]
     },
     {
-        "id": "eb7859d4.8fd35",
+        "id": "add9e89e.85dcc8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 679.8833923339844,
-        "y": 4386.285461425781,
-        "z": "1806503a.76a7a",
+        "x": 705.5667572021484,
+        "y": 4391.566360473633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8a11a728.e1b1d8",
-                "7438f980.400318",
-                "6c2db8ea.27724",
-                "a48617f3.9f6e4",
-                "5ff63bef.c5afdc",
-                "78f62ea.0af84d",
-                "d07ac0db.fa9818"
+                "1b682749.fdf219",
+                "555aecf4.9d0abc",
+                "fa8f69fe.c57418",
+                "924743a9.bdd1d",
+                "eeb2edff.f77838",
+                "b3758874.8f232",
+                "9c7760f0.090d48"
             ]
         ]
     },
     {
-        "id": "8a11a728.e1b1d8",
+        "id": "1b682749.fdf219",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
-        "x": 931.5667419433594,
-        "y": 4364.335266113281,
-        "z": "1806503a.76a7a",
+        "x": 957.2501068115234,
+        "y": 4369.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8aa064fb.543668",
+        "id": "20195ed4.4f043a",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
-        "x": 1033.1338806152344,
-        "y": 4312.418762207031,
-        "z": "1806503a.76a7a",
+        "x": 1058.8172454833984,
+        "y": 4317.699661254883,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "821af189.946d58",
+        "id": "9fa4061c.f2e2c8",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",
         "comments": "",
-        "x": 1140.9837341308594,
-        "y": 4393.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 1166.6670989990234,
+        "y": 4398.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "7438f980.400318",
+        "id": "555aecf4.9d0abc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 911.9837341308594,
-        "y": 4482.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 937.6670989990234,
+        "y": 4487.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "821af189.946d58",
-                "139cfd47.53e94b"
+                "9fa4061c.f2e2c8",
+                "a9e7fb46.8bda4"
             ]
         ]
     },
     {
-        "id": "139cfd47.53e94b",
+        "id": "a9e7fb46.8bda4",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1147.9837341308594,
-        "y": 4475.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 1173.6670989990234,
+        "y": 4480.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "df64900d.741c98",
-                "681e1ffc.26592",
-                "ab39d1b3.416b58"
+                "caf23ffe.0efab",
+                "c3c6018c.a6e8b8",
+                "a18cc13f.db156"
             ]
         ]
     },
     {
-        "id": "df64900d.741c98",
+        "id": "caf23ffe.0efab",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1343.4838562011719,
-        "y": 4427.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 1369.167221069336,
+        "y": 4432.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6f395e40.dc6b7"
+                "f910fabf.7d6ff8"
             ]
         ]
     },
     {
-        "id": "681e1ffc.26592",
+        "id": "c3c6018c.a6e8b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1335.4838562011719,
-        "y": 4482.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 1361.167221069336,
+        "y": 4487.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b25568a6.369d78"
+                "7989bd98.acfa84"
             ]
         ]
     },
     {
-        "id": "6f395e40.dc6b7",
+        "id": "f910fabf.7d6ff8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1487.8661804199219,
-        "y": 4427.274627685547,
-        "z": "1806503a.76a7a",
+        "x": 1513.549545288086,
+        "y": 4432.555526733398,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "94a27fe.8c889"
+                "ffb71773.7c6d48"
             ]
         ]
     },
     {
-        "id": "94a27fe.8c889",
+        "id": "ffb71773.7c6d48",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1671.9837341308594,
-        "y": 4425.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 1697.6670989990234,
+        "y": 4430.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b448ea96.4c3af8"
+                "a91274f1.8c8af"
             ]
         ]
     },
     {
-        "id": "b448ea96.4c3af8",
+        "id": "a91274f1.8c8af",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1866.9837341308594,
-        "y": 4425.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 1892.6670989990234,
+        "y": 4430.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "77dc6e4f.3fb428"
+                "4cf12171.7f9938"
             ]
         ]
     },
     {
-        "id": "ab39d1b3.416b58",
+        "id": "a18cc13f.db156",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1340.4838562011719,
-        "y": 4539.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 1366.167221069336,
+        "y": 4544.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "42bc5c1d.fe55cc"
+                "3d61f539.cfb7aa"
             ]
         ]
     },
     {
-        "id": "42bc5c1d.fe55cc",
+        "id": "3d61f539.cfb7aa",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 1492.4838562011719,
-        "y": 4540.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 1518.167221069336,
+        "y": 4545.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b25568a6.369d78",
+        "id": "7989bd98.acfa84",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 1503.4838562011719,
-        "y": 4483.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 1529.167221069336,
+        "y": 4488.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "80f1bf38.0bc68",
+        "id": "a5cb8297.ace3c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2248.9837341308594,
-        "y": 4429.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 2274.6670989990234,
+        "y": 4434.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cad7009f.f83538",
-                "d1a2dd14.715a78",
-                "689fc80.c15b238"
+                "2680c237.68eca6",
+                "fc040fd7.89c84",
+                "2a46caf5.5b4116"
             ]
         ]
     },
     {
-        "id": "77dc6e4f.3fb428",
+        "id": "4cf12171.7f9938",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2069.9837341308594,
-        "y": 4429.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 2095.6670989990234,
+        "y": 4434.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "80f1bf38.0bc68"
+                "a5cb8297.ace3c"
             ]
         ]
     },
     {
-        "id": "6c2db8ea.27724",
+        "id": "fa8f69fe.c57418",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1053.4839782714844,
-        "y": 4587.218566894531,
-        "z": "1806503a.76a7a",
+        "x": 1079.1673431396484,
+        "y": 4592.499465942383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c3b5c5e7.57693",
-                "cf1b7699.e71658"
+                "f60ef44c.acdc6",
+                "f2d3c91e.712808"
             ]
         ]
     },
     {
-        "id": "cf1b7699.e71658",
+        "id": "f2d3c91e.712808",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1417.9837341308594,
-        "y": 4635.218566894531,
-        "z": "1806503a.76a7a",
+        "x": 1443.6670989990234,
+        "y": 4640.499465942383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "723bcced.729e54"
+                "95261a80.102e28"
             ]
         ]
     },
     {
-        "id": "c3b5c5e7.57693",
+        "id": "f60ef44c.acdc6",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1413.9837341308594,
-        "y": 4595.218566894531,
-        "z": "1806503a.76a7a",
+        "x": 1439.6670989990234,
+        "y": 4600.499465942383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "408278c5.7e5798"
+                "93ef3053.4d666"
             ]
         ]
     },
     {
-        "id": "408278c5.7e5798",
+        "id": "93ef3053.4d666",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 1571.9837341308594,
-        "y": 4595.218566894531,
-        "z": "1806503a.76a7a",
+        "x": 1597.6670989990234,
+        "y": 4600.499465942383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "723bcced.729e54",
+        "id": "95261a80.102e28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1575.4837341308594,
-        "y": 4635.218566894531,
-        "z": "1806503a.76a7a",
+        "x": 1601.1670989990234,
+        "y": 4640.499465942383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1a2dd14.715a78",
+        "id": "fc040fd7.89c84",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 2454.9837341308594,
-        "y": 4442.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 2480.6670989990234,
+        "y": 4447.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e07edffa.c89278",
-                "8645511b.c4b66",
-                "a8a5443b.9b8a2"
+                "3d8ec7b4.a91e7",
+                "f9528a5a.50e1f8",
+                "f194c3a5.898d88"
             ]
         ]
     },
     {
-        "id": "cad7009f.f83538",
+        "id": "2680c237.68eca6",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2484.9837341308594,
-        "y": 4390.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 2510.6670989990234,
+        "y": 4395.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e07edffa.c89278",
+        "id": "3d8ec7b4.a91e7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2664.9837341308594,
-        "y": 4433.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 2690.6670989990234,
+        "y": 4438.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cb5c9c8e.bb8ed8"
+                "e578c39c.344a5"
             ]
         ]
     },
     {
-        "id": "8645511b.c4b66",
+        "id": "f9528a5a.50e1f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2656.9837341308594,
-        "y": 4488.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 2682.6670989990234,
+        "y": 4493.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "29fe474c.df75c8"
+                "b1a83287.5e83a"
             ]
         ]
     },
     {
-        "id": "a8a5443b.9b8a2",
+        "id": "f194c3a5.898d88",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2661.9837341308594,
-        "y": 4545.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 2687.6670989990234,
+        "y": 4550.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b28b1e53.869fb"
+                "d1a6ffed.890f4"
             ]
         ]
     },
     {
-        "id": "b28b1e53.869fb",
+        "id": "d1a6ffed.890f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2813.9837341308594,
-        "y": 4546.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 2839.6670989990234,
+        "y": 4551.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "29fe474c.df75c8",
+        "id": "b1a83287.5e83a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2824.9837341308594,
-        "y": 4491.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 2850.6670989990234,
+        "y": 4496.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "cb5c9c8e.bb8ed8",
+        "id": "e578c39c.344a5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2809.3660583496094,
-        "y": 4431.274627685547,
-        "z": "1806503a.76a7a",
+        "x": 2835.0494232177734,
+        "y": 4436.555526733398,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a908cc9.5d7f7b"
+                "dfc70a8a.f85818"
             ]
         ]
     },
     {
-        "id": "a908cc9.5d7f7b",
+        "id": "dfc70a8a.f85818",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3023.9837341308594,
-        "y": 4427.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 3049.6670989990234,
+        "y": 4432.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "689fc80.c15b238",
+        "id": "2a46caf5.5b4116",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2404.9837341308594,
-        "y": 4506.618957519531,
-        "z": "1806503a.76a7a",
+        "x": 2430.6670989990234,
+        "y": 4511.899856567383,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a48617f3.9f6e4",
+        "id": "924743a9.bdd1d",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1082.5667419433594,
-        "y": 4807.335266113281,
-        "z": "1806503a.76a7a",
+        "x": 1108.2501068115234,
+        "y": 4812.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5ff63bef.c5afdc",
+        "id": "eeb2edff.f77838",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 897.5667419433594,
-        "y": 4874.335266113281,
-        "z": "1806503a.76a7a",
+        "x": 923.2501068115234,
+        "y": 4879.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bcfca35c.21654",
-                "62c7d864.119b88"
+                "33b186f1.cd717a",
+                "46c96756.fc5c58"
             ]
         ]
     },
     {
-        "id": "bcfca35c.21654",
+        "id": "33b186f1.cd717a",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1162.5667419433594,
-        "y": 4859.335266113281,
-        "z": "1806503a.76a7a",
+        "x": 1188.2501068115234,
+        "y": 4864.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f4258877.5e35f"
+                "cdcc95c0.40a4e8"
             ]
         ]
     },
     {
-        "id": "62c7d864.119b88",
+        "id": "46c96756.fc5c58",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1158.5667419433594,
-        "y": 4907.335266113281,
-        "z": "1806503a.76a7a",
+        "x": 1184.2501068115234,
+        "y": 4912.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3fb79094.abfaa8"
+                "5f6a4b73.d387f4"
             ]
         ]
     },
     {
-        "id": "f4258877.5e35f",
+        "id": "cdcc95c0.40a4e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1318.5667419433594,
-        "y": 4855.335266113281,
-        "z": "1806503a.76a7a",
+        "x": 1344.2501068115234,
+        "y": 4860.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2140ac57.1e83f4"
+                "5134ba22.f81734"
             ]
         ]
     },
     {
-        "id": "3fb79094.abfaa8",
+        "id": "5f6a4b73.d387f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
-        "x": 1306.5667419433594,
-        "y": 4902.335266113281,
-        "z": "1806503a.76a7a",
+        "x": 1332.2501068115234,
+        "y": 4907.616165161133,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8db3fd20.37f318",
+        "id": "73beafc9.2c20a8",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 1587.4664001464844,
-        "y": 4806.035461425781,
-        "z": "1806503a.76a7a",
+        "x": 1613.1497650146484,
+        "y": 4811.316360473633,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2140ac57.1e83f4",
+        "id": "5134ba22.f81734",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1613.2496032714844,
-        "y": 4848.235656738281,
-        "z": "1806503a.76a7a",
+        "x": 1638.9329681396484,
+        "y": 4853.516555786133,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "440b33d.dbb8acc",
+        "id": "39215cce.b57e94",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1026.8833923339844,
-        "y": 4121.602355957031,
-        "z": "1806503a.76a7a",
+        "x": 1052.5667572021484,
+        "y": 4126.883255004883,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab9e57cf.8ef448",
+        "id": "d82acda1.7d932",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 632.8834228515625,
-        "y": 4126.285491943359,
-        "z": "1806503a.76a7a",
+        "x": 658.5667877197266,
+        "y": 4131.566390991211,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "440b33d.dbb8acc",
-                "eb7859d4.8fd35"
+                "39215cce.b57e94",
+                "add9e89e.85dcc8"
             ]
         ]
     },
     {
-        "id": "867bdfac.94705",
+        "id": "e53158e8.a8e898",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 716.3333740234375,
-        "y": 5378.802337646484,
-        "z": "1806503a.76a7a",
+        "x": 742.0167388916016,
+        "y": 5384.083236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c644609d.44bce",
-                "e7413115.aec04",
-                "d006cbe4.5a677",
-                "c786893c.7012b"
+                "5f6a4675.ad6e08",
+                "454309b7.55d6d8",
+                "1e655667.3c83ca",
+                "36ecf6b9.5afb0a"
             ]
         ]
     },
     {
-        "id": "c644609d.44bce",
+        "id": "5f6a4675.ad6e08",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1077.7166748046875,
-        "y": 5141.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1103.4000396728516,
+        "y": 5147.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e7413115.aec04",
+        "id": "454309b7.55d6d8",
         "type": "save",
         "name": "delete LEAF connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 988.7166748046875,
-        "y": 5210.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1014.4000396728516,
+        "y": 5216.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d006cbe4.5a677",
+        "id": "1e655667.3c83ca",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 879.88330078125,
-        "y": 5445.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 905.5666656494141,
+        "y": 5451.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "614e61f8.50b5f",
-                "96d6a1ec.c795b",
-                "90aff610.9959f8"
+                "96f2f082.9a3518",
+                "4b895364.485e14",
+                "2fffa63d.405042"
             ]
         ]
     },
     {
-        "id": "7ca77be7.05ec8c",
+        "id": "bd546556.218588",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 2588.882568359375,
-        "y": 5370.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 2614.565933227539,
+        "y": 5376.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a9496568.146b9",
-                "c5f96edd.835cb8",
-                "e018fe0a.acb8a"
+                "d9b04f13.72ba2",
+                "6f67d0fd.f943c",
+                "d85e2a4.827e658"
             ]
         ]
     },
     {
-        "id": "b9815115.2c557",
+        "id": "eb3b9787.8ee65",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2538.882568359375,
-        "y": 5434.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 2564.565933227539,
+        "y": 5440.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d05f3809.7521c8",
+        "id": "89310244.45d948",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2618.882568359375,
-        "y": 5318.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 2644.565933227539,
+        "y": 5324.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a9496568.146b9",
+        "id": "d9b04f13.72ba2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2906.8826904296875,
-        "y": 5301.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 2932.5660552978516,
+        "y": 5307.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b7511521.12ea3"
+                "ca13eb43.a9266"
             ]
         ]
     },
     {
-        "id": "c5f96edd.835cb8",
+        "id": "6f67d0fd.f943c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2898.8826904296875,
-        "y": 5356.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 2924.5660552978516,
+        "y": 5362.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d009936c.baaf78"
+                "7e30219a.74a1a8"
             ]
         ]
     },
     {
-        "id": "e018fe0a.acb8a",
+        "id": "d85e2a4.827e658",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2903.8826904296875,
-        "y": 5413.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 2929.5660552978516,
+        "y": 5419.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a8c24324.12cd38"
+                "1fa2a159.15189f"
             ]
         ]
     },
     {
-        "id": "a8c24324.12cd38",
+        "id": "1fa2a159.15189f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3055.8826904296875,
-        "y": 5414.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 3081.5660552978516,
+        "y": 5420.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d009936c.baaf78",
+        "id": "7e30219a.74a1a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3066.8826904296875,
-        "y": 5359.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 3092.5660552978516,
+        "y": 5365.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b7511521.12ea3",
+        "id": "ca13eb43.a9266",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3051.2650146484375,
-        "y": 5299.458038330078,
-        "z": "1806503a.76a7a",
+        "x": 3076.9483795166016,
+        "y": 5304.73893737793,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "87c431c3.fca34"
+                "3ed958.dd670ea8"
             ]
         ]
     },
     {
-        "id": "87c431c3.fca34",
+        "id": "3ed958.dd670ea8",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3265.8826904296875,
-        "y": 5295.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 3291.5660552978516,
+        "y": 5301.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "614e61f8.50b5f",
+        "id": "96f2f082.9a3518",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.the-connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.the-connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.the-connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.the-connectivity.access-node-id`\" />\n",
         "comments": "",
-        "x": 1161.88330078125,
-        "y": 5314.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1187.566665649414,
+        "y": 5320.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c0a00c52.f1e878",
+        "id": "bd5e9405.7c27a8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1372.3834228515625,
-        "y": 5453.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1398.0667877197266,
+        "y": 5459.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a9f88f76.4444c"
+                "de47c705.79a8b8"
             ]
         ]
     },
     {
-        "id": "62d1e19f.b39a2",
+        "id": "6b3e7adb.d2bb84",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1375.3834228515625,
-        "y": 5341.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1401.0667877197266,
+        "y": 5347.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "957f349.e76e4c8"
+                "a396ce34.a18e2"
             ]
         ]
     },
     {
-        "id": "b9cbc6ac.26846",
+        "id": "a85067c1.2cd6d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1367.3834228515625,
-        "y": 5396.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1393.0667877197266,
+        "y": 5402.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "48a6f350.0417c4"
+                "d6007294.f11f4"
             ]
         ]
     },
     {
-        "id": "957f349.e76e4c8",
+        "id": "a396ce34.a18e2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1509.765625,
-        "y": 5336.4581298828125,
-        "z": "1806503a.76a7a",
+        "x": 1535.448989868164,
+        "y": 5341.739028930664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d4741dab.7b5f78"
+                "7dd1d4e7.a0f1bc"
             ]
         ]
     },
     {
-        "id": "a9f88f76.4444c",
+        "id": "de47c705.79a8b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 1524.3834228515625,
-        "y": 5454.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1550.0667877197266,
+        "y": 5460.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "48a6f350.0417c4",
+        "id": "d6007294.f11f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 1535.3834228515625,
-        "y": 5397.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1561.0667877197266,
+        "y": 5403.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d4741dab.7b5f78",
+        "id": "7dd1d4e7.a0f1bc",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1696.8828125,
-        "y": 5337.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1722.566177368164,
+        "y": 5343.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "93c0e1e7.1663a8"
+                "559db4ec.64792c"
             ]
         ]
     },
     {
-        "id": "93c0e1e7.1663a8",
+        "id": "559db4ec.64792c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1924.8828125,
-        "y": 5330.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1950.566177368164,
+        "y": 5336.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "eb0c27f.1616058"
+                "799fadac.e2e6ec"
             ]
         ]
     },
     {
-        "id": "96d6a1ec.c795b",
+        "id": "4b895364.485e14",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1179.88330078125,
-        "y": 5389.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 1205.566665649414,
+        "y": 5395.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c0a00c52.f1e878",
-                "62d1e19f.b39a2",
-                "b9cbc6ac.26846"
+                "bd5e9405.7c27a8",
+                "6b3e7adb.d2bb84",
+                "a85067c1.2cd6d"
             ]
         ]
     },
     {
-        "id": "eb0c27f.1616058",
+        "id": "799fadac.e2e6ec",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2130.8828125,
-        "y": 5327.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 2156.566177368164,
+        "y": 5333.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "63e7e6f3.2a24f"
+                "7cbbce76.57d9f"
             ]
         ]
     },
     {
-        "id": "63e7e6f3.2a24f",
+        "id": "7cbbce76.57d9f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2345.8822021484375,
-        "y": 5330.8023681640625,
-        "z": "1806503a.76a7a",
+        "x": 2371.5655670166016,
+        "y": 5336.083267211914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d05f3809.7521c8",
-                "7ca77be7.05ec8c",
-                "b9815115.2c557"
+                "89310244.45d948",
+                "bd546556.218588",
+                "eb3b9787.8ee65"
             ]
         ]
     },
     {
-        "id": "90aff610.9959f8",
+        "id": "2fffa63d.405042",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.the-connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1303.6500244140625,
-        "y": 5539.2022705078125,
-        "z": "1806503a.76a7a",
+        "x": 1329.3333892822266,
+        "y": 5544.483169555664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b38f67ee.531ff",
-                "7cc55d59.0067b4"
+                "fb4bb7df.e56c5",
+                "af1e6659.9dd9c8"
             ]
         ]
     },
     {
-        "id": "b38f67ee.531ff",
+        "id": "fb4bb7df.e56c5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1650.1500244140625,
-        "y": 5532.2022705078125,
-        "z": "1806503a.76a7a",
+        "x": 1675.8333892822266,
+        "y": 5537.483169555664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bec12c24.0b2378"
+                "84518bf4.248028"
             ]
         ]
     },
     {
-        "id": "7cc55d59.0067b4",
+        "id": "af1e6659.9dd9c8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1654.1500244140625,
-        "y": 5572.2022705078125,
-        "z": "1806503a.76a7a",
+        "x": 1679.8333892822266,
+        "y": 5577.483169555664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9701e6f5.8bd518"
+                "b347040e.1f286"
             ]
         ]
     },
     {
-        "id": "bec12c24.0b2378",
+        "id": "84518bf4.248028",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 1808.1500244140625,
-        "y": 5532.2022705078125,
-        "z": "1806503a.76a7a",
+        "x": 1833.8333892822266,
+        "y": 5537.483169555664,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9701e6f5.8bd518",
+        "id": "b347040e.1f286",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1811.6500244140625,
-        "y": 5572.2022705078125,
-        "z": "1806503a.76a7a",
+        "x": 1837.3333892822266,
+        "y": 5577.483169555664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "29311664.f24592"
+                "3d1d7271.d95cbe"
             ]
         ]
     },
     {
-        "id": "c786893c.7012b",
+        "id": "36ecf6b9.5afb0a",
         "type": "switchNode",
         "name": "switch tmp.MMstillHasUni?",
         "xml": "\n<switch test=\"`$tmp.MMstillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 913.183349609375,
-        "y": 5869.002532958984,
-        "z": "1806503a.76a7a",
+        "x": 938.8667144775391,
+        "y": 5874.283432006836,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a3861250.d254d8",
-                "3c90d5bf.82245a"
+                "4a5bd207.ca776c",
+                "b171c0.d456c64"
             ]
         ]
     },
     {
-        "id": "a3861250.d254d8",
+        "id": "4a5bd207.ca776c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1107.183349609375,
-        "y": 5696.0025634765625,
-        "z": "1806503a.76a7a",
+        "x": 1132.866714477539,
+        "y": 5701.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6ee92ba3.68178c"
+                "b00c5aa2.01bbe8"
             ]
         ]
     },
     {
-        "id": "3c90d5bf.82245a",
+        "id": "b171c0.d456c64",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1093.3500366210938,
-        "y": 6018.602630615234,
-        "z": "1806503a.76a7a",
+        "x": 1119.0334014892578,
+        "y": 6023.883529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "31cd7353.b764a4"
+                "782b8611.563688"
             ]
         ]
     },
     {
-        "id": "6ee92ba3.68178c",
+        "id": "b00c5aa2.01bbe8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1255.35009765625,
-        "y": 5695.6026611328125,
-        "z": "1806503a.76a7a",
+        "x": 1281.033462524414,
+        "y": 5700.883560180664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "94f88b26.f34ce",
-                "497fa775.3b5f3",
-                "e88fc760.9f3988"
+                "8daf379c.cd379",
+                "ae051555.1a065",
+                "5d9c1c4d.83462c"
             ]
         ]
     },
     {
-        "id": "94f88b26.f34ce",
+        "id": "8daf379c.cd379",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1677.199951171875,
-        "y": 5667.0025634765625,
-        "z": "1806503a.76a7a",
+        "x": 1702.883316040039,
+        "y": 5672.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "497fa775.3b5f3",
+        "id": "ae051555.1a065",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1492.199951171875,
-        "y": 5734.0025634765625,
-        "z": "1806503a.76a7a",
+        "x": 1517.883316040039,
+        "y": 5739.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ef60935.82bca7",
-                "9065d9f2.54ee4"
+                "f1328e61.aaecf8",
+                "75cc2f9e.02c51"
             ]
         ]
     },
     {
-        "id": "ef60935.82bca7",
+        "id": "f1328e61.aaecf8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1757.199951171875,
-        "y": 5719.0025634765625,
-        "z": "1806503a.76a7a",
+        "x": 1782.883316040039,
+        "y": 5724.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2819744b.f6ef4c"
+                "320d795a.de0396"
             ]
         ]
     },
     {
-        "id": "9065d9f2.54ee4",
+        "id": "75cc2f9e.02c51",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1756.199951171875,
-        "y": 5767.0025634765625,
-        "z": "1806503a.76a7a",
+        "x": 1781.883316040039,
+        "y": 5772.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8f406878.70a"
+                "9b6d9f14.bbdc1"
             ]
         ]
     },
     {
-        "id": "2819744b.f6ef4c",
+        "id": "320d795a.de0396",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1913.199951171875,
-        "y": 5715.0025634765625,
-        "z": "1806503a.76a7a",
+        "x": 1938.883316040039,
+        "y": 5720.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "450da1ad.43b1d"
+                "d445fc4a.df5c"
             ]
         ]
     },
     {
-        "id": "8f406878.70a",
+        "id": "9b6d9f14.bbdc1",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
         "comments": "",
-        "x": 1904.199951171875,
-        "y": 5762.0025634765625,
-        "z": "1806503a.76a7a",
+        "x": 1929.883316040039,
+        "y": 5767.283462524414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "450da1ad.43b1d",
+        "id": "d445fc4a.df5c",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2221.8826904296875,
-        "y": 5708.9029541015625,
-        "z": "1806503a.76a7a",
+        "x": 2247.5660552978516,
+        "y": 5714.183853149414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "af8bca67.a28908",
+        "id": "d355d862.978bc",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 2196.0994873046875,
-        "y": 5666.7027587890625,
-        "z": "1806503a.76a7a",
+        "x": 2221.7828521728516,
+        "y": 5671.983657836914,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "31cd7353.b764a4",
+        "id": "782b8611.563688",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1230.916748046875,
-        "y": 6017.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 1256.600112915039,
+        "y": 6023.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a74b089b.225b08",
-                "ce915ff5.c8d31",
-                "73f93f1a.1715d8"
+                "dfb91948.e397a8",
+                "a8afb078.60b068",
+                "9067b91d.deea4"
             ]
         ]
     },
     {
-        "id": "a74b089b.225b08",
+        "id": "dfb91948.e397a8",
         "type": "for",
         "name": "for each relationship of middle-man-conn",
         "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1536.2328491210938,
-        "y": 5951.1025390625,
-        "z": "1806503a.76a7a",
+        "x": 1561.9162139892578,
+        "y": 5956.383438110352,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1bf92ac3.705cd5"
+                "9cf25842.080a8"
             ]
         ]
     },
     {
-        "id": "1bf92ac3.705cd5",
+        "id": "9cf25842.080a8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1844.566650390625,
-        "y": 6007.102569580078,
-        "z": "1806503a.76a7a",
+        "x": 1870.250015258789,
+        "y": 6012.38346862793,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "adff6291.99a8f8"
+                "6539b459.18686c"
             ]
         ]
     },
     {
-        "id": "adff6291.99a8f8",
+        "id": "6539b459.18686c",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2024.2332763671875,
-        "y": 6007.1026611328125,
-        "z": "1806503a.76a7a",
+        "x": 2049.9166412353516,
+        "y": 6012.383560180664,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b1717f1d.d23a28"
+                "eb5ca2dd.0acd08"
             ]
         ]
     },
     {
-        "id": "b1717f1d.d23a28",
+        "id": "eb5ca2dd.0acd08",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2224.233154296875,
-        "y": 6007.102630615234,
-        "z": "1806503a.76a7a",
+        "x": 2249.916519165039,
+        "y": 6012.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1b34e983.202196",
-                "d97ea61c.b38298",
-                "b46e47b0.7a7bf"
+                "d2d794d6.23b038",
+                "fd78cb11.7b7858",
+                "dc3bf10c.53584"
             ]
         ]
     },
     {
-        "id": "1b34e983.202196",
+        "id": "d2d794d6.23b038",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2431.23291015625,
-        "y": 6057.102630615234,
-        "z": "1806503a.76a7a",
+        "x": 2456.916275024414,
+        "y": 6062.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "10e803bb.23c354"
+                "2ee18ab4.452c46"
             ]
         ]
     },
     {
-        "id": "f69a3337.dd69",
+        "id": "6518db29.e12ccc",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2408.466552734375,
-        "y": 6241.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 2434.149917602539,
+        "y": 6246.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8e127971.6de7c",
-                "9a64470f.e555c",
-                "c5ecce15.749748"
+                "1586acc8.b40733",
+                "3f4ac64b.7a4a4a",
+                "c51a0fc1.cf0b78"
             ]
         ]
     },
     {
-        "id": "1bd5cb93.6127c4",
+        "id": "2ead9053.75b73",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1577.4664916992188,
-        "y": 6284.30224609375,
-        "z": "1806503a.76a7a",
+        "x": 1603.1498565673828,
+        "y": 6289.583145141602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5280d91a.703f48"
+                "606f2389.64cdcc"
             ]
         ]
     },
     {
-        "id": "5280d91a.703f48",
+        "id": "606f2389.64cdcc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1774.4664916992188,
-        "y": 6298.30224609375,
-        "z": "1806503a.76a7a",
+        "x": 1800.1498565673828,
+        "y": 6303.583145141602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4a3e493f.526ac",
-                "404c9cef.17796c"
+                "c7f0bc3b.019c9",
+                "c9900403.e4a84"
             ]
         ]
     },
     {
-        "id": "4a3e493f.526ac",
+        "id": "c7f0bc3b.019c9",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1978.466552734375,
-        "y": 6201.30224609375,
-        "z": "1806503a.76a7a",
+        "x": 2004.149917602539,
+        "y": 6206.583145141602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e7cf2c0a.f8afd8"
+                "b4e58d4e.4eaf1"
             ]
         ]
     },
     {
-        "id": "e7cf2c0a.f8afd8",
+        "id": "b4e58d4e.4eaf1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2159.466552734375,
-        "y": 6217.30224609375,
-        "z": "1806503a.76a7a",
+        "x": 2185.149917602539,
+        "y": 6222.583145141602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f69a3337.dd69"
+                "6518db29.e12ccc"
             ]
         ]
     },
     {
-        "id": "404c9cef.17796c",
+        "id": "c9900403.e4a84",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1988.466552734375,
-        "y": 6459.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 2014.149917602539,
+        "y": 6464.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "55211637.c2f7e"
+                "5c8dbf44.909798"
             ]
         ]
     },
     {
-        "id": "55211637.c2f7e",
+        "id": "5c8dbf44.909798",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2151.466552734375,
-        "y": 6459.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 2177.149917602539,
+        "y": 6464.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ad51c793.473678"
+                "972de022.0ff4c8"
             ]
         ]
     },
     {
-        "id": "ad51c793.473678",
+        "id": "972de022.0ff4c8",
         "type": "save",
         "name": "delete uni resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2394.466552734375,
-        "y": 6459.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 2420.149917602539,
+        "y": 6464.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "76246a63.c65c94",
+        "id": "d7d50183.fdbf5",
         "type": "save",
         "name": "delete connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1362.466552734375,
-        "y": 7225.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 1388.149917602539,
+        "y": 7230.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "10e803bb.23c354",
+        "id": "2ee18ab4.452c46",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1403.4664916992188,
-        "y": 6282.30224609375,
-        "z": "1806503a.76a7a",
+        "x": 1429.1498565673828,
+        "y": 6287.583145141602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1bd5cb93.6127c4",
-                "76246a63.c65c94",
-                "99412df0.04b4f8"
+                "2ead9053.75b73",
+                "d7d50183.fdbf5",
+                "e2860ec7.2879b"
             ]
         ]
     },
     {
-        "id": "8e127971.6de7c",
+        "id": "1586acc8.b40733",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2619.466552734375,
-        "y": 6243.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 2645.149917602539,
+        "y": 6248.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e6c2ee89.d3aff"
+                "31acc7de.eb35a"
             ]
         ]
     },
     {
-        "id": "9a64470f.e555c",
+        "id": "3f4ac64b.7a4a4a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2619.95751953125,
-        "y": 6288.876373291016,
-        "z": "1806503a.76a7a",
+        "x": 2645.640884399414,
+        "y": 6294.157272338867,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "66f32499.9b808c"
+                "a537397f.244a6"
             ]
         ]
     },
     {
-        "id": "c5ecce15.749748",
+        "id": "c51a0fc1.cf0b78",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2617.466552734375,
-        "y": 6332.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 2643.149917602539,
+        "y": 6337.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fc5f97c.17990e8"
+                "c765f98e.c8b24"
             ]
         ]
     },
     {
-        "id": "b46e47b0.7a7bf",
+        "id": "dc3bf10c.53584",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2455.282958984375,
-        "y": 5957.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 2480.966323852539,
+        "y": 5963.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d97ea61c.b38298",
+        "id": "fd78cb11.7b7858",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2452.7919921875,
-        "y": 6001.328399658203,
-        "z": "1806503a.76a7a",
+        "x": 2478.475357055664,
+        "y": 6006.609298706055,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "ce915ff5.c8d31",
+        "id": "a8afb078.60b068",
         "type": "save",
         "name": "delete middle-man-conn resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1533.4000854492188,
-        "y": 6012.7021484375,
-        "z": "1806503a.76a7a",
+        "x": 1559.0834503173828,
+        "y": 6017.983047485352,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6c2ee89.d3aff",
+        "id": "31acc7de.eb35a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2785.466552734375,
-        "y": 6233.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 2811.149917602539,
+        "y": 6238.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "95de1448.b3be38",
-                "c13cc07f.32d48",
-                "89fea46.2857558",
-                "8c5b9c51.4573e8",
-                "a58a3e55.44161"
+                "d6296a84.0c07b",
+                "f2b7ba42.95aca8",
+                "d7abab02.efd25",
+                "933064b1.3f6b68",
+                "31b8d600.38568a"
             ]
         ]
     },
     {
-        "id": "fc5f97c.17990e8",
+        "id": "c765f98e.c8b24",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2784.466552734375,
-        "y": 6331.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 2810.149917602539,
+        "y": 6336.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "66f32499.9b808c",
+        "id": "a537397f.244a6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 2782.5289306640625,
-        "y": 6289.162109375,
-        "z": "1806503a.76a7a",
+        "x": 2808.2122955322266,
+        "y": 6294.443008422852,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "95de1448.b3be38",
+        "id": "d6296a84.0c07b",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3007.466552734375,
-        "y": 5951.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3033.149917602539,
+        "y": 5956.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c13cc07f.32d48",
+        "id": "f2b7ba42.95aca8",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3033.466552734375,
-        "y": 6068.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3059.149917602539,
+        "y": 6073.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2f82e357.0b1ab4",
-                "be465fa4.6aba18",
-                "877ec4f6.c7b7a"
+                "c16bbe6e.2f18e8",
+                "8e5054c2.6d8be8",
+                "8a22e0f4.ac84d"
             ]
         ]
     },
     {
-        "id": "89fea46.2857558",
+        "id": "d7abab02.efd25",
         "type": "execute",
         "name": "execute RestApiCallNode Delete OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3136.466552734375,
-        "y": 6335.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3162.149917602539,
+        "y": 6340.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2931cfbe.d3d97",
-                "162b2290.6fc605"
+                "fc236214.f51f38",
+                "6b8cfbc.a2c4d84"
             ]
         ]
     },
     {
-        "id": "8c5b9c51.4573e8",
+        "id": "933064b1.3f6b68",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3074.466552734375,
-        "y": 6470.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3100.149917602539,
+        "y": 6475.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "df16efa0.bafe28",
-                "bc60ff9d.7739e8"
+                "2126f3a4.668d54",
+                "a948f36a.4c2d08"
             ]
         ]
     },
     {
-        "id": "a58a3e55.44161",
+        "id": "31b8d600.38568a",
         "type": "save",
         "name": "delete vpn-binding resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3055.466552734375,
-        "y": 6586.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3081.149917602539,
+        "y": 6591.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "2f82e357.0b1ab4",
+        "id": "c16bbe6e.2f18e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3228.9666748046875,
-        "y": 6020.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3254.6500396728516,
+        "y": 6025.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "640fd481.180004"
+                "78bd184e.3e97c8"
             ]
         ]
     },
     {
-        "id": "be465fa4.6aba18",
+        "id": "8e5054c2.6d8be8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3220.9666748046875,
-        "y": 6075.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3246.6500396728516,
+        "y": 6080.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ecd8a620.92b268"
+                "12475557.66bd73"
             ]
         ]
     },
     {
-        "id": "640fd481.180004",
+        "id": "78bd184e.3e97c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3363.348876953125,
-        "y": 6014.958099365234,
-        "z": "1806503a.76a7a",
+        "x": 3389.032241821289,
+        "y": 6020.238998413086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d1896cdb.8141"
+                "6ef9af4.3be5bd"
             ]
         ]
     },
     {
-        "id": "877ec4f6.c7b7a",
+        "id": "8a22e0f4.ac84d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3225.9666748046875,
-        "y": 6132.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3251.6500396728516,
+        "y": 6137.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f05d5e82.949cd"
+                "28978481.66e84c"
             ]
         ]
     },
     {
-        "id": "f05d5e82.949cd",
+        "id": "28978481.66e84c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3377.9666748046875,
-        "y": 6133.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3403.6500396728516,
+        "y": 6138.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ecd8a620.92b268",
+        "id": "12475557.66bd73",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3388.9666748046875,
-        "y": 6076.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3414.6500396728516,
+        "y": 6081.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "bc60ff9d.7739e8",
+        "id": "a948f36a.4c2d08",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3327.466552734375,
-        "y": 6448.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3353.149917602539,
+        "y": 6453.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7d696f2d.0f345"
+                "a8dc909e.5f43f8"
             ]
         ]
     },
     {
-        "id": "df16efa0.bafe28",
+        "id": "2126f3a4.668d54",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3327.466552734375,
-        "y": 6504.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3353.149917602539,
+        "y": 6509.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1896cdb.8141",
+        "id": "6ef9af4.3be5bd",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3550.466064453125,
-        "y": 6016.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3576.149429321289,
+        "y": 6021.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a3649162.b60c9"
+                "3b761727.cf2a9"
             ]
         ]
     },
     {
-        "id": "a3649162.b60c9",
+        "id": "3b761727.cf2a9",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3791.466064453125,
-        "y": 6007.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3817.149429321289,
+        "y": 6012.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fd0af8f3.25299"
+                "68d5173c.b0347"
             ]
         ]
     },
     {
-        "id": "7d696f2d.0f345",
+        "id": "a8dc909e.5f43f8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3677.466064453125,
-        "y": 6438.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3703.149429321289,
+        "y": 6443.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "82ac773c.5adbc",
-                "f41b429.87576c"
+                "dcfeac9e.5fc9a8",
+                "8f5d17cf.8dabd"
             ]
         ]
     },
     {
-        "id": "2931cfbe.d3d97",
+        "id": "fc236214.f51f38",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3443.966064453125,
-        "y": 6360.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3469.649429321289,
+        "y": 6365.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "41ca7b34.32b314"
+                "f765e05b.501478"
             ]
         ]
     },
     {
-        "id": "162b2290.6fc605",
+        "id": "6b8cfbc.a2c4d84",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3444.966064453125,
-        "y": 6305.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3470.649429321289,
+        "y": 6310.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6e74c50f.6753f4"
+                "4d6a8560.f17a1c"
             ]
         ]
     },
     {
-        "id": "41ca7b34.32b314",
+        "id": "f765e05b.501478",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 3615.966064453125,
-        "y": 6358.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3641.649429321289,
+        "y": 6363.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6e74c50f.6753f4",
+        "id": "4d6a8560.f17a1c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3612.466064453125,
-        "y": 6307.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 3638.149429321289,
+        "y": 6312.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d394aeb8.1e7718",
+        "id": "432d0671.cb443",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4148.4658203125,
-        "y": 5956.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4174.149185180664,
+        "y": 5961.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5381b334.945d34",
-                "5cfd9c1e.9cd7fc",
-                "293f88.0669c878"
+                "78d865b4.b939ac",
+                "5830c911.f22ee",
+                "aa227269.131cb"
             ]
         ]
     },
     {
-        "id": "fd0af8f3.25299",
+        "id": "68d5173c.b0347",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3997.466064453125,
-        "y": 6004.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4023.149429321289,
+        "y": 6009.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d394aeb8.1e7718"
+                "432d0671.cb443"
             ]
         ]
     },
     {
-        "id": "82ac773c.5adbc",
+        "id": "dcfeac9e.5fc9a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4009.966064453125,
-        "y": 6412.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4035.649429321289,
+        "y": 6417.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ecb5b8cc.eeda88"
+                "7c5aa740.2ac998"
             ]
         ]
     },
     {
-        "id": "f41b429.87576c",
+        "id": "8f5d17cf.8dabd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4013.966064453125,
-        "y": 6452.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4039.649429321289,
+        "y": 6457.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "308650c2.e2482"
+                "61ae232.1605c5c"
             ]
         ]
     },
     {
-        "id": "308650c2.e2482",
+        "id": "61ae232.1605c5c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4201.466064453125,
-        "y": 6456.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4227.149429321289,
+        "y": 6461.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "ecb5b8cc.eeda88",
+        "id": "7c5aa740.2ac998",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4197.966064453125,
-        "y": 6416.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4223.649429321289,
+        "y": 6421.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5cfd9c1e.9cd7fc",
+        "id": "5830c911.f22ee",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4354.4658203125,
-        "y": 5969.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4380.149185180664,
+        "y": 5974.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c9280772.2e056",
-                "da69dce1.3d1cc8",
-                "c843a21f.72703"
+                "9672ea53.f6fc4",
+                "10a5745e.fad27c",
+                "4c3d97fc.40ae6"
             ]
         ]
     },
     {
-        "id": "5381b334.945d34",
+        "id": "78d865b4.b939ac",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4384.4658203125,
-        "y": 5917.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4410.149185180664,
+        "y": 5922.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c9280772.2e056",
+        "id": "9672ea53.f6fc4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4564.4658203125,
-        "y": 5960.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4590.149185180664,
+        "y": 5965.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1c355cab.e00983"
+                "a62535f9.bce6d8"
             ]
         ]
     },
     {
-        "id": "da69dce1.3d1cc8",
+        "id": "10a5745e.fad27c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4556.4658203125,
-        "y": 6015.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4582.149185180664,
+        "y": 6020.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e5e939f4.c8003"
+                "f6286309.b286"
             ]
         ]
     },
     {
-        "id": "c843a21f.72703",
+        "id": "4c3d97fc.40ae6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4561.4658203125,
-        "y": 6072.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4587.149185180664,
+        "y": 6077.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "29282b3d.cdea3c"
+                "5b2489d7.40c81"
             ]
         ]
     },
     {
-        "id": "293f88.0669c878",
+        "id": "aa227269.131cb",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4304.4658203125,
-        "y": 6033.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4330.149185180664,
+        "y": 6038.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "29282b3d.cdea3c",
+        "id": "5b2489d7.40c81",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4713.4658203125,
-        "y": 6073.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4739.149185180664,
+        "y": 6078.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e5e939f4.c8003",
+        "id": "f6286309.b286",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4724.4658203125,
-        "y": 6018.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4750.149185180664,
+        "y": 6023.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1c355cab.e00983",
+        "id": "a62535f9.bce6d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4708.84814453125,
-        "y": 5957.9580078125,
-        "z": "1806503a.76a7a",
+        "x": 4734.531509399414,
+        "y": 5963.238906860352,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "31ead1aa.38700e"
+                "34794224.ac9ad6"
             ]
         ]
     },
     {
-        "id": "31ead1aa.38700e",
+        "id": "34794224.ac9ad6",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 4923.4658203125,
-        "y": 5954.302337646484,
-        "z": "1806503a.76a7a",
+        "x": 4949.149185180664,
+        "y": 5959.583236694336,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "6da29c89.3512ec",
+        "id": "8d1e7ba3.e7c148",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
         "comments": "",
-        "x": 1659.2332763671875,
-        "y": 6751.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 1684.9166412353516,
+        "y": 6757.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "23a2345e.db2bfc",
+        "id": "6711b1e6.015f5",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1685.2332763671875,
-        "y": 6868.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 1710.9166412353516,
+        "y": 6874.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "287bda60.70f306",
-                "564bb39c.806684",
-                "f782c941.aa2bd8"
+                "89c94611.e7551",
+                "372b07e6.2f493",
+                "93b4846e.f3d23"
             ]
         ]
     },
     {
-        "id": "287bda60.70f306",
+        "id": "89c94611.e7551",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1880.7333984375,
-        "y": 6820.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 1906.416763305664,
+        "y": 6826.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5eea5356.2a418c"
+                "bdc72764.d7a65"
             ]
         ]
     },
     {
-        "id": "564bb39c.806684",
+        "id": "372b07e6.2f493",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1872.7333984375,
-        "y": 6875.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 1898.416763305664,
+        "y": 6881.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "918bf051.2e35e8"
+                "4210f39b.7722f4"
             ]
         ]
     },
     {
-        "id": "5eea5356.2a418c",
+        "id": "bdc72764.d7a65",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2015.1156005859375,
-        "y": 6815.558197021484,
-        "z": "1806503a.76a7a",
+        "x": 2040.7989654541016,
+        "y": 6820.839096069336,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a66aff1d.02ebd"
+                "8221a60d.0a6"
             ]
         ]
     },
     {
-        "id": "f782c941.aa2bd8",
+        "id": "93b4846e.f3d23",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1877.7333984375,
-        "y": 6932.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 1903.416763305664,
+        "y": 6938.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ea358a06.2ba7c"
+                "534b689.ea55a98"
             ]
         ]
     },
     {
-        "id": "ea358a06.2ba7c",
+        "id": "534b689.ea55a98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2029.7333984375,
-        "y": 6933.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 2055.416763305664,
+        "y": 6939.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "918bf051.2e35e8",
+        "id": "4210f39b.7722f4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 2040.7333984375,
-        "y": 6876.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 2066.416763305664,
+        "y": 6882.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a66aff1d.02ebd",
+        "id": "8221a60d.0a6",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2202.2327880859375,
-        "y": 6816.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 2227.9161529541016,
+        "y": 6822.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "dd540d27.8a572"
+                "70fb3446.1294d4"
             ]
         ]
     },
     {
-        "id": "dd540d27.8a572",
+        "id": "70fb3446.1294d4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2443.2327880859375,
-        "y": 6807.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 2468.9161529541016,
+        "y": 6813.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9d1b03ac.68f1d"
+                "7728eab2.206384"
             ]
         ]
     },
     {
-        "id": "e61d9898.b700f8",
+        "id": "5e0f68b.e6e5b18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2800.2325439453125,
-        "y": 6756.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 2825.9159088134766,
+        "y": 6762.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1b4a271c.3007c1",
-                "a4a420aa.eed92",
-                "5a15942c.1c868c"
+                "1f9f6b0b.3a7bad",
+                "3a372a08.82b95e",
+                "20000492.69e4a4"
             ]
         ]
     },
     {
-        "id": "9d1b03ac.68f1d",
+        "id": "7728eab2.206384",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2649.2327880859375,
-        "y": 6804.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 2674.9161529541016,
+        "y": 6810.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e61d9898.b700f8"
+                "5e0f68b.e6e5b18"
             ]
         ]
     },
     {
-        "id": "a4a420aa.eed92",
+        "id": "3a372a08.82b95e",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 3006.2325439453125,
-        "y": 6769.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 3031.9159088134766,
+        "y": 6775.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e70e66a4.f92e28",
-                "3b5db284.72d976",
-                "a90d6b8f.8e3a5"
+                "78de1b03.bad77c",
+                "d65c6861.1c4098",
+                "dc64de9d.8956c8"
             ]
         ]
     },
     {
-        "id": "5a15942c.1c868c",
+        "id": "20000492.69e4a4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2956.2325439453125,
-        "y": 6833.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 2981.9159088134766,
+        "y": 6839.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1b4a271c.3007c1",
+        "id": "1f9f6b0b.3a7bad",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 3036.2325439453125,
-        "y": 6717.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 3061.9159088134766,
+        "y": 6723.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e70e66a4.f92e28",
+        "id": "78de1b03.bad77c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3216.2325439453125,
-        "y": 6760.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 3241.9159088134766,
+        "y": 6766.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2205be3e.8c882a"
+                "13eb6200.778f26"
             ]
         ]
     },
     {
-        "id": "3b5db284.72d976",
+        "id": "d65c6861.1c4098",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3208.2325439453125,
-        "y": 6815.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 3233.9159088134766,
+        "y": 6821.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d93cd156.9d02f8"
+                "bff87948.e35e"
             ]
         ]
     },
     {
-        "id": "a90d6b8f.8e3a5",
+        "id": "dc64de9d.8956c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3213.2325439453125,
-        "y": 6872.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 3238.9159088134766,
+        "y": 6878.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b772a1ff.e97338"
+                "573969ab.842a48"
             ]
         ]
     },
     {
-        "id": "b772a1ff.e97338",
+        "id": "573969ab.842a48",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3365.2325439453125,
-        "y": 6873.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 3390.9159088134766,
+        "y": 6879.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d93cd156.9d02f8",
+        "id": "bff87948.e35e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 3376.2325439453125,
-        "y": 6818.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 3401.9159088134766,
+        "y": 6824.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2205be3e.8c882a",
+        "id": "13eb6200.778f26",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3360.6148681640625,
-        "y": 6758.55810546875,
-        "z": "1806503a.76a7a",
+        "x": 3386.2982330322266,
+        "y": 6763.839004516602,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9b8cbfdb.496af"
+                "f7bc1d31.5e03a"
             ]
         ]
     },
     {
-        "id": "9b8cbfdb.496af",
+        "id": "f7bc1d31.5e03a",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3575.2325439453125,
-        "y": 6754.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 3600.9159088134766,
+        "y": 6760.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "99412df0.04b4f8",
+        "id": "e2860ec7.2879b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1451.2332763671875,
-        "y": 6879.902435302734,
-        "z": "1806503a.76a7a",
+        "x": 1476.9166412353516,
+        "y": 6885.183334350586,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6da29c89.3512ec",
-                "23a2345e.db2bfc",
-                "4ea496a3.5a8a68"
+                "8d1e7ba3.e7c148",
+                "6711b1e6.015f5",
+                "91e5ef44.c1379"
             ]
         ]
     },
     {
-        "id": "4ea496a3.5a8a68",
+        "id": "91e5ef44.c1379",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1733.433349609375,
-        "y": 7021.102630615234,
-        "z": "1806503a.76a7a",
+        "x": 1759.116714477539,
+        "y": 7026.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fd259c6c.134fa8",
-                "9bf814bd.aca8b8"
+                "9d430c54.8affb",
+                "4e9e0184.b64f38"
             ]
         ]
     },
     {
-        "id": "9bf814bd.aca8b8",
+        "id": "4e9e0184.b64f38",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1986.433349609375,
-        "y": 6999.102630615234,
-        "z": "1806503a.76a7a",
+        "x": 2012.116714477539,
+        "y": 7004.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "10bd46c.7fcbe39"
+                "8c955553.2a5b4"
             ]
         ]
     },
     {
-        "id": "fd259c6c.134fa8",
+        "id": "9d430c54.8affb",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1986.433349609375,
-        "y": 7055.102630615234,
-        "z": "1806503a.76a7a",
+        "x": 2012.116714477539,
+        "y": 7060.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "10bd46c.7fcbe39",
+        "id": "8c955553.2a5b4",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2336.432861328125,
-        "y": 6989.102630615234,
-        "z": "1806503a.76a7a",
+        "x": 2362.116226196289,
+        "y": 6994.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cc57d141.f3e88",
-                "6b29798.5078f08"
+                "7b6e5c2.eee3ea4",
+                "23885c26.87d57c"
             ]
         ]
     },
     {
-        "id": "cc57d141.f3e88",
+        "id": "7b6e5c2.eee3ea4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2668.932861328125,
-        "y": 6963.102630615234,
-        "z": "1806503a.76a7a",
+        "x": 2694.616226196289,
+        "y": 6968.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e4bf775a.d74c18"
+                "6e7264f6.b603bc"
             ]
         ]
     },
     {
-        "id": "6b29798.5078f08",
+        "id": "23885c26.87d57c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2672.932861328125,
-        "y": 7003.102630615234,
-        "z": "1806503a.76a7a",
+        "x": 2698.616226196289,
+        "y": 7008.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9dbbe180.4c39c"
+                "7c20df87.4ce228"
             ]
         ]
     },
     {
-        "id": "9dbbe180.4c39c",
+        "id": "7c20df87.4ce228",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2860.432861328125,
-        "y": 7007.102630615234,
-        "z": "1806503a.76a7a",
+        "x": 2886.116226196289,
+        "y": 7012.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e4bf775a.d74c18",
+        "id": "6e7264f6.b603bc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 2856.932861328125,
-        "y": 6967.102630615234,
-        "z": "1806503a.76a7a",
+        "x": 2882.616226196289,
+        "y": 6972.383529663086,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "78f62ea.0af84d",
+        "id": "b3758874.8f232",
         "type": "execute",
         "name": "execute RestApiCallNode Delete Underlay OTN tunnel from the LEAF ethernet Service",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1089.25,
-        "y": 4706.6856689453125,
-        "z": "1806503a.76a7a",
+        "x": 1114.933364868164,
+        "y": 4711.966567993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "51c55595.1dd8cc",
-                "c498093d.59e4c8"
+                "d41942d3.562958",
+                "ebe016f8.97161"
             ]
         ]
     },
     {
-        "id": "51c55595.1dd8cc",
+        "id": "d41942d3.562958",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1517.749755859375,
-        "y": 4694.6856689453125,
-        "z": "1806503a.76a7a",
+        "x": 1543.433120727539,
+        "y": 4699.966567993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bc110a38.b317b"
+                "5ea52c46.125904"
             ]
         ]
     },
     {
-        "id": "c498093d.59e4c8",
+        "id": "ebe016f8.97161",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521.749755859375,
-        "y": 4734.6856689453125,
-        "z": "1806503a.76a7a",
+        "x": 1547.433120727539,
+        "y": 4739.966567993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5805f739.dc8f9"
+                "f81bc98a.2445d"
             ]
         ]
     },
     {
-        "id": "bc110a38.b317b",
+        "id": "5ea52c46.125904",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 1675.749755859375,
-        "y": 4694.6856689453125,
-        "z": "1806503a.76a7a",
+        "x": 1701.433120727539,
+        "y": 4699.966567993164,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5805f739.dc8f9",
+        "id": "f81bc98a.2445d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1679.249755859375,
-        "y": 4734.6856689453125,
-        "z": "1806503a.76a7a",
+        "x": 1704.933120727539,
+        "y": 4739.966567993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f96293b.020fc",
+        "id": "82036bd3.d2b678",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5113,
-        "y": 5027.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5138.683364868164,
+        "y": 5032.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "aad45f58.fbf018",
-                "2530767d.abaa5a",
-                "b9bc9e8d.66a4b8"
+                "54859efe.15c158",
+                "fd20f3ef.b5a108",
+                "bf190cd2.45b99"
             ]
         ]
     },
     {
-        "id": "b9bc9e8d.66a4b8",
+        "id": "bf190cd2.45b99",
         "type": "set",
         "name": "set vpnNameToSearch",
         "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
         "comments": "",
-        "x": 5340,
-        "y": 4972.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5365.683364868164,
+        "y": 4977.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "aad45f58.fbf018",
+        "id": "54859efe.15c158",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5494,
-        "y": 5024.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5519.683364868164,
+        "y": 5029.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "2530767d.abaa5a",
+        "id": "fd20f3ef.b5a108",
         "type": "switchNode",
         "name": "switch $foundVpnName",
         "xml": "<switch test=\"`$foundVpnName`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5339,
-        "y": 5079.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5364.683364868164,
+        "y": 5084.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5fd0edea.97a1fc"
+                "290514d0.09f59c"
             ]
         ]
     },
     {
-        "id": "5fd0edea.97a1fc",
+        "id": "290514d0.09f59c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5518,
-        "y": 5078.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 5543.683364868164,
+        "y": 5083.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "48fa24ff.a12f6c"
+                "8f49a5ce.76f168"
             ]
         ]
     },
     {
-        "id": "79dba259.2612cc",
+        "id": "22a945f9.085212",
         "type": "set",
         "name": "unset secondary related variables",
         "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
         "comments": "",
-        "x": 3380.249969482422,
-        "y": 433.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3405.933334350586,
+        "y": 438.56666564941406,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "11c024cf.1cb7db",
+        "id": "94938481.855978",
         "type": "set",
         "name": "set network-route-three",
         "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
         "comments": "",
-        "x": 3344.249969482422,
-        "y": 683.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3369.933334350586,
+        "y": 688.5666656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "8bfce836.dcd148",
+        "id": "7edb995a.421908",
         "type": "switchNode",
         "name": "switch secondary empty?",
         "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3347.666473388672,
-        "y": 725.5357360839844,
-        "z": "1806503a.76a7a",
+        "x": 3373.349838256836,
+        "y": 730.8166351318359,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2011ad7a.50e2d2",
-                "3e343af8.ce24be"
+                "2aad068d.f37552",
+                "160f6f1.9c78f91"
             ]
         ]
     },
     {
-        "id": "2011ad7a.50e2d2",
+        "id": "2aad068d.f37552",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3586.6663513183594,
-        "y": 561.5357666015625,
-        "z": "1806503a.76a7a",
+        "x": 3612.3497161865234,
+        "y": 566.8166656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1f12a88c.b01c37"
+                "1be1e31f.1947f5"
             ]
         ]
     },
     {
-        "id": "3e343af8.ce24be",
+        "id": "160f6f1.9c78f91",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3595.6663513183594,
-        "y": 608.5357666015625,
-        "z": "1806503a.76a7a",
+        "x": 3621.3497161865234,
+        "y": 613.8166656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d6d1ae0e.a40e7"
+                "939cd6fd.61434"
             ]
         ]
     },
     {
-        "id": "d6d1ae0e.a40e7",
+        "id": "939cd6fd.61434",
         "type": "set",
         "name": "set hasSecondary true",
         "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
         "comments": "",
-        "x": 3809.6663513183594,
-        "y": 602.5357666015625,
-        "z": "1806503a.76a7a",
+        "x": 3835.3497161865234,
+        "y": 607.8166656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1f12a88c.b01c37",
+        "id": "1be1e31f.1947f5",
         "type": "set",
         "name": "set hasSecondary false",
         "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
         "comments": "",
-        "x": 3813.6663513183594,
-        "y": 558.5357666015625,
-        "z": "1806503a.76a7a",
+        "x": 3839.3497161865234,
+        "y": 563.8166656494141,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "41d8ce05.5caae",
+        "id": "9b9082d.d33238",
         "type": "outcome",
         "name": "SECONDARY-ROOT",
         "xml": "<outcome value='SECONDARY-ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4175.700408935547,
-        "y": 511.9857177734375,
-        "z": "1806503a.76a7a",
+        "x": 4201.383773803711,
+        "y": 517.2666168212891,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "57b53193.85d2e8"
+                "5bb9e60d.7c50c8"
             ]
         ]
     },
     {
-        "id": "57b53193.85d2e8",
+        "id": "5bb9e60d.7c50c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4349.700408935547,
-        "y": 506.9857177734375,
-        "z": "1806503a.76a7a",
+        "x": 4375.383773803711,
+        "y": 512.2666168212891,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2292f0ec.6f9e9",
-                "f8b394d0.6213f"
+                "7a7e54e9.bf28b4",
+                "1946febe.bd9461"
             ]
         ]
     },
     {
-        "id": "2292f0ec.6f9e9",
+        "id": "7a7e54e9.bf28b4",
         "type": "set",
         "name": "set network-route-SECONDARY-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4593.700653076172,
-        "y": 498.9857177734375,
-        "z": "1806503a.76a7a",
+        "x": 4619.384017944336,
+        "y": 504.26661682128906,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "f8b394d0.6213f",
+        "id": "1946febe.bd9461",
         "type": "set",
         "name": "set network-route-C",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
         "comments": "",
-        "x": 4539.700653076172,
-        "y": 538.9857177734375,
-        "z": "1806503a.76a7a",
+        "x": 4565.384017944336,
+        "y": 544.2666168212891,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "4bc67983.47c6f",
+        "id": "a01fe37.2547ea",
         "type": "outcome",
         "name": "SECONDARY-ROOT",
         "xml": "<outcome value='SECONDARY-ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4144.700408935547,
-        "y": 741.3857421875,
-        "z": "1806503a.76a7a",
+        "x": 4170.383773803711,
+        "y": 746.6666412353516,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ca96ae7a.f7e118"
+                "918e4345.efda7"
             ]
         ]
     },
     {
-        "id": "ca96ae7a.f7e118",
+        "id": "918e4345.efda7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4302.700164794922,
-        "y": 784.3855590820312,
-        "z": "1806503a.76a7a",
+        "x": 4328.383529663086,
+        "y": 789.6664581298828,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bdef3637.91db48",
-                "b84fc7dd.a088f8"
+                "6e675e43.dde0d8",
+                "80002079.3161b8"
             ]
         ]
     },
     {
-        "id": "bdef3637.91db48",
+        "id": "6e675e43.dde0d8",
         "type": "set",
         "name": "set network-route-SECONDARY-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4524.700164794922,
-        "y": 770.3856811523438,
-        "z": "1806503a.76a7a",
+        "x": 4550.383529663086,
+        "y": 775.6665802001953,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b84fc7dd.a088f8",
+        "id": "80002079.3161b8",
         "type": "set",
         "name": "set network-route-C",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4470.700164794922,
-        "y": 810.3856811523438,
-        "z": "1806503a.76a7a",
+        "x": 4496.383529663086,
+        "y": 815.6665802001953,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ec6aad53.7d628",
+        "id": "f054f8f8.d1b3a",
         "type": "save",
         "name": "get network-route-three from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
         "comments": "",
         "outputs": 1,
-        "x": 3356.133270263672,
-        "y": 977.6190185546875,
-        "z": "1806503a.76a7a",
+        "x": 3381.816635131836,
+        "y": 982.8999176025391,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "60b6baf9.326c5c",
-                "fffcc6ce.01cc38",
-                "232b371a.13f76"
+                "36902805.8d90e",
+                "becbd8eb.e312f8",
+                "8659a4ac.581568"
             ]
         ]
     },
     {
-        "id": "60b6baf9.326c5c",
+        "id": "36902805.8d90e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3596.133270263672,
-        "y": 960.6190185546875,
-        "z": "1806503a.76a7a",
+        "x": 3621.816635131836,
+        "y": 965.8999176025391,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "fffcc6ce.01cc38",
+        "id": "becbd8eb.e312f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3591.642333984375,
-        "y": 1003.0450744628906,
-        "z": "1806503a.76a7a",
+        "x": 3617.325698852539,
+        "y": 1008.3259735107422,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "232b371a.13f76",
+        "id": "8659a4ac.581568",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3595.642303466797,
-        "y": 1051.0450439453125,
-        "z": "1806503a.76a7a",
+        "x": 3621.325668334961,
+        "y": 1056.325942993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b996a975.9f4ee8"
+                "3e8b9bd4.673dec"
             ]
         ]
     },
     {
-        "id": "b996a975.9f4ee8",
+        "id": "3e8b9bd4.673dec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3751.133270263672,
-        "y": 1020.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 3776.816635131836,
+        "y": 1025.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2df3eeae.ae260a"
+                "dcd7f0d5.69944"
             ]
         ]
     },
     {
-        "id": "2df3eeae.ae260a",
+        "id": "dcd7f0d5.69944",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3873.133270263672,
-        "y": 967.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 3898.816635131836,
+        "y": 972.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "30af5545.05a802",
-                "294528ca.16e348",
-                "fdf4c0e0.5eff08"
+                "b21b1a8d.ec399",
+                "40a89314.47b21c",
+                "f3bd5a06.f854e"
             ]
         ]
     },
     {
-        "id": "30af5545.05a802",
+        "id": "b21b1a8d.ec399",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4109.133270263672,
-        "y": 817.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4134.816635131836,
+        "y": 822.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "58899b33.3d8864"
+                "c5a6386c.ce6e1"
             ]
         ]
     },
     {
-        "id": "294528ca.16e348",
+        "id": "40a89314.47b21c",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4105.133270263672,
-        "y": 873.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4130.816635131836,
+        "y": 878.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2016713.cf9120e"
+                "12081a23.d55f7e"
             ]
         ]
     },
     {
-        "id": "58899b33.3d8864",
+        "id": "c5a6386c.ce6e1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4235.133270263672,
-        "y": 825.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4260.816635131836,
+        "y": 830.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "23e1076f.823948",
-                "e01e107b.4a322"
+                "bedffac2.d82048",
+                "6105d759.fbeec8"
             ]
         ]
     },
     {
-        "id": "2016713.cf9120e",
+        "id": "12081a23.d55f7e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4238.133270263672,
-        "y": 878.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4263.816635131836,
+        "y": 883.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "42b53bab.59e5ec",
-                "9f9141a1.5b5a98"
+                "7ef90f2d.cab8",
+                "728a110f.c5d4a8"
             ]
         ]
     },
     {
-        "id": "fdf4c0e0.5eff08",
+        "id": "f3bd5a06.f854e",
         "type": "outcome",
         "name": "SECONDARY-ROOT",
         "xml": "<outcome value='SECONDARY-ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4098.133270263672,
-        "y": 951.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4123.816635131836,
+        "y": 956.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7151cb9d.fcc3b4"
+                "a50b1577.32615"
             ]
         ]
     },
     {
-        "id": "7151cb9d.fcc3b4",
+        "id": "a50b1577.32615",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4254.133270263672,
-        "y": 972.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4279.816635131836,
+        "y": 977.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "16090c67.366d8c",
-                "877ec323.7c8b08"
+                "8c375d88.8bcbe",
+                "79733ca8.98d714"
             ]
         ]
     },
     {
-        "id": "23e1076f.823948",
+        "id": "bedffac2.d82048",
         "type": "set",
         "name": "set network-route-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4482.133270263672,
-        "y": 855.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4507.816635131836,
+        "y": 860.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e01e107b.4a322",
+        "id": "6105d759.fbeec8",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4474.133270263672,
-        "y": 897.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4499.816635131836,
+        "y": 902.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "42b53bab.59e5ec",
+        "id": "7ef90f2d.cab8",
         "type": "set",
         "name": "set network-route-LEAF",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4475.133270263672,
-        "y": 949.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4500.816635131836,
+        "y": 954.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9f9141a1.5b5a98",
+        "id": "728a110f.c5d4a8",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
         "comments": "",
-        "x": 4462.133270263672,
-        "y": 989.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4487.816635131836,
+        "y": 994.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "877ec323.7c8b08",
+        "id": "79733ca8.98d714",
         "type": "set",
         "name": "set network-route-C",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
         "comments": "",
-        "x": 4436.133270263672,
-        "y": 1083.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4461.816635131836,
+        "y": 1088.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "16090c67.366d8c",
+        "id": "8c375d88.8bcbe",
         "type": "set",
         "name": "set network-route-SECONDARY-ROOT",
         "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
         "comments": "",
-        "x": 4498.133270263672,
-        "y": 1039.6189575195312,
-        "z": "1806503a.76a7a",
+        "x": 4523.816635131836,
+        "y": 1044.8998565673828,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2a307068.85126",
+        "id": "663710d5.9b6118",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3700.13330078125,
-        "y": 2223.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3725.816665649414,
+        "y": 2228.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5e91bdef.ec251c",
-                "edfa6b23.11ec28"
+                "4284e0ad.37004",
+                "54bef6f2.4fc7a"
             ]
         ]
     },
     {
-        "id": "268e9ec4.4facea",
+        "id": "16d496be.188cb9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3527.466796875,
-        "y": 2224.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3553.150161743164,
+        "y": 2229.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2a307068.85126"
+                "663710d5.9b6118"
             ]
         ]
     },
     {
-        "id": "15820d3a.1e0693",
+        "id": "545ddc0c.5d5ecc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3536.957763671875,
-        "y": 2266.8598022460938,
-        "z": "1806503a.76a7a",
+        "x": 3562.641128540039,
+        "y": 2272.1407012939453,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5a5c2368.a7e5dc",
+        "id": "5e1fc0e8.d800d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3525.466796875,
-        "y": 2313.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3551.150161743164,
+        "y": 2318.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5e91bdef.ec251c",
+        "id": "4284e0ad.37004",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3990.466796875,
-        "y": 2239.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4016.150161743164,
+        "y": 2244.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "fab0baab.63daf",
-                "4fbe9a1d.f89b1c"
+                "7adfe0fe.0b09c",
+                "70e2db35.da559c"
             ]
         ]
     },
     {
-        "id": "4fbe9a1d.f89b1c",
+        "id": "70e2db35.da559c",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4213.466796875,
-        "y": 2194.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4239.150161743164,
+        "y": 2199.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e7a6f67c.223ba8"
+                "624b6d74.0c220c"
             ]
         ]
     },
     {
-        "id": "fab0baab.63daf",
+        "id": "7adfe0fe.0b09c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4215.466796875,
-        "y": 2258.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4241.150161743164,
+        "y": 2263.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e4fc9765.fde21"
+                "44c8e026.3089e"
             ]
         ]
     },
     {
-        "id": "ad2e0fde.b44de8",
+        "id": "71a7eba7.ddb6fc",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3321.466796875,
-        "y": 2245.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3347.150161743164,
+        "y": 2250.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "268e9ec4.4facea",
-                "15820d3a.1e0693",
-                "5a5c2368.a7e5dc"
+                "16d496be.188cb9",
+                "545ddc0c.5d5ecc",
+                "5e1fc0e8.d800d8"
             ]
         ]
     },
     {
-        "id": "8876fe3a.88e278",
+        "id": "720f0fd3.e06eb",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3260.466796875,
-        "y": 2203.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3286.150161743164,
+        "y": 2208.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "c02bc34.16c814",
+        "id": "dab7847.8f75af8",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3341.466796875,
-        "y": 2093.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3367.150161743164,
+        "y": 2098.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "85d9fc70.3a0b8",
-                "63a7add0.8255ec"
+                "bb6830ab.78043",
+                "943e3a24.27d0d"
             ]
         ]
     },
     {
-        "id": "63a7add0.8255ec",
+        "id": "943e3a24.27d0d",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3564.466796875,
-        "y": 2079.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3590.150161743164,
+        "y": 2084.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "39d5594f.5d224e"
+                "14789ba.27922e4"
             ]
         ]
     },
     {
-        "id": "85d9fc70.3a0b8",
+        "id": "bb6830ab.78043",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3566.466796875,
-        "y": 2112.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3592.150161743164,
+        "y": 2117.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "39d5594f.5d224e",
+        "id": "14789ba.27922e4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3712.466796875,
-        "y": 2072.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3738.150161743164,
+        "y": 2077.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cf9e5f0.1f2092",
-                "6b6736af.eb70a"
+                "f084bd9b.374fe",
+                "635334a7.ad5104"
             ]
         ]
     },
     {
-        "id": "cf9e5f0.1f2092",
+        "id": "f084bd9b.374fe",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3904.4666748046875,
-        "y": 2009.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3930.1500396728516,
+        "y": 2014.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "edfa6b23.11ec28",
+        "id": "54bef6f2.4fc7a",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3971.466796875,
-        "y": 2370.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3997.150161743164,
+        "y": 2375.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c80278c9.710488"
+                "2fc07773.c6e698"
             ]
         ]
     },
     {
-        "id": "c80278c9.710488",
+        "id": "2fc07773.c6e698",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4177.466796875,
-        "y": 2370.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4203.150161743164,
+        "y": 2375.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7e2cf131.a58a08"
+                "eda47f6d.73a9a"
             ]
         ]
     },
     {
-        "id": "6b6736af.eb70a",
+        "id": "635334a7.ad5104",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3926.4666748046875,
-        "y": 2077.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3952.1500396728516,
+        "y": 2082.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9d1ec1c.6f0f9c",
-                "f4e7e55c.530698",
-                "d7c76719.0fc4b"
+                "fd3d2e45.ba5c18",
+                "6f65faaa.29e51c",
+                "979b3e61.62e1e8"
             ]
         ]
     },
     {
-        "id": "9d1ec1c.6f0f9c",
+        "id": "fd3d2e45.ba5c18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4121.966796875,
-        "y": 2029.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4147.650161743164,
+        "y": 2034.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "13bd6284.e3089d"
+                "76cbe983.f31c3"
             ]
         ]
     },
     {
-        "id": "f4e7e55c.530698",
+        "id": "6f65faaa.29e51c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4113.966796875,
-        "y": 2084.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4139.650161743164,
+        "y": 2089.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "56e4b2a7.59d05c"
+                "ad429934.3c84f"
             ]
         ]
     },
     {
-        "id": "d7c76719.0fc4b",
+        "id": "979b3e61.62e1e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4118.966796875,
-        "y": 2141.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4144.650161743164,
+        "y": 2146.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "67615599.b73f0c"
+                "bbff5204.a70cf8"
             ]
         ]
     },
     {
-        "id": "67615599.b73f0c",
+        "id": "bbff5204.a70cf8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4270.966796875,
-        "y": 2142.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4296.650161743164,
+        "y": 2147.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "13bd6284.e3089d",
+        "id": "76cbe983.f31c3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4266.34912109375,
-        "y": 2026.9414367675781,
-        "z": "1806503a.76a7a",
+        "x": 4292.032485961914,
+        "y": 2032.2223358154297,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "3bd0a776.cdf68"
+                "181d9117.3dc1c7"
             ]
         ]
     },
     {
-        "id": "d87e7a94.9bda08",
+        "id": "a71111e6.40602",
         "type": "set",
         "name": "set SECONDARY-ROOT stuff",
         "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
         "comments": "",
-        "x": 3322.13330078125,
-        "y": 2338.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3347.816665649414,
+        "y": 2343.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "3b2ac73.1b40638",
+        "id": "f86bd22d.6a796",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4001.133270263672,
-        "y": 2314.285614013672,
-        "z": "1806503a.76a7a",
+        "x": 4026.816635131836,
+        "y": 2319.5665130615234,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e4fc9765.fde21",
+        "id": "44c8e026.3089e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4374.466796875,
-        "y": 2277.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4400.150161743164,
+        "y": 2282.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e7a6f67c.223ba8",
+        "id": "624b6d74.0c220c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4378.466796875,
-        "y": 2191.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4404.150161743164,
+        "y": 2196.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ab9c8c2d.c18e8",
-                "2a323f5f.e64b7"
+                "6725a861.5cac68",
+                "116c17e7.39a43"
             ]
         ]
     },
     {
-        "id": "7e2cf131.a58a08",
+        "id": "eda47f6d.73a9a",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4394.75244140625,
-        "y": 2369.1075439453125,
-        "z": "1806503a.76a7a",
+        "x": 4420.435806274414,
+        "y": 2374.388442993164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cefe725b.0f41e8"
+                "c2e9db6e.5e8918"
             ]
         ]
     },
     {
-        "id": "56e4b2a7.59d05c",
+        "id": "ad429934.3c84f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 4281.966796875,
-        "y": 2087.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4307.650161743164,
+        "y": 2092.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "ab9c8c2d.c18e8",
+        "id": "6725a861.5cac68",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
         "comments": "",
-        "x": 4548.466796875,
-        "y": 2152.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4574.150161743164,
+        "y": 2157.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2a323f5f.e64b7",
+        "id": "116c17e7.39a43",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
         "comments": "",
-        "x": 4549.466796875,
-        "y": 2257.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4575.150161743164,
+        "y": 2262.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "89cd5649.143b88",
+        "id": "d91f7d75.bbcbd8",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4544.466796875,
-        "y": 2206.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4570.150161743164,
+        "y": 2211.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "cefe725b.0f41e8",
+        "id": "c2e9db6e.5e8918",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4601.583984375,
-        "y": 2358.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 4627.267349243164,
+        "y": 2363.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a03cf587.06cef8",
-                "a11cf500.909288",
-                "7b4cfab6.8e3e3c"
+                "a655b2d0.b12cf8",
+                "1b13a85a.c9fe7",
+                "4c91f5f3.8ae07c"
             ]
         ]
     },
     {
-        "id": "a03cf587.06cef8",
+        "id": "a655b2d0.b12cf8",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4816.583984375,
-        "y": 2320.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 4842.267349243164,
+        "y": 2325.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "a11cf500.909288",
+        "id": "1b13a85a.c9fe7",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4813.583984375,
-        "y": 2359.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 4839.267349243164,
+        "y": 2364.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "1d4bbcf2.4e364b"
+                "14ad9c89.4bb913"
             ]
         ]
     },
     {
-        "id": "7b4cfab6.8e3e3c",
+        "id": "4c91f5f3.8ae07c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4769.083984375,
-        "y": 2401.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 4794.767349243164,
+        "y": 2406.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "5a11b9ac.0be8e",
+        "id": "5e825807.3f1cc",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4850.466796875,
-        "y": 2111.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4876.150161743164,
+        "y": 2116.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9451ac43.685578"
+                "fd8902be.b515c8"
             ]
         ]
     },
     {
-        "id": "3bd0a776.cdf68",
+        "id": "181d9117.3dc1c7",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4450.4666748046875,
-        "y": 2041.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4476.150039672852,
+        "y": 2046.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "baa608db.a0fe08"
+                "b70e554c.645b38"
             ]
         ]
     },
     {
-        "id": "baa608db.a0fe08",
+        "id": "b70e554c.645b38",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4647.466796875,
-        "y": 2107.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4673.150161743164,
+        "y": 2112.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5a11b9ac.0be8e",
-                "41776d15.aa3ae4"
+                "5e825807.3f1cc",
+                "25292003.2c4df"
             ]
         ]
     },
     {
-        "id": "41776d15.aa3ae4",
+        "id": "25292003.2c4df",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4852.466796875,
-        "y": 2184.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 4878.150161743164,
+        "y": 2189.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e63bdf76.82117"
+                "c08bfda1.3541a8"
             ]
         ]
     },
     {
-        "id": "1d4bbcf2.4e364b",
+        "id": "14ad9c89.4bb913",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4994.083984375,
-        "y": 2358.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 5019.767349243164,
+        "y": 2363.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "65012ff0.bac99"
+                "f56384d9.606e1"
             ]
         ]
     },
     {
-        "id": "65012ff0.bac99",
+        "id": "f56384d9.606e1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5152.083984375,
-        "y": 2358.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 5177.767349243164,
+        "y": 2363.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "8f16bdf7.24b18"
+                "a47e1ae7.393b38"
             ]
         ]
     },
     {
-        "id": "8f16bdf7.24b18",
+        "id": "a47e1ae7.393b38",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 5359.083984375,
-        "y": 2358.626220703125,
-        "z": "1806503a.76a7a",
+        "x": 5384.767349243164,
+        "y": 2363.9071197509766,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9451ac43.685578",
+        "id": "fd8902be.b515c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5027.466796875,
-        "y": 2103.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5053.150161743164,
+        "y": 2108.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "801b98ce.90edc",
-                "5fb93bf0.4b325c"
+                "3983145.c01d1ec",
+                "ded6bcc1.37b508"
             ]
         ]
     },
     {
-        "id": "5fb93bf0.4b325c",
+        "id": "ded6bcc1.37b508",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5235.466796875,
-        "y": 2110.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5261.150161743164,
+        "y": 2115.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "44bfb2a0.4cab3c",
-                "f1164e18.e0f19",
-                "7ca3e4f2.88fb4c"
+                "15291f10.bfa1d1",
+                "4ad88ea0.313028",
+                "9de78895.27ba68"
             ]
         ]
     },
     {
-        "id": "e63bdf76.82117",
+        "id": "c08bfda1.3541a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5029.466796875,
-        "y": 2176.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5055.150161743164,
+        "y": 2181.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "de27c7f7.c9276"
+                "757e0ab3.492124"
             ]
         ]
     },
     {
-        "id": "801b98ce.90edc",
+        "id": "3983145.c01d1ec",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainC id",
         "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5265.466796875,
-        "y": 2058.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5291.150161743164,
+        "y": 2063.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "de27c7f7.c9276",
+        "id": "757e0ab3.492124",
         "type": "set",
         "name": "set domainC ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5264.466796875,
-        "y": 2300.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5290.150161743164,
+        "y": 2305.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "44bfb2a0.4cab3c",
+        "id": "15291f10.bfa1d1",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5445.466796875,
-        "y": 2101.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5471.150161743164,
+        "y": 2106.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "e82fded9.073898"
+                "f933124d.0d0d48"
             ]
         ]
     },
     {
-        "id": "f1164e18.e0f19",
+        "id": "4ad88ea0.313028",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5437.466796875,
-        "y": 2156.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5463.150161743164,
+        "y": 2161.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "85250ba4.806898"
+                "708c5d46.721ab4"
             ]
         ]
     },
     {
-        "id": "7ca3e4f2.88fb4c",
+        "id": "9de78895.27ba68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5442.466796875,
-        "y": 2213.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5468.150161743164,
+        "y": 2218.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7d5613c0.f5f4cc"
+                "c3cc12ab.3cd488"
             ]
         ]
     },
     {
-        "id": "7d5613c0.f5f4cc",
+        "id": "c3cc12ab.3cd488",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5594.466796875,
-        "y": 2214.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5620.150161743164,
+        "y": 2219.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "85250ba4.806898",
+        "id": "708c5d46.721ab4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5605.466796875,
-        "y": 2159.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5631.150161743164,
+        "y": 2164.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "e82fded9.073898",
+        "id": "f933124d.0d0d48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5589.84912109375,
-        "y": 2098.9415588378906,
-        "z": "1806503a.76a7a",
+        "x": 5615.532485961914,
+        "y": 2104.222457885742,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "7c8249af.5ed848"
+                "2ba1c8df.2a738"
             ]
         ]
     },
     {
-        "id": "7c8249af.5ed848",
+        "id": "2ba1c8df.2a738",
         "type": "set",
         "name": "set controller domainC data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5804.466796875,
-        "y": 2095.285888671875,
-        "z": "1806503a.76a7a",
+        "x": 5830.150161743164,
+        "y": 2100.5667877197266,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "1e88543b.84a814",
+        "id": "5dc3af5e.92a278",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3836.13330078125,
-        "y": 2707.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 3861.816665649414,
+        "y": 2712.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "4bbf44dd.c34104"
+                "a2e190cc.8d4f1"
             ]
         ]
     },
     {
-        "id": "4bbf44dd.c34104",
+        "id": "a2e190cc.8d4f1",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4027.13330078125,
-        "y": 2711.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4052.816665649414,
+        "y": 2716.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ca18cabf.134c3"
+                "d5cbc45b.cf7e18"
             ]
         ]
     },
     {
-        "id": "ca18cabf.134c3",
+        "id": "d5cbc45b.cf7e18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4154.13330078125,
-        "y": 2710.2857666015625,
-        "z": "1806503a.76a7a",
+        "x": 4179.816665649414,
+        "y": 2715.566665649414,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "ef98dd66.570548"
+                "9dcfaa3c.2df838"
             ]
         ]
     },
     {
-        "id": "ef98dd66.570548",
+        "id": "9dcfaa3c.2df838",
         "type": "save",
         "name": "get secondary root uni from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4380.467041015625,
-        "y": 2703.619384765625,
-        "z": "1806503a.76a7a",
+        "x": 4406.150405883789,
+        "y": 2708.9002838134766,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c3cc04e3.9995e8",
-                "96ef8840.c20b2",
-                "50ef7648.d143f"
+                "9b50524c.8f5e2",
+                "d7d45f06.b90c18",
+                "a735aab1.9f93a8"
             ]
         ]
     },
     {
-        "id": "c3cc04e3.9995e8",
+        "id": "9b50524c.8f5e2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4747.466796875,
-        "y": 2597.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 4773.150161743164,
+        "y": 2602.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "625acc3d.d4dd04"
+                "c267b95.509ac48"
             ]
         ]
     },
     {
-        "id": "96ef8840.c20b2",
+        "id": "d7d45f06.b90c18",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4742.975830078125,
-        "y": 2642.0452270507812,
-        "z": "1806503a.76a7a",
+        "x": 4768.659194946289,
+        "y": 2647.326126098633,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b87c29ed.e7a1d8"
+                "bfc554f5.bfe79"
             ]
         ]
     },
     {
-        "id": "50ef7648.d143f",
+        "id": "a735aab1.9f93a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4738.975830078125,
-        "y": 2692.0452880859375,
-        "z": "1806503a.76a7a",
+        "x": 4764.659194946289,
+        "y": 2697.326187133789,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2796810b.682956"
+                "6ab7706d.b84f78"
             ]
         ]
     },
     {
-        "id": "96d93656.6958b8",
+        "id": "5ae763e6.35d8f4",
         "type": "save",
         "name": "update SECONDARY-ROOT UNI in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5186.976318359375,
-        "y": 2687.04541015625,
-        "z": "1806503a.76a7a",
+        "x": 5212.659683227539,
+        "y": 2692.3263092041016,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "625acc3d.d4dd04",
+        "id": "c267b95.509ac48",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
         "comments": "",
-        "x": 4910.038330078125,
-        "y": 2596.9049682617188,
-        "z": "1806503a.76a7a",
+        "x": 4935.721694946289,
+        "y": 2602.1858673095703,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b87c29ed.e7a1d8",
+        "id": "bfc554f5.bfe79",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4910.975830078125,
-        "y": 2642.0452270507812,
-        "z": "1806503a.76a7a",
+        "x": 4936.659194946289,
+        "y": 2647.326126098633,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "2796810b.682956",
+        "id": "6ab7706d.b84f78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4907.975830078125,
-        "y": 2692.0452880859375,
-        "z": "1806503a.76a7a",
+        "x": 4933.659194946289,
+        "y": 2697.326187133789,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "5a769bdf.551e9c",
-                "96d93656.6958b8"
+                "3400e5b4.3cd32a",
+                "5ae763e6.35d8f4"
             ]
         ]
     },
     {
-        "id": "5a769bdf.551e9c",
+        "id": "3400e5b4.3cd32a",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
-        "x": 5089.9765625,
-        "y": 2634.0452880859375,
-        "z": "1806503a.76a7a",
+        "x": 5115.659927368164,
+        "y": 2639.326187133789,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "b7814ecb.1580d",
+        "id": "fa76b584.bdbd9",
         "type": "switchNode",
         "name": "switch tmp.mmUNI-id-long != SECONDARY-ROOT UNI",
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.SECONDARY-ROOT.uni-p-interface-long`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4624.467041015625,
-        "y": 3547.6190185546875,
-        "z": "1806503a.76a7a",
+        "x": 4650.150405883789,
+        "y": 3552.899917602539,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "cf2467a.3e0e698"
+                "ef9b97c4.4f1c68"
             ]
         ]
     },
     {
-        "id": "cf2467a.3e0e698",
+        "id": "ef9b97c4.4f1c68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4914.467041015625,
-        "y": 3549.6190185546875,
-        "z": "1806503a.76a7a",
+        "x": 4940.150405883789,
+        "y": 3554.899917602539,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "774ecc4a.3ad124"
+                "608ff90c.2e5fc"
             ]
         ]
     },
     {
-        "id": "fc616200.2baf58",
+        "id": "35800841.c29e7",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4277,
-        "y": 5777.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 4302.683364868164,
+        "y": 5782.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b0c64a0a.29dee8"
+                "23246adb.7861de"
             ]
         ]
     },
     {
-        "id": "b0c64a0a.29dee8",
+        "id": "23246adb.7861de",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4468,
-        "y": 5781.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 4493.683364868164,
+        "y": 5786.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b39a4675.08bbf"
+                "f3b9dd7.5ea102"
             ]
         ]
     },
     {
-        "id": "b39a4675.08bbf",
+        "id": "f3b9dd7.5ea102",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4595,
-        "y": 5780.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 4620.683364868164,
+        "y": 5785.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6b59d25.075b22c"
+                "60b7ba2f.bc3c0c"
             ]
         ]
     },
     {
-        "id": "6b59d25.075b22c",
+        "id": "60b7ba2f.bc3c0c",
         "type": "switchNode",
         "name": "switch 2-ROOTS in same domain?",
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4820.3330078125,
-        "y": 5782.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 4846.016372680664,
+        "y": 5787.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "84c8a22.08a86e",
-                "8ae9054d.68fd08"
+                "2443ceec.623df2",
+                "ad2ba37e.796088"
             ]
         ]
     },
     {
-        "id": "84c8a22.08a86e",
+        "id": "2443ceec.623df2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5030.3330078125,
-        "y": 5759.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 5056.016372680664,
+        "y": 5764.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "93a0772f.9be09"
+                "bd893034.6b25e8"
             ]
         ]
     },
     {
-        "id": "8ae9054d.68fd08",
+        "id": "ad2ba37e.796088",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5035.3330078125,
-        "y": 5808.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 5061.016372680664,
+        "y": 5813.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "2db83bd3.7a132c"
+                "d0993207.1b217"
             ]
         ]
     },
     {
-        "id": "93a0772f.9be09",
+        "id": "bd893034.6b25e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5156.3330078125,
-        "y": 5759.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 5182.016372680664,
+        "y": 5764.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "2db83bd3.7a132c",
+        "id": "d0993207.1b217",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5153.3330078125,
-        "y": 5815.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 5179.016372680664,
+        "y": 5820.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "81928378.5f469",
-                "9b2406e3.5e7a08"
+                "7824302d.31915",
+                "638f8d60.f2970c"
             ]
         ]
     },
     {
-        "id": "81928378.5f469",
+        "id": "7824302d.31915",
         "type": "save",
         "name": "update SECONDARY-ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5467.3330078125,
-        "y": 5874.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 5493.016372680664,
+        "y": 5879.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "6888e6dc.67e04",
+        "id": "b539af9b.8e6488",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 5399.550048828125,
-        "y": 5826.4190673828125,
-        "z": "1806503a.76a7a",
+        "x": 5425.233413696289,
+        "y": 5831.699966430664,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "9b2406e3.5e7a08",
+        "id": "638f8d60.f2970c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5598,
-        "y": 5784.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 5623.683364868164,
+        "y": 5789.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d07ac0db.fa9818",
+        "id": "9c7760f0.090d48",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 868,
-        "y": 4974.6187744140625,
-        "z": "1806503a.76a7a",
+        "x": 893.6833648681641,
+        "y": 4979.899673461914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a4f6e106.afc2d"
+                "89d9c849.63865"
             ]
         ]
     },
     {
-        "id": "a4f6e106.afc2d",
+        "id": "89d9c849.63865",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1059,
-        "y": 4978.6187744140625,
-        "z": "1806503a.76a7a",
+        "x": 1084.683364868164,
+        "y": 4983.899673461914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "617b198c.79c0a"
+                "71eabcdb.edbe1c"
             ]
         ]
     },
     {
-        "id": "617b198c.79c0a",
+        "id": "71eabcdb.edbe1c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1186,
-        "y": 4977.6187744140625,
-        "z": "1806503a.76a7a",
+        "x": 1211.683364868164,
+        "y": 4982.899673461914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "f89a9d64.adeb98"
+                "b655e9e.17d4118"
             ]
         ]
     },
     {
-        "id": "f89a9d64.adeb98",
+        "id": "b655e9e.17d4118",
         "type": "switchNode",
         "name": "switch 2-ROOTS in same domain?",
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1411.3330078125,
-        "y": 4979.6187744140625,
-        "z": "1806503a.76a7a",
+        "x": 1437.016372680664,
+        "y": 4984.899673461914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "6035813d.1e7338",
-                "b4705906.43572"
+                "451cba7b.55b034",
+                "89345bed.8540d8"
             ]
         ]
     },
     {
-        "id": "6035813d.1e7338",
+        "id": "451cba7b.55b034",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1621.3330078125,
-        "y": 4956.6187744140625,
-        "z": "1806503a.76a7a",
+        "x": 1647.016372680664,
+        "y": 4961.899673461914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "b1155932.92831"
+                "6b3712d.199ce6c"
             ]
         ]
     },
     {
-        "id": "b4705906.43572",
+        "id": "89345bed.8540d8",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1626.3330078125,
-        "y": 5005.6187744140625,
-        "z": "1806503a.76a7a",
+        "x": 1652.016372680664,
+        "y": 5010.899673461914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "62407b64.a07c9c"
+                "84894ba9.2f6d9"
             ]
         ]
     },
     {
-        "id": "b1155932.92831",
+        "id": "6b3712d.199ce6c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1747.3330078125,
-        "y": 4956.6187744140625,
-        "z": "1806503a.76a7a",
+        "x": 1773.016372680664,
+        "y": 4961.899673461914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "62407b64.a07c9c",
+        "id": "84894ba9.2f6d9",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1744.3330078125,
-        "y": 5012.6187744140625,
-        "z": "1806503a.76a7a",
+        "x": 1770.016372680664,
+        "y": 5017.899673461914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d0271ecc.53e168",
-                "83be22a.f7cdb6"
+                "d5552e7d.44cc8",
+                "e67d570d.d5f9f"
             ]
         ]
     },
     {
-        "id": "83be22a.f7cdb6",
+        "id": "e67d570d.d5f9f",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2189,
-        "y": 4981.6187744140625,
-        "z": "1806503a.76a7a",
+        "x": 2214.683364868164,
+        "y": 4986.899673461914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d29b17e9.2cbf8",
+        "id": "41723099.7f44e8",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 1990.550048828125,
-        "y": 5023.4185791015625,
-        "z": "1806503a.76a7a",
+        "x": 2016.233413696289,
+        "y": 5028.699478149414,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d0271ecc.53e168",
+        "id": "d5552e7d.44cc8",
         "type": "save",
         "name": "update SECONDARY-ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2058.3330078125,
-        "y": 5071.6187744140625,
-        "z": "1806503a.76a7a",
+        "x": 2084.016372680664,
+        "y": 5076.899673461914,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "e88fc760.9f3988",
+        "id": "5d9c1c4d.83462c",
         "type": "switchNode",
         "name": "switch $hasSecondary",
         "xml": "<switch test='`$hasSecondary`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1470.3333740234375,
-        "y": 5815.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 1496.0167388916016,
+        "y": 5820.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "c0695dac.6b173"
+                "4a1beb8f.c1dbac"
             ]
         ]
     },
     {
-        "id": "c0695dac.6b173",
+        "id": "4a1beb8f.c1dbac",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1661.3333740234375,
-        "y": 5819.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 1687.0167388916016,
+        "y": 5824.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "a704fbb5.caa0b"
+                "c43fef47.9c947"
             ]
         ]
     },
     {
-        "id": "a704fbb5.caa0b",
+        "id": "c43fef47.9c947",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1788.3333740234375,
-        "y": 5818.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 1814.0167388916016,
+        "y": 5823.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "bc272657.983128"
+                "40808ad0.742134"
             ]
         ]
     },
     {
-        "id": "bc272657.983128",
+        "id": "40808ad0.742134",
         "type": "switchNode",
         "name": "switch 2-ROOTS in same domain?",
         "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2013.6663818359375,
-        "y": 5820.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 2039.3497467041016,
+        "y": 5825.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "31bdfa25.d18a2e",
-                "c242900c.77afd8"
+                "5a051931.8c6a5",
+                "818560aa.91932"
             ]
         ]
     },
     {
-        "id": "31bdfa25.d18a2e",
+        "id": "5a051931.8c6a5",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2223.6663818359375,
-        "y": 5797.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 2249.3497467041016,
+        "y": 5802.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "9d78f5ef.5cf228"
+                "8edca568.ede98"
             ]
         ]
     },
     {
-        "id": "c242900c.77afd8",
+        "id": "818560aa.91932",
         "type": "outcomeTrue",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2228.6663818359375,
-        "y": 5846.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 2254.3497467041016,
+        "y": 5851.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d542d85e.71ea7"
+                "9a80cebb.ff473"
             ]
         ]
     },
     {
-        "id": "9d78f5ef.5cf228",
+        "id": "8edca568.ede98",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2349.6663818359375,
-        "y": 5797.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 2375.3497467041016,
+        "y": 5802.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "d542d85e.71ea7",
+        "id": "9a80cebb.ff473",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2346.6663818359375,
-        "y": 5853.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 2372.3497467041016,
+        "y": 5858.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             [
-                "d23f59ed.73bc4",
-                "2e5ee108.277b9e"
+                "cc186b3e.b594b",
+                "5f3c966d.1d57c"
             ]
         ]
     },
     {
-        "id": "2e5ee108.277b9e",
+        "id": "5f3c966d.1d57c",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2791.3333740234375,
-        "y": 5822.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 2817.0167388916016,
+        "y": 5827.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "868b21d1.a7652",
+        "id": "224407cc.d62a7",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 2592.8834228515625,
-        "y": 5864.4190673828125,
-        "z": "1806503a.76a7a",
+        "x": 2618.5667877197266,
+        "y": 5869.699966430664,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "d23f59ed.73bc4",
+        "id": "cc186b3e.b594b",
         "type": "save",
         "name": "update SECONDARY-ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2660.6663818359375,
-        "y": 5912.6192626953125,
-        "z": "1806503a.76a7a",
+        "x": 2686.3497467041016,
+        "y": 5917.900161743164,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "73f93f1a.1715d8",
+        "id": "9067b91d.deea4",
         "type": "execute",
         "name": "execute Terminate SSE Connection",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1520.7666625976562,
-        "y": 6121,
-        "z": "1806503a.76a7a",
+        "x": 1546.4500274658203,
+        "y": 6126.280899047852,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
     },
     {
-        "id": "5f7e37aa.0d2258",
+        "id": "61909f2b.d81a28",
         "type": "set",
         "name": "set parameters",
         "xml": "<set>\n<parameter name='subscriptionId' value='`$rcvd-bandwidth-value`' />\n",
         "comments": "",
-        "x": 1452.800048828125,
-        "y": 6062.39990234375,
-        "z": "1806503a.76a7a",
+        "x": 1478.483413696289,
+        "y": 6067.680801391602,
+        "z": "1b4ba1fc.83240e",
         "wires": []
     },
     {
-        "id": "29311664.f24592",
+        "id": "3d1d7271.d95cbe",
         "type": "execute",
         "name": "execute Terminate SSE Connection",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='deleteSubscriptionAndSseConnection' >\n<parameter name=\"subscriberId\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.cll-terminate-notification.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/operations/ietf-subscribed-notifications:delete-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"X-ACCESS-TOKEN=x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarnyle3sdcqq9hftc4lebz464b5ffxmlbvg9\" />\n<parameter name=\"module\" value=\"GENERIC-RESOURCE-API\" />\n<parameter name=\"rpc\" value=\"cll-vnf-topology-operation-cll-callbackdg-notification\" />\n<parameter name=\"version\" value=\"`$project.version`\" />\n<parameter name=\"mode\" value=\"sync\" />\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2069.433349609375,
-        "y": 5569.2333984375,
-        "z": "1806503a.76a7a",
+        "x": 2095.116714477539,
+        "y": 5574.514297485352,
+        "z": "1b4ba1fc.83240e",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
index 6b46d326..807831e8 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "9b0ef60b.7214f",
+    "id": "a36be240.71b108",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 179.56666564941406,
-    "y": 189.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 181.56666564941406,
+    "y": 140.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fb71b372.446598"
+        "d32c48f4.aac76"
       ]
     ]
   },
   {
-    "id": "fb71b372.446598",
+    "id": "d32c48f4.aac76",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,10540 +22,10540 @@
     "comments": "",
     "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs": 1,
-    "x": 463.85235595703125,
-    "y": 250.52385997772217,
-    "z": "2414cd0b.85dac2",
+    "x": 465.85235595703125,
+    "y": 201.52385997772217,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "661c7873.62c16"
+        "cea08712.e1ad8"
       ]
     ]
   },
   {
-    "id": "661c7873.62c16",
+    "id": "cea08712.e1ad8",
     "type": "method",
     "name": "method cll-vnf-topology-operation-cll-modify",
     "xml": "<method rpc='cll-vnf-topology-operation-cll-modify' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 469.9952697753906,
-    "y": 335.28578186035156,
-    "z": "2414cd0b.85dac2",
+    "x": 471.9952697753906,
+    "y": 286.28578186035156,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f0354603.74586"
+        "81a694dd.59419"
       ]
     ]
   },
   {
-    "id": "f0354603.74586",
+    "id": "81a694dd.59419",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 819.5666656494141,
-    "y": 394.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 821.5666656494141,
+    "y": 345.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "729f4799.a6df6",
-        "82d86696.e8f5a",
-        "381a9eda.91673a"
+        "262c4d6b.8ef302",
+        "f6c757fc.4ac3d8",
+        "5a309470.2c2984"
       ]
     ]
   },
   {
-    "id": "729f4799.a6df6",
+    "id": "262c4d6b.8ef302",
     "type": "returnSuccess",
     "name": "return success",
     "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments": "",
-    "x": 1120.900161743164,
-    "y": 665.2160491943359,
-    "z": "2414cd0b.85dac2",
+    "x": 1122.900161743164,
+    "y": 616.2160491943359,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "82d86696.e8f5a",
+    "id": "f6c757fc.4ac3d8",
     "type": "save",
     "name": "get service-instance from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->",
     "comments": "",
     "outputs": 1,
-    "x": 1142.328628540039,
-    "y": 367.6190643310547,
-    "z": "2414cd0b.85dac2",
+    "x": 1144.328628540039,
+    "y": 318.6190643310547,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "19e3f412.c2895c",
-        "22e3b9e.2e85d46",
-        "d1fd3935.e60aa8"
+        "46d97ddb.2cdac4",
+        "5d275c59.021c7c",
+        "49cae57.69a7f9c"
       ]
     ]
   },
   {
-    "id": "19e3f412.c2895c",
+    "id": "46d97ddb.2cdac4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1367.328628540039,
-    "y": 225.6190643310547,
-    "z": "2414cd0b.85dac2",
+    "x": 1369.328628540039,
+    "y": 176.6190643310547,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bdfafca5.bdc978"
+        "f1f14b39.ae66d8"
       ]
     ]
   },
   {
-    "id": "22e3b9e.2e85d46",
+    "id": "5d275c59.021c7c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1362.819595336914,
-    "y": 295.19309997558594,
-    "z": "2414cd0b.85dac2",
+    "x": 1364.819595336914,
+    "y": 246.19309997558594,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f555968c.0ca438"
+        "e0fe1751.0d1d08"
       ]
     ]
   },
   {
-    "id": "d1fd3935.e60aa8",
+    "id": "49cae57.69a7f9c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1351.328628540039,
-    "y": 341.6190643310547,
-    "z": "2414cd0b.85dac2",
+    "x": 1353.328628540039,
+    "y": 292.6190643310547,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cd958c5e.148ca8"
+        "91b68660.fcd578"
       ]
     ]
   },
   {
-    "id": "60f90238.97edc4",
+    "id": "83ec93b8.4f0e58",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1121.328628540039,
-    "y": 255.6190643310547,
-    "z": "2414cd0b.85dac2",
+    "x": 1123.328628540039,
+    "y": 206.6190643310547,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "381a9eda.91673a",
+    "id": "5a309470.2c2984",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 1109.328628540039,
-    "y": 307.6190643310547,
-    "z": "2414cd0b.85dac2",
+    "x": 1111.328628540039,
+    "y": 258.6190643310547,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "bdfafca5.bdc978",
+    "id": "f1f14b39.ae66d8",
     "type": "switchNode",
     "name": "switch allotted-resources_length != 0",
     "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1607.566665649414,
-    "y": 222.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1609.566665649414,
+    "y": 173.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1d20e341.a27c1d",
-        "5ce58924.9a36f"
+        "47b460bb.508b6",
+        "e9217582.339fb"
       ]
     ]
   },
   {
-    "id": "f555968c.0ca438",
+    "id": "e0fe1751.0d1d08",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 1517.6290435791016,
-    "y": 298.14552307128906,
-    "z": "2414cd0b.85dac2",
+    "x": 1519.6290435791016,
+    "y": 249.14552307128906,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "cd958c5e.148ca8",
+    "id": "91b68660.fcd578",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1521.566665649414,
-    "y": 342.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1523.566665649414,
+    "y": 293.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1d20e341.a27c1d",
+    "id": "47b460bb.508b6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1812.566665649414,
-    "y": 259.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1814.566665649414,
+    "y": 210.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e28a7a1e.c07b78"
+        "4440eff6.476cd"
       ]
     ]
   },
   {
-    "id": "5ce58924.9a36f",
+    "id": "e9217582.339fb",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1822.566665649414,
-    "y": 186.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1824.566665649414,
+    "y": 137.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e28a7a1e.c07b78",
+    "id": "4440eff6.476cd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1805.566665649414,
-    "y": 334.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1807.566665649414,
+    "y": 285.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fd95487b.da105",
-        "526e7fc2.050288",
-        "a11cf219.9bf18",
-        "8ac4fdd4.d603a8",
-        "c717d5f4.4fddc8"
+        "3986b18c.a9e7ae",
+        "1a55fc09.fb08cc",
+        "84bc3e18.c9d6e",
+        "63b2fdab.785aac",
+        "dfc7a62b.53e19"
       ]
     ]
   },
   {
-    "id": "324358a6.ea813",
+    "id": "1cb8dc69.891db4",
     "type": "save",
     "name": "get allotted-resource from aai",
     "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"allotted-resource\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type-->\n<!--         AND allotted-resource.id = $allotted-resource-id'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2291.566665649414,
-    "y": 385.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2293.566665649414,
+    "y": 336.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6086efb9.edfcd",
-        "9b93dfe7.0d77",
-        "a7f7b2f5.24504"
+        "d730a66e.613558",
+        "3006b8b.6e69448",
+        "f68070c6.2ea968"
       ]
     ]
   },
   {
-    "id": "6086efb9.edfcd",
+    "id": "d730a66e.613558",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2507.566665649414,
-    "y": 452.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2509.566665649414,
+    "y": 403.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a12dc51a.620ef"
+        "e3579fa8.43b168"
       ]
     ]
   },
   {
-    "id": "9b93dfe7.0d77",
+    "id": "3006b8b.6e69448",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2508.057632446289,
-    "y": 351.85972595214844,
-    "z": "2414cd0b.85dac2",
+    "x": 2510.057632446289,
+    "y": 302.85972595214844,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "adc977fa.7cd608"
+        "6bbc8555.572b94"
       ]
     ]
   },
   {
-    "id": "a7f7b2f5.24504",
+    "id": "f68070c6.2ea968",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2503.566665649414,
-    "y": 401.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2505.566665649414,
+    "y": 352.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4d4bdb5a.3763ac"
+        "a1a8f5c7.a1ada"
       ]
     ]
   },
   {
-    "id": "fd95487b.da105",
+    "id": "3986b18c.a9e7ae",
     "type": "for",
     "name": "for each allotted-resource",
     "xml": "<for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 2008.566665649414,
-    "y": 366.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2010.566665649414,
+    "y": 317.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cc186f28.ba2c9",
-        "324358a6.ea813",
-        "ab78fc6f.8a0998",
-        "1e0dcc9a.c7d15b"
+        "62594551.389614",
+        "1cb8dc69.891db4",
+        "1902c403.6fb814",
+        "b21e9d77.e0db"
       ]
     ]
   },
   {
-    "id": "cc186f28.ba2c9",
+    "id": "62594551.389614",
     "type": "set",
     "name": "set the current allotted-resource-id",
     "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`\" />\n\n\n",
     "comments": "",
-    "x": 2288.566665649414,
-    "y": 304.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2290.566665649414,
+    "y": 255.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "8ac4fdd4.d603a8",
+    "id": "63b2fdab.785aac",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='tmp.arr_length' value='0' />\n\n<parameter name='otn-tunnel-slice' value='' />\n<parameter name='otn-tunnel-slice_length' value='0' />\n\n<!--<parameter name='tmp.slicevpns' value='' />-->\n<!--<parameter name='tmp.slicevpns_length' value='0' />-->\n\n<!--<parameter name='tmp.slicevpnuuids' value='' />-->\n<!--<parameter name='tmp.slicevpnuuids.' value='' />-->\n\n\n",
     "comments": "",
-    "x": 1982.566665649414,
-    "y": 316.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1984.566665649414,
+    "y": 267.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "526e7fc2.050288",
+    "id": "1a55fc09.fb08cc",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
-    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2025.566665649414,
-    "y": 175.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2027.566665649414,
+    "y": 126.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a11cf219.9bf18",
+    "id": "84bc3e18.c9d6e",
     "type": "get-resource",
     "name": "get-resource logical-links",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-links\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2037.566665649414,
-    "y": 216.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2039.566665649414,
+    "y": 167.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "2d1a927f.4e32b6",
+    "id": "70e12844.2efb58",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2062.566665649414,
-    "y": 128.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2064.566665649414,
+    "y": 79.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9e25d87e.938588",
+    "id": "1582189.5e20967",
     "type": "set",
     "name": "set tmp.arr",
     "xml": "<set>\n<parameter name='tmp.arr.' value='' />\n<parameter name='tmp.arridx' value='0' />\n<parameter name='otn-tunnel-slice.' value='' />\n\n\n",
     "comments": "",
-    "x": 1982.566665649414,
-    "y": 262.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 1984.566665649414,
+    "y": 213.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "adc977fa.7cd608",
+    "id": "6bbc8555.572b94",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 2686.566665649414,
-    "y": 354.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2688.566665649414,
+    "y": 305.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4d4bdb5a.3763ac",
+    "id": "a1a8f5c7.a1ada",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2686.504165649414,
-    "y": 403.42601013183594,
-    "z": "2414cd0b.85dac2",
+    "x": 2688.504165649414,
+    "y": 354.42601013183594,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "a12dc51a.620ef",
+    "id": "e3579fa8.43b168",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2688.504165649414,
-    "y": 454.42601013183594,
-    "z": "2414cd0b.85dac2",
+    "x": 2690.504165649414,
+    "y": 405.42601013183594,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e28b2f59.3a0188"
+        "234c19dd.3792f6"
       ]
     ]
   },
   {
-    "id": "e28b2f59.3a0188",
+    "id": "234c19dd.3792f6",
     "type": "save",
     "name": "get allotted-resource relationship from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"allotted-resource:relationship-list\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type\n         AND allotted-resource.id = $allotted-resource-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.allotted-resource.relationship-list\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3023.504165649414,
-    "y": 223.426025390625,
-    "z": "2414cd0b.85dac2",
+    "x": 3025.504165649414,
+    "y": 174.426025390625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5b54194d.44ebe",
-        "aebf4283.d1be78",
-        "4cc0a7b0.54364"
+        "403040fa.29d128",
+        "d2e9aaef.69fb08",
+        "b24293ea.efd47"
       ]
     ]
   },
   {
-    "id": "aebf4283.d1be78",
+    "id": "d2e9aaef.69fb08",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3296.995132446289,
-    "y": 116,
-    "z": "2414cd0b.85dac2",
+    "x": 3298.995132446289,
+    "y": 67,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bfbb6bff.50e7e8"
+        "fccce16d.0a609"
       ]
     ]
   },
   {
-    "id": "bfbb6bff.50e7e8",
+    "id": "fccce16d.0a609",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3474.566665649414,
-    "y": 116.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3476.566665649414,
+    "y": 67.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4cc0a7b0.54364",
+    "id": "b24293ea.efd47",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3292.504165649414,
-    "y": 165.426025390625,
-    "z": "2414cd0b.85dac2",
+    "x": 3294.504165649414,
+    "y": 116.426025390625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8ce95b42.618ca8"
+        "1cbd7c7f.481b8c"
       ]
     ]
   },
   {
-    "id": "8ce95b42.618ca8",
+    "id": "1cbd7c7f.481b8c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3474.504165649414,
-    "y": 165.426025390625,
-    "z": "2414cd0b.85dac2",
+    "x": 3476.504165649414,
+    "y": 116.426025390625,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5b54194d.44ebe",
+    "id": "403040fa.29d128",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3296.504165649414,
-    "y": 216.426025390625,
-    "z": "2414cd0b.85dac2",
+    "x": 3298.504165649414,
+    "y": 167.426025390625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6f465aa6.4f1ee4"
+        "6553de3d.0fe06"
       ]
     ]
   },
   {
-    "id": "6f465aa6.4f1ee4",
+    "id": "6553de3d.0fe06",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3476.504165649414,
-    "y": 216.426025390625,
-    "z": "2414cd0b.85dac2",
+    "x": 3478.504165649414,
+    "y": 167.426025390625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7a127cf4.cf8b34"
+        "a3b12c76.41d528"
       ]
     ]
   },
   {
-    "id": "7a127cf4.cf8b34",
+    "id": "a3b12c76.41d528",
     "type": "switchNode",
     "name": "switch allotted-resource.relationship-list not empty",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship_length != 0`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3042.566665649414,
-    "y": 351.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3044.566665649414,
+    "y": 302.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9cc4aaf6.859c",
-        "9d86e661.45c7f"
+        "18fdd62.581202a",
+        "6160fe1a.c1358"
       ]
     ]
   },
   {
-    "id": "9d86e661.45c7f",
+    "id": "6160fe1a.c1358",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3352.566665649414,
-    "y": 358.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3354.566665649414,
+    "y": 309.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "9cc4aaf6.859c",
+    "id": "18fdd62.581202a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3351.566665649414,
-    "y": 412.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3353.566665649414,
+    "y": 363.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c9c4f2a.9305f9"
+        "be5e6e3e.4df078"
       ]
     ]
   },
   {
-    "id": "af10f438.0ffb48",
+    "id": "93300adf.7164e",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4096.566665649414,
-    "y": 366.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 4098.566665649414,
+    "y": 317.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "96cf18f1.1cad5"
+        "4304d9fb.fb05f8"
       ]
     ]
   },
   {
-    "id": "96cf18f1.1cad5",
+    "id": "4304d9fb.fb05f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4273.566543579102,
-    "y": 359.28564453125,
-    "z": "2414cd0b.85dac2",
+    "x": 4275.566543579102,
+    "y": 310.28564453125,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c590372d.ec562",
-        "d84bff3f.0a18c8"
+        "57e483bc.d9d9f4",
+        "be73e257.6c7c7"
       ]
     ]
   },
   {
-    "id": "c9c4f2a.9305f9",
+    "id": "be5e6e3e.4df078",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3515.566665649414,
-    "y": 338.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3517.566665649414,
+    "y": 289.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ec6a7a84.d65408",
-        "7d25e53c.8a468c"
+        "7cff4b8c.a234a4",
+        "44a90848.8f1578"
       ]
     ]
   },
   {
-    "id": "ec6a7a84.d65408",
+    "id": "7cff4b8c.a234a4",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3796.566665649414,
-    "y": 294.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3798.566665649414,
+    "y": 245.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7204f6fc.5ab2"
+        "9f045210.d63268"
       ]
     ]
   },
   {
-    "id": "7204f6fc.5ab2",
+    "id": "9f045210.d63268",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4058.566665649414,
-    "y": 294.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 4060.566665649414,
+    "y": 245.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "af10f438.0ffb48"
+        "93300adf.7164e"
       ]
     ]
   },
   {
-    "id": "c590372d.ec562",
+    "id": "57e483bc.d9d9f4",
     "type": "set",
     "name": "set the 1st network-policy-id",
     "xml": "<set>\n<parameter name='network-policy-id' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 4516.566543579102,
-    "y": 316.28564453125,
-    "z": "2414cd0b.85dac2",
+    "x": 4518.566543579102,
+    "y": 267.28564453125,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d84bff3f.0a18c8",
+    "id": "be73e257.6c7c7",
     "type": "save",
     "name": "get network-policy from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-policy\"\n\tkey='network-policy.network-policy-id = $network-policy-id'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-policy\">",
     "comments": "",
     "outputs": 1,
-    "x": 4505.566543579102,
-    "y": 371.28564453125,
-    "z": "2414cd0b.85dac2",
+    "x": 4507.566543579102,
+    "y": 322.28564453125,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bcf7cb3d.813c08",
-        "241d629e.3937f6",
-        "ab4a02d2.dd63f8"
+        "626c6aaa.7748cc",
+        "19c4911c.086f1f",
+        "8b5b13a5.9b5548"
       ]
     ]
   },
   {
-    "id": "ab4a02d2.dd63f8",
+    "id": "8b5b13a5.9b5548",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4836.566665649414,
-    "y": 279.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 4838.566665649414,
+    "y": 230.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6fe3d858.7ad19"
+        "93609ef4.15443"
       ]
     ]
   },
   {
-    "id": "6fe3d858.7ad19",
+    "id": "93609ef4.15443",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4985.138198852539,
-    "y": 279.57151794433594,
-    "z": "2414cd0b.85dac2",
+    "x": 4987.138198852539,
+    "y": 230.57151794433594,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3cab2fad.4b6d28",
+    "id": "156c88bf.8ed887",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4984.075698852539,
-    "y": 323.71177673339844,
-    "z": "2414cd0b.85dac2",
+    "x": 4986.075698852539,
+    "y": 274.71177673339844,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "241d629e.3937f6",
+    "id": "19c4911c.086f1f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4825.075698852539,
-    "y": 323.71177673339844,
-    "z": "2414cd0b.85dac2",
+    "x": 4827.075698852539,
+    "y": 274.71177673339844,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3cab2fad.4b6d28"
+        "156c88bf.8ed887"
       ]
     ]
   },
   {
-    "id": "bcf7cb3d.813c08",
+    "id": "626c6aaa.7748cc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4832.075698852539,
-    "y": 402.71177673339844,
-    "z": "2414cd0b.85dac2",
+    "x": 4834.075698852539,
+    "y": 353.71177673339844,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c61a87d8.32a11"
+        "b50e966f.55aaa8"
       ]
     ]
   },
   {
-    "id": "c61a87d8.32a11",
+    "id": "b50e966f.55aaa8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4971.075698852539,
-    "y": 402.71177673339844,
-    "z": "2414cd0b.85dac2",
+    "x": 4973.075698852539,
+    "y": 353.71177673339844,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ab565ac9.d97978",
-        "cf0bc947.03a4d"
+        "9ee7b526.b79f4",
+        "7630b329.2d07cc"
       ]
     ]
   },
   {
-    "id": "ab565ac9.d97978",
+    "id": "9ee7b526.b79f4",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='maximum-bandwidth' value=\"`$tmp.aai.network-policy.max-bandwidth`\" />\n<parameter name='route-distinguisher' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5176.566665649414,
-    "y": 400.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 5178.566665649414,
+    "y": 351.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "cf0bc947.03a4d",
+    "id": "7630b329.2d07cc",
     "type": "set",
     "name": "set the max bandwidth",
     "xml": "<set>\n<parameter name='gfp' value='`$maximum-bandwidth /1000 *4 /5 +1`' />\n\n\n\n",
     "comments": "",
-    "x": 5175.566665649414,
-    "y": 446.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 5177.566665649414,
+    "y": 397.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7d25e53c.8a468c",
+    "id": "44a90848.8f1578",
     "type": "for",
     "name": "for each allotted-resource relationship",
     "xml": "<for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3613.566665649414,
-    "y": 410.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3615.566665649414,
+    "y": 361.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "95ed8dc.322967"
+        "62de4c53.8433ac"
       ]
     ]
   },
   {
-    "id": "95ed8dc.322967",
+    "id": "62de4c53.8433ac",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3893.566665649414,
-    "y": 410.2857666015625,
-    "z": "2414cd0b.85dac2",
+    "x": 3895.566665649414,
+    "y": 361.2857666015625,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e85bd9f4.7a28d"
+        "c51917b6.8d7e"
       ]
     ]
   },
   {
-    "id": "e85bd9f4.7a28d",
+    "id": "c51917b6.8d7e",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2264.5667877197266,
-    "y": 841.2858734130859,
-    "z": "2414cd0b.85dac2",
+    "x": 2266.5667877197266,
+    "y": 792.2858734130859,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "53210c7d.ec4f8c"
+        "8a5f2855.b691a8"
       ]
     ]
   },
   {
-    "id": "53210c7d.ec4f8c",
+    "id": "8a5f2855.b691a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2441.566665649414,
-    "y": 834.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 2443.566665649414,
+    "y": 785.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6d10b617.947758",
-        "dd67d7f2.9348e"
+        "19e426d6.5b9f81",
+        "949e5077.38a42"
       ]
     ]
   },
   {
-    "id": "6d10b617.947758",
+    "id": "19e426d6.5b9f81",
     "type": "set",
     "name": "set the current logical-link-name",
     "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
     "comments": "",
-    "x": 2684.566665649414,
-    "y": 791.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 2686.566665649414,
+    "y": 742.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "dd67d7f2.9348e",
+    "id": "949e5077.38a42",
     "type": "save",
     "name": "get logical-link from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\tkey='logical-link.link-name = $logical-link-name'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.logical-link\">",
     "comments": "",
     "outputs": 1,
-    "x": 2673.566665649414,
-    "y": 846.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 2675.566665649414,
+    "y": 797.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7e4e9434.83a0d4",
-        "9cee4acb.003668",
-        "47c07099.1b14a8"
+        "47392897.e24ae8",
+        "e83d2afb.d42318",
+        "ddc13460.7744f"
       ]
     ]
   },
   {
-    "id": "7e4e9434.83a0d4",
+    "id": "47392897.e24ae8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2965.057632446289,
-    "y": 824.8597259521484,
-    "z": "2414cd0b.85dac2",
+    "x": 2967.057632446289,
+    "y": 775.8597259521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bc050886.d2a05"
+        "23c66f69.49ece8"
       ]
     ]
   },
   {
-    "id": "9cee4acb.003668",
+    "id": "e83d2afb.d42318",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2953.566665649414,
-    "y": 869.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 2955.566665649414,
+    "y": 820.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c31212b9.83f5f8"
+        "bb790c96.f0e18"
       ]
     ]
   },
   {
-    "id": "bc050886.d2a05",
+    "id": "23c66f69.49ece8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3113.629165649414,
-    "y": 825.1454925537109,
-    "z": "2414cd0b.85dac2",
+    "x": 3115.629165649414,
+    "y": 776.1454925537109,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c31212b9.83f5f8",
+    "id": "bb790c96.f0e18",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3112.566665649414,
-    "y": 869.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3114.566665649414,
+    "y": 820.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "47c07099.1b14a8",
+    "id": "ddc13460.7744f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2960.566665649414,
-    "y": 948.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 2962.566665649414,
+    "y": 899.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a66b0cd4.00b53"
+        "ce7226da.e17388"
       ]
     ]
   },
   {
-    "id": "a66b0cd4.00b53",
+    "id": "ce7226da.e17388",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3099.566665649414,
-    "y": 948.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3101.566665649414,
+    "y": 899.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "628231dc.fe1998",
-        "40f53355.15a3d4",
-        "6e7728cd.6d606",
-        "591f4762.52be1",
-        "72ab083b.a6528",
-        "be414195.9b77c",
-        "8abc6705.827928",
-        "5f587418.c46734",
-        "da60761c.d9f04",
-        "fd9bd7ab.c92bd8",
-        "b37c5dee.6ca208",
-        "1bc9df09.d67e59",
-        "6e895a21.1d4594",
-        "707a9dca.527c64",
-        "9cc0dadb.189ef",
-        "e9c6a99.90dcbd8",
-        "4a92500a.dfe688",
-        "25934f35.38edd",
-        "77f3463a.2b447"
+        "5b3288fc.6936d8",
+        "9980ae35.23ba18",
+        "85d1e230.49ed",
+        "bf3e43cc.400f1",
+        "1f78077d.63f4c1",
+        "3d294d62.516b2a",
+        "21946f52.f16938",
+        "35531714.c0e89",
+        "63476979.041bd8",
+        "aac95e09.ab90b8",
+        "d36e02ea.349dc",
+        "ad429900.4c716",
+        "456e0186.bd36f8",
+        "6feba0d9.6ac0b",
+        "c1a83ef0.efb158",
+        "8429e2be.11d098",
+        "334ad959.cb8dd6",
+        "d7f7c5fa.4c43d8",
+        "4bfd3207.06ef5c"
       ]
     ]
   },
   {
-    "id": "b0809281.c581e8",
+    "id": "b6d13ba8.f00e28",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3411.566665649414,
-    "y": 498.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 3413.566665649414,
+    "y": 449.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "628231dc.fe1998",
+    "id": "5b3288fc.6936d8",
     "type": "execute",
     "name": "execute UUID generator for otn-tunnel-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3398.5665435791016,
-    "y": 590.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3400.5665435791016,
+    "y": 541.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "707a9dca.527c64",
+    "id": "6feba0d9.6ac0b",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 3355.5665435791016,
-    "y": 635.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3357.5665435791016,
+    "y": 586.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "40f53355.15a3d4",
+    "id": "9980ae35.23ba18",
     "type": "set",
     "name": "set network-route-one",
     "xml": "<set>\n<parameter name='network-route-one' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
     "comments": "",
-    "x": 3330.5665435791016,
-    "y": 698.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3332.5665435791016,
+    "y": 649.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6e7728cd.6d606",
+    "id": "85d1e230.49ed",
     "type": "set",
     "name": "set network-route-two",
     "xml": "<set>\n<parameter name='network-route-two' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
     "comments": "",
-    "x": 3331.5665435791016,
-    "y": 753.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3333.5665435791016,
+    "y": 704.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "591f4762.52be1",
+    "id": "bf3e43cc.400f1",
     "type": "save",
     "name": "get network-route-one from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-one'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-one\">",
     "comments": "",
     "outputs": 1,
-    "x": 3347.5665435791016,
-    "y": 801.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3349.5665435791016,
+    "y": 752.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6d204f19.ffc268",
-        "1689d04b.d0aa98",
-        "34ef36cb.86ebd2"
+        "3a9b85f6.e1582a",
+        "d8d8c3b5.17db1",
+        "94ad08f1.768ca"
       ]
     ]
   },
   {
-    "id": "72ab083b.a6528",
+    "id": "1f78077d.63f4c1",
     "type": "save",
     "name": "get network-route-two from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-two'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-two\">",
     "comments": "",
     "outputs": 1,
-    "x": 3342.566665649414,
-    "y": 868.2856292724609,
-    "z": "2414cd0b.85dac2",
+    "x": 3344.566665649414,
+    "y": 819.2856292724609,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a5360717.582308",
-        "a764163a.8df268",
-        "84d2b76f.25f11"
+        "92b833b8.0a3038",
+        "329b8760.c33988",
+        "4b0996dd.3831d8"
       ]
     ]
   },
   {
-    "id": "6d204f19.ffc268",
+    "id": "3a9b85f6.e1582a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3588.566665649414,
-    "y": 629.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3590.566665649414,
+    "y": 580.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "424235f5.63bc3c"
+        "11bdd863.93783"
       ]
     ]
   },
   {
-    "id": "1689d04b.d0aa98",
+    "id": "d8d8c3b5.17db1",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3584.075698852539,
-    "y": 678.7117767333984,
-    "z": "2414cd0b.85dac2",
+    "x": 3586.075698852539,
+    "y": 629.7117767333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3044babb.9a7f0e"
+        "f63a5915.f8a988"
       ]
     ]
   },
   {
-    "id": "34ef36cb.86ebd2",
+    "id": "94ad08f1.768ca",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3588.075698852539,
-    "y": 731.7117767333984,
-    "z": "2414cd0b.85dac2",
+    "x": 3590.075698852539,
+    "y": 682.7117767333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e8786087.fc4a5"
+        "d3671f93.7e55b8"
       ]
     ]
   },
   {
-    "id": "424235f5.63bc3c",
+    "id": "11bdd863.93783",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3737.138198852539,
-    "y": 628.5715179443359,
-    "z": "2414cd0b.85dac2",
+    "x": 3739.138198852539,
+    "y": 579.5715179443359,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3044babb.9a7f0e",
+    "id": "f63a5915.f8a988",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3727.075698852539,
-    "y": 678.7117767333984,
-    "z": "2414cd0b.85dac2",
+    "x": 3729.075698852539,
+    "y": 629.7117767333984,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "a5360717.582308",
+    "id": "92b833b8.0a3038",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3592.566665649414,
-    "y": 785.2856292724609,
-    "z": "2414cd0b.85dac2",
+    "x": 3594.566665649414,
+    "y": 736.2856292724609,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d832daa6.408e"
+        "675faf6a.ba5628"
       ]
     ]
   },
   {
-    "id": "a764163a.8df268",
+    "id": "329b8760.c33988",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3588.075698852539,
-    "y": 834.7116546630859,
-    "z": "2414cd0b.85dac2",
+    "x": 3590.075698852539,
+    "y": 785.7116546630859,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b0e5525.e8ef43"
+        "f0edefdd.7fbf88"
       ]
     ]
   },
   {
-    "id": "84d2b76f.25f11",
+    "id": "4b0996dd.3831d8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3571.075698852539,
-    "y": 882.7116546630859,
-    "z": "2414cd0b.85dac2",
+    "x": 3573.075698852539,
+    "y": 833.7116546630859,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8b568989.b50038"
+        "d42db304.4749e8"
       ]
     ]
   },
   {
-    "id": "d832daa6.408e",
+    "id": "675faf6a.ba5628",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3741.138198852539,
-    "y": 784.5713958740234,
-    "z": "2414cd0b.85dac2",
+    "x": 3743.138198852539,
+    "y": 735.5713958740234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b0e5525.e8ef43",
+    "id": "f0edefdd.7fbf88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3731.075698852539,
-    "y": 834.7116546630859,
-    "z": "2414cd0b.85dac2",
+    "x": 3733.075698852539,
+    "y": 785.7116546630859,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e8786087.fc4a5",
+    "id": "d3671f93.7e55b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3749.566665649414,
-    "y": 731.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3751.566665649414,
+    "y": 682.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "66efb3a1.9fe73c"
+        "bbaa9d89.298de8"
       ]
     ]
   },
   {
-    "id": "8b568989.b50038",
+    "id": "d42db304.4749e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3724.566665649414,
-    "y": 882.2856292724609,
-    "z": "2414cd0b.85dac2",
+    "x": 3726.566665649414,
+    "y": 833.2856292724609,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "26894e1f.239b9a"
+        "6b53fb28.4b35a4"
       ]
     ]
   },
   {
-    "id": "66efb3a1.9fe73c",
+    "id": "bbaa9d89.298de8",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3921.566665649414,
-    "y": 731.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3923.566665649414,
+    "y": 682.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a22f1b0d.edd33",
-        "ab951b61.cb4cb8",
-        "79c99b01.4060a4"
+        "f5f42bcc.193ca8",
+        "1ca26f5e.24e681",
+        "30c464f6.21891c"
       ]
     ]
   },
   {
-    "id": "26894e1f.239b9a",
+    "id": "6b53fb28.4b35a4",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3916.566665649414,
-    "y": 816.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3918.566665649414,
+    "y": 767.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a2c3d250.fc00d",
-        "aa59cf58.a145d8",
-        "fb5e94da.526bd"
+        "4fb6ec71.0d0c04",
+        "a3acc90b.3d737",
+        "513e1ab4.43497c"
       ]
     ]
   },
   {
-    "id": "a22f1b0d.edd33",
+    "id": "f5f42bcc.193ca8",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4082.566177368164,
-    "y": 467.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 4084.566177368164,
+    "y": 418.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2bc1e64e.d59032"
+        "47912c0e.49beac"
       ]
     ]
   },
   {
-    "id": "ab951b61.cb4cb8",
+    "id": "1ca26f5e.24e681",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4084.566177368164,
-    "y": 521.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4086.566177368164,
+    "y": 472.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "453522b8.5dbac4"
+        "eb199d13.e7038"
       ]
     ]
   },
   {
-    "id": "a2c3d250.fc00d",
+    "id": "4fb6ec71.0d0c04",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4097.565933227539,
-    "y": 689.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4099.565933227539,
+    "y": 640.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f5a4f507.86b44"
+        "ab328b3c.b23248"
       ]
     ]
   },
   {
-    "id": "aa59cf58.a145d8",
+    "id": "a3acc90b.3d737",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4099.565933227539,
-    "y": 743.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4101.565933227539,
+    "y": 694.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8148cd30.75333"
+        "4b33e71e.9ca98"
       ]
     ]
   },
   {
-    "id": "fcdd9b76.8fa5f8",
+    "id": "8d16f671.5b9d4",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4392.566177368164,
-    "y": 419.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 4394.566177368164,
+    "y": 370.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "a44710c1.f4b4c8",
+    "id": "5b74c380.dcc8d4",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4385.566177368164,
-    "y": 517.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4387.566177368164,
+    "y": 468.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5b86250b.1183b4",
+    "id": "142c8c33.b05574",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4461.565933227539,
-    "y": 716.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4463.565933227539,
+    "y": 667.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "154b4953.ab9fcf",
+    "id": "fadd6db5.8e746",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4465.565933227539,
-    "y": 809.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4467.565933227539,
+    "y": 760.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3bb3037a.178754",
+    "id": "bb2a4685.ff5b48",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3543.566665649414,
-    "y": 1232.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3545.566665649414,
+    "y": 1183.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "10e4f75f.914479"
+        "8f64a837.4a5cd8"
       ]
     ]
   },
   {
-    "id": "8000d000.35dfa8",
+    "id": "d520358c.dbd16",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3553.057632446289,
-    "y": 1274.8597869873047,
-    "z": "2414cd0b.85dac2",
+    "x": 3555.057632446289,
+    "y": 1225.8597869873047,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c201e6b8.a3178"
+        "7a345f50.11385"
       ]
     ]
   },
   {
-    "id": "89805004.2ac398",
+    "id": "59ef9877.d005",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3541.566665649414,
-    "y": 1321.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3543.566665649414,
+    "y": 1272.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f43a00.5422b6"
+        "de9d99cd.adc298"
       ]
     ]
   },
   {
-    "id": "7d1a072.a69ea78",
+    "id": "487ac0b4.4acab8",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3243.566665649414,
-    "y": 1194.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3245.566665649414,
+    "y": 1145.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "8abc6705.827928",
+    "id": "21946f52.f16938",
     "type": "save",
     "name": "get p-interface-src from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3286.566665649414,
-    "y": 1259.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3288.566665649414,
+    "y": 1210.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3bb3037a.178754",
-        "8000d000.35dfa8",
-        "89805004.2ac398"
+        "bb2a4685.ff5b48",
+        "d520358c.dbd16",
+        "59ef9877.d005"
       ]
     ]
   },
   {
-    "id": "be414195.9b77c",
+    "id": "3d294d62.516b2a",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3275.566665649414,
-    "y": 1109.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3277.566665649414,
+    "y": 1060.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c53ee6d9.d92aa8",
-        "b00b21f6.61a17"
+        "a73d10a4.af1e28",
+        "79cd7ec1.3557b8"
       ]
     ]
   },
   {
-    "id": "b00b21f6.61a17",
+    "id": "79cd7ec1.3557b8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3498.566665649414,
-    "y": 1095.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3500.566665649414,
+    "y": 1046.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "42f02ac3.9ec4a4"
+        "9aeedd68.ffa8d8"
       ]
     ]
   },
   {
-    "id": "c53ee6d9.d92aa8",
+    "id": "a73d10a4.af1e28",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3500.566665649414,
-    "y": 1128.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3502.566665649414,
+    "y": 1079.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "dd03ebfe.8dbb"
+        "df8ae871.d54098"
       ]
     ]
   },
   {
-    "id": "10e4f75f.914479",
+    "id": "8f64a837.4a5cd8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3716.233169555664,
-    "y": 1231.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3718.233169555664,
+    "y": 1182.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e44801ab.1590c8",
-        "fa4a5699.5e244"
+        "fbb3abd1.b96e9",
+        "abe82eb0.0cab"
       ]
     ]
   },
   {
-    "id": "c201e6b8.a3178",
+    "id": "7a345f50.11385",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3706.6290435791016,
-    "y": 1278.145523071289,
-    "z": "2414cd0b.85dac2",
+    "x": 3708.6290435791016,
+    "y": 1229.145523071289,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "f43a00.5422b6",
+    "id": "de9d99cd.adc298",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3710.566665649414,
-    "y": 1322.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3712.566665649414,
+    "y": 1273.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e44801ab.1590c8",
+    "id": "fbb3abd1.b96e9",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3980.566665649414,
-    "y": 1282.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3982.566665649414,
+    "y": 1233.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "16568eac.f132a9",
-        "e40b1917.8979d8"
+        "e3260a1d.15ae2",
+        "378a4b05.ba3ff4"
       ]
     ]
   },
   {
-    "id": "e40b1917.8979d8",
+    "id": "378a4b05.ba3ff4",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4156.566665649414,
-    "y": 1332.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4158.566665649414,
+    "y": 1283.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ac556463.ec12b8"
+        "7538291f.829488"
       ]
     ]
   },
   {
-    "id": "16568eac.f132a9",
+    "id": "e3260a1d.15ae2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4158.566665649414,
-    "y": 1396.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4160.566665649414,
+    "y": 1347.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "97de31bb.b9a118"
+        "25aab61c.c2472a"
       ]
     ]
   },
   {
-    "id": "97de31bb.b9a118",
+    "id": "25aab61c.c2472a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4320.566665649414,
-    "y": 1392.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4322.566665649414,
+    "y": 1343.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "ac556463.ec12b8",
+    "id": "7538291f.829488",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4321.566665649414,
-    "y": 1329.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4323.566665649414,
+    "y": 1280.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3ab9a413.979aa4",
-        "75cbb82a.35584"
+        "32fabbd2.bab7c4",
+        "d6bf1e67.ba86d8"
       ]
     ]
   },
   {
-    "id": "dd03ebfe.8dbb",
+    "id": "df8ae871.d54098",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3643.566665649414,
-    "y": 1125.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3645.566665649414,
+    "y": 1076.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "42f02ac3.9ec4a4",
+    "id": "9aeedd68.ffa8d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3646.566665649414,
-    "y": 1088.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3648.566665649414,
+    "y": 1039.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6046ec7d.2c3dac",
-        "942aecd4.e6d53"
+        "12c81e56.7fa00a",
+        "87e2ebef.10b6c8"
       ]
     ]
   },
   {
-    "id": "6046ec7d.2c3dac",
+    "id": "12c81e56.7fa00a",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3820.566665649414,
-    "y": 1044.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3822.566665649414,
+    "y": 995.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fa4a5699.5e244",
+    "id": "abe82eb0.0cab",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3692.566665649414,
-    "y": 1413.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3694.566665649414,
+    "y": 1364.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5ae5afb9.f0afa"
+        "67c85268.32dfec"
       ]
     ]
   },
   {
-    "id": "5ae5afb9.f0afa",
+    "id": "67c85268.32dfec",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3973.566665649414,
-    "y": 1408.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3975.566665649414,
+    "y": 1359.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cfb3ee78.011c4"
+        "22f4aa3d.402fe6"
       ]
     ]
   },
   {
-    "id": "cfb3ee78.011c4",
+    "id": "22f4aa3d.402fe6",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4284.852310180664,
-    "y": 1483.1075286865234,
-    "z": "2414cd0b.85dac2",
+    "x": 4286.852310180664,
+    "y": 1434.1075286865234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "658c69d5.ac8cf"
+        "4ffa151f.c35edc"
       ]
     ]
   },
   {
-    "id": "942aecd4.e6d53",
+    "id": "87e2ebef.10b6c8",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3835.566665649414,
-    "y": 1155.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3837.566665649414,
+    "y": 1106.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7f200322.76207c",
-        "80c4e01c.7c07b8",
-        "71ab8804.94dd5"
+        "46c6e0d9.d87168",
+        "d98bf1e8.c353c8",
+        "76b578a.409ac88"
       ]
     ]
   },
   {
-    "id": "7f200322.76207c",
+    "id": "46c6e0d9.d87168",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4031.0667877197266,
-    "y": 1107.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4033.0667877197266,
+    "y": 1058.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a99ba4fa.4ed1e8"
+        "7281b691.ff84e"
       ]
     ]
   },
   {
-    "id": "80c4e01c.7c07b8",
+    "id": "d98bf1e8.c353c8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4023.0667877197266,
-    "y": 1162.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4025.0667877197266,
+    "y": 1113.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "848293a0.71bc7"
+        "552f36f.a1294c8"
       ]
     ]
   },
   {
-    "id": "71ab8804.94dd5",
+    "id": "76b578a.409ac88",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4028.0667877197266,
-    "y": 1219.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4030.0667877197266,
+    "y": 1170.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f97b023f.267278"
+        "2fdf3cab.68e914"
       ]
     ]
   },
   {
-    "id": "f97b023f.267278",
+    "id": "2fdf3cab.68e914",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4180.066787719727,
-    "y": 1220.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4182.066787719727,
+    "y": 1171.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "848293a0.71bc7",
+    "id": "552f36f.a1294c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4191.066787719727,
-    "y": 1165.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4193.066787719727,
+    "y": 1116.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "a99ba4fa.4ed1e8",
+    "id": "7281b691.ff84e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4175.449111938477,
-    "y": 1104.941421508789,
-    "z": "2414cd0b.85dac2",
+    "x": 4177.449111938477,
+    "y": 1055.941421508789,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b504251b.7f7448"
+        "b1882a27.4b4ab8"
       ]
     ]
   },
   {
-    "id": "b504251b.7f7448",
+    "id": "b1882a27.4b4ab8",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4398.566909790039,
-    "y": 1243.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4400.566909790039,
+    "y": 1194.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "52eb8aa1.8ff274"
+        "491c14e2.9cc81c"
       ]
     ]
   },
   {
-    "id": "75cbb82a.35584",
+    "id": "d6bf1e67.ba86d8",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
     "comments": "",
-    "x": 4491.566665649414,
-    "y": 1287.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4493.566665649414,
+    "y": 1238.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3ab9a413.979aa4",
+    "id": "32fabbd2.bab7c4",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
     "comments": "",
-    "x": 4492.566665649414,
-    "y": 1395.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4494.566665649414,
+    "y": 1346.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b9ee3c01.a1e29",
+    "id": "8e04ebf5.eee41",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4493.566665649414,
-    "y": 1344.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4495.566665649414,
+    "y": 1295.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "658c69d5.ac8cf",
+    "id": "4ffa151f.c35edc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4491.683853149414,
-    "y": 1483.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 4493.683853149414,
+    "y": 1434.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "aadf2b0a.6db3d",
-        "61bc8b6e.22a73c",
-        "30cdefe5.b26318"
+        "c59a3a79.308e08",
+        "e4841ff6.3e7e08",
+        "5d11c4a6.df68cc"
       ]
     ]
   },
   {
-    "id": "aadf2b0a.6db3d",
+    "id": "c59a3a79.308e08",
     "type": "set",
     "name": "set source ttp-id",
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4706.683853149414,
-    "y": 1445.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 4708.683853149414,
+    "y": 1396.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "61bc8b6e.22a73c",
+    "id": "e4841ff6.3e7e08",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4703.683853149414,
-    "y": 1484.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 4705.683853149414,
+    "y": 1435.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fd577e5f.db1ba"
+        "766fb473.2a452c"
       ]
     ]
   },
   {
-    "id": "30cdefe5.b26318",
+    "id": "5d11c4a6.df68cc",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4659.183853149414,
-    "y": 1526.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 4661.183853149414,
+    "y": 1477.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fd577e5f.db1ba",
+    "id": "766fb473.2a452c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4884.183853149414,
-    "y": 1483.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 4886.183853149414,
+    "y": 1434.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fa2d5efd.88ba08"
+        "91f25d9a.835d38"
       ]
     ]
   },
   {
-    "id": "ded6fafe.4074f8",
+    "id": "cce9c2da.fea888",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4796.566909790039,
-    "y": 1247.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4798.566909790039,
+    "y": 1198.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "afabdc9f.6d39f8"
+        "7f9c2923.089b6"
       ]
     ]
   },
   {
-    "id": "afabdc9f.6d39f8",
+    "id": "7f9c2923.089b6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4973.566909790039,
-    "y": 1239.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4975.566909790039,
+    "y": 1190.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d564a26c.9a8558",
-        "3ff41e19.f0e01a"
+        "713d1c50.32082c",
+        "1fe6b234.c7fd7e"
       ]
     ]
   },
   {
-    "id": "52eb8aa1.8ff274",
+    "id": "491c14e2.9cc81c",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4593.566909790039,
-    "y": 1243.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4595.566909790039,
+    "y": 1194.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ded6fafe.4074f8",
-        "f56e57c9.6506a8"
+        "cce9c2da.fea888",
+        "181e2b72.5adced"
       ]
     ]
   },
   {
-    "id": "f56e57c9.6506a8",
+    "id": "181e2b72.5adced",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4662.566909790039,
-    "y": 1317.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4664.566909790039,
+    "y": 1268.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f21dcf5d.336178"
+        "5ef7391a.b132a8"
       ]
     ]
   },
   {
-    "id": "f21dcf5d.336178",
+    "id": "5ef7391a.b132a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4858.566909790039,
-    "y": 1317.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4860.566909790039,
+    "y": 1268.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "132ca45a.eb5e34"
+        "1d2757a1.42bf3"
       ]
     ]
   },
   {
-    "id": "fa2d5efd.88ba08",
+    "id": "91f25d9a.835d38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5042.183853149414,
-    "y": 1483.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 5044.183853149414,
+    "y": 1434.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b951f264.559ce"
+        "83fb3b54.d5c3d"
       ]
     ]
   },
   {
-    "id": "b951f264.559ce",
+    "id": "83fb3b54.d5c3d",
     "type": "set",
     "name": "set source tunnel tp ip",
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5249.183853149414,
-    "y": 1483.6260833740234,
-    "z": "2414cd0b.85dac2",
+    "x": 5251.183853149414,
+    "y": 1434.6260833740234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3ff41e19.f0e01a",
+    "id": "1fe6b234.c7fd7e",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5198.566909790039,
-    "y": 1235.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5200.566909790039,
+    "y": 1186.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a40a7be5.2be498",
-        "d6b97145.3bf148",
-        "ea85892.20b4178"
+        "f445a11a.71bc2",
+        "1ca051d1.62d8c6",
+        "b5779702.ec152"
       ]
     ]
   },
   {
-    "id": "d564a26c.9a8558",
+    "id": "713d1c50.32082c",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainA id",
     "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5228.566909790039,
-    "y": 1183.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5230.566909790039,
+    "y": 1134.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "a40a7be5.2be498",
+    "id": "f445a11a.71bc2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5408.566909790039,
-    "y": 1226.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5410.566909790039,
+    "y": 1177.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d68ba68a.be89b8"
+        "97cfd71c.893b9"
       ]
     ]
   },
   {
-    "id": "d6b97145.3bf148",
+    "id": "1ca051d1.62d8c6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5400.566909790039,
-    "y": 1281.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5402.566909790039,
+    "y": 1232.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7c894f76.5a638"
+        "f71936fa.5c6ed8"
       ]
     ]
   },
   {
-    "id": "ea85892.20b4178",
+    "id": "b5779702.ec152",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5405.566909790039,
-    "y": 1338.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5407.566909790039,
+    "y": 1289.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d37deda4.10b24"
+        "2f95de59.c21562"
       ]
     ]
   },
   {
-    "id": "d37deda4.10b24",
+    "id": "2f95de59.c21562",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5557.566909790039,
-    "y": 1339.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5559.566909790039,
+    "y": 1290.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7c894f76.5a638",
+    "id": "f71936fa.5c6ed8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5568.566909790039,
-    "y": 1284.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5570.566909790039,
+    "y": 1235.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d68ba68a.be89b8",
+    "id": "97cfd71c.893b9",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5552.949234008789,
-    "y": 1223.941421508789,
-    "z": "2414cd0b.85dac2",
+    "x": 5554.949234008789,
+    "y": 1174.941421508789,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ff0f9afc.082318"
+        "3725abc9.8fe81c"
       ]
     ]
   },
   {
-    "id": "132ca45a.eb5e34",
+    "id": "1d2757a1.42bf3",
     "type": "set",
     "name": "set domainA ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5121.566909790039,
-    "y": 1320.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5123.566909790039,
+    "y": 1271.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "ff0f9afc.082318",
+    "id": "3725abc9.8fe81c",
     "type": "set",
     "name": "set controller domainA data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5739.566909790039,
-    "y": 1220.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5741.566909790039,
+    "y": 1171.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c100f1cf.959b9",
+    "id": "67aa7525.7bae1c",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4380.566177368164,
-    "y": 455.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 4382.566177368164,
+    "y": 406.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "476d7cc2.2b9e3c",
+    "id": "18cc69a3.9aa206",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4371.566177368164,
-    "y": 553.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4373.566177368164,
+    "y": 504.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2bc1e64e.d59032",
+    "id": "47912c0e.49beac",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4205.566177368164,
-    "y": 461.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 4207.566177368164,
+    "y": 412.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fcdd9b76.8fa5f8",
-        "c100f1cf.959b9"
+        "8d16f671.5b9d4",
+        "67aa7525.7bae1c"
       ]
     ]
   },
   {
-    "id": "453522b8.5dbac4",
+    "id": "eb199d13.e7038",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4211.566177368164,
-    "y": 525.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4213.566177368164,
+    "y": 476.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a44710c1.f4b4c8",
-        "476d7cc2.2b9e3c"
+        "5b74c380.dcc8d4",
+        "18cc69a3.9aa206"
       ]
     ]
   },
   {
-    "id": "f5a4f507.86b44",
+    "id": "ab328b3c.b23248",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4225.565933227539,
-    "y": 689.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4227.565933227539,
+    "y": 640.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5b86250b.1183b4",
-        "ee4f808.01bcf8"
+        "142c8c33.b05574",
+        "53d3049.af6e8fc"
       ]
     ]
   },
   {
-    "id": "8148cd30.75333",
+    "id": "4b33e71e.9ca98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4228.565933227539,
-    "y": 742.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4230.565933227539,
+    "y": 693.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "154b4953.ab9fcf",
-        "f5de4dab.b0e37"
+        "fadd6db5.8e746",
+        "2cd10454.6fd4ec"
       ]
     ]
   },
   {
-    "id": "ee4f808.01bcf8",
+    "id": "53d3049.af6e8fc",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4447.565933227539,
-    "y": 756.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4449.565933227539,
+    "y": 707.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "f5de4dab.b0e37",
+    "id": "2cd10454.6fd4ec",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4450.565933227539,
-    "y": 847.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4452.565933227539,
+    "y": 798.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fba24b6a.44ade",
+    "id": "4fd998b7.acd798",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3606.566665649414,
-    "y": 1793.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3608.566665649414,
+    "y": 1744.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6ab1e648.0c2108",
-        "e98d774e.c7639"
+        "de0c38ee.f76ef8",
+        "25935580.28bbea"
       ]
     ]
   },
   {
-    "id": "e055a781.15033",
+    "id": "170f6ee1.76ff39",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3433.900161743164,
-    "y": 1794.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3435.900161743164,
+    "y": 1745.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fba24b6a.44ade"
+        "4fd998b7.acd798"
       ]
     ]
   },
   {
-    "id": "33450ab2.d72e86",
+    "id": "6aad81bd.cb4268",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3443.391128540039,
-    "y": 1836.8597869873047,
-    "z": "2414cd0b.85dac2",
+    "x": 3445.391128540039,
+    "y": 1787.8597869873047,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "279c15e9.8df2d2"
+        "54bd0023.9501c8"
       ]
     ]
   },
   {
-    "id": "14684e53.bc0682",
+    "id": "e02aca99.393958",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3431.900161743164,
-    "y": 1883.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3433.900161743164,
+    "y": 1834.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7cf32ea0.24f2e8"
+        "20e4fbbc.46dd64"
       ]
     ]
   },
   {
-    "id": "279c15e9.8df2d2",
+    "id": "54bd0023.9501c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3596.9625396728516,
-    "y": 1840.145523071289,
-    "z": "2414cd0b.85dac2",
+    "x": 3598.9625396728516,
+    "y": 1791.145523071289,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7cf32ea0.24f2e8",
+    "id": "20e4fbbc.46dd64",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3600.900161743164,
-    "y": 1884.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3602.900161743164,
+    "y": 1835.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6ab1e648.0c2108",
+    "id": "de0c38ee.f76ef8",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3892.900161743164,
-    "y": 1797.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3894.900161743164,
+    "y": 1748.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "daabf3e5.97bed8",
-        "1e7b26c7.e7a121"
+        "36c6c2be.762bee",
+        "9dad2b66.a09d3"
       ]
     ]
   },
   {
-    "id": "1e7b26c7.e7a121",
+    "id": "9dad2b66.a09d3",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4115.900161743164,
-    "y": 1752.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4117.900161743164,
+    "y": 1703.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "acfb9237.1cd6c8"
+        "36a66ce5.93da74"
       ]
     ]
   },
   {
-    "id": "daabf3e5.97bed8",
+    "id": "36c6c2be.762bee",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4117.900161743164,
-    "y": 1816.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4119.900161743164,
+    "y": 1767.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2bdd8bed.c7bcd4"
+        "4c6cb6f3.89667"
       ]
     ]
   },
   {
-    "id": "2bdd8bed.c7bcd4",
+    "id": "4c6cb6f3.89667",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4276.900161743164,
-    "y": 1835.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4278.900161743164,
+    "y": 1786.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "acfb9237.1cd6c8",
+    "id": "36a66ce5.93da74",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4280.900161743164,
-    "y": 1749.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4282.900161743164,
+    "y": 1700.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "26977aa5.25dd2e",
-        "72fafff.27e4d"
+        "5a5e37bd.3076e",
+        "6e346008.c0c8d"
       ]
     ]
   },
   {
-    "id": "da60761c.d9f04",
+    "id": "63476979.041bd8",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3205.900161743164,
-    "y": 1829.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3207.900161743164,
+    "y": 1780.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e055a781.15033",
-        "33450ab2.d72e86",
-        "14684e53.bc0682"
+        "170f6ee1.76ff39",
+        "6aad81bd.cb4268",
+        "e02aca99.393958"
       ]
     ]
   },
   {
-    "id": "4b7ae9f1.8aec68",
+    "id": "dbdf27a7.fc5e4",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3166.900161743164,
-    "y": 1773.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3168.900161743164,
+    "y": 1724.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5f587418.c46734",
+    "id": "35531714.c0e89",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3218.900161743164,
-    "y": 1575.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3220.900161743164,
+    "y": 1526.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f9cab6f8.ebc12",
-        "1ca010c1.fd862f"
+        "1026191c.92617f",
+        "af47cd19.1e85a"
       ]
     ]
   },
   {
-    "id": "1ca010c1.fd862f",
+    "id": "af47cd19.1e85a",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3441.900161743164,
-    "y": 1561.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3443.900161743164,
+    "y": 1512.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c0d41dc2.2e9ce8"
+        "79bebb4c.23a30c"
       ]
     ]
   },
   {
-    "id": "f9cab6f8.ebc12",
+    "id": "1026191c.92617f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3443.900161743164,
-    "y": 1594.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3445.900161743164,
+    "y": 1545.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3ccca278.68559e"
+        "f83e847f.4ec13"
       ]
     ]
   },
   {
-    "id": "3ccca278.68559e",
+    "id": "f83e847f.4ec13",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 3586.900161743164,
-    "y": 1591.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3588.900161743164,
+    "y": 1542.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c0d41dc2.2e9ce8",
+    "id": "79bebb4c.23a30c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3589.900161743164,
-    "y": 1554.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3591.900161743164,
+    "y": 1505.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c99a0449.e56c2",
-        "7083ce51.93a92"
+        "3fb5f800.679e",
+        "4b785447.3b4bdc"
       ]
     ]
   },
   {
-    "id": "c99a0449.e56c2",
+    "id": "3fb5f800.679e",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3783.900161743164,
-    "y": 1557.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3785.900161743164,
+    "y": 1508.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e98d774e.c7639",
+    "id": "25935580.28bbea",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3836.900161743164,
-    "y": 1916.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3838.900161743164,
+    "y": 1867.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fd084df8.e98c58"
+        "e6fe79a3.e9ea5"
       ]
     ]
   },
   {
-    "id": "fd084df8.e98c58",
+    "id": "e6fe79a3.e9ea5",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.900161743164,
-    "y": 1916.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4044.900161743164,
+    "y": 1867.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6cb7488a.a222b"
+        "122e4fb.7ae86b"
       ]
     ]
   },
   {
-    "id": "6cb7488a.a222b",
+    "id": "122e4fb.7ae86b",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4260.185806274414,
-    "y": 1915.1075286865234,
-    "z": "2414cd0b.85dac2",
+    "x": 4262.185806274414,
+    "y": 1866.1075286865234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "350b3e58.c792ea"
+        "837cca48.ec2188"
       ]
     ]
   },
   {
-    "id": "7083ce51.93a92",
+    "id": "4b785447.3b4bdc",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3805.900161743164,
-    "y": 1625.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3807.900161743164,
+    "y": 1576.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5d1bde7f.a2e988",
-        "568d456e.886424",
-        "4559cac2.72065c"
+        "c81ddea8.acca2",
+        "677cee1e.585708",
+        "5b3f6a5a.a599cc"
       ]
     ]
   },
   {
-    "id": "5d1bde7f.a2e988",
+    "id": "c81ddea8.acca2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4001.4002838134766,
-    "y": 1577.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4003.4002838134766,
+    "y": 1528.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7231501f.55645"
+        "4e15930.1f2346c"
       ]
     ]
   },
   {
-    "id": "568d456e.886424",
+    "id": "677cee1e.585708",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3993.4002838134766,
-    "y": 1632.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3995.4002838134766,
+    "y": 1583.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1fe97a53.6160f6"
+        "77c7f195.03bd88"
       ]
     ]
   },
   {
-    "id": "4559cac2.72065c",
+    "id": "5b3f6a5a.a599cc",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3998.4002838134766,
-    "y": 1689.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4000.4002838134766,
+    "y": 1640.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c16f7b5a.3ed008"
+        "44cfcdb.eef3bb4"
       ]
     ]
   },
   {
-    "id": "c16f7b5a.3ed008",
+    "id": "44cfcdb.eef3bb4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4150.400283813477,
-    "y": 1690.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4152.400283813477,
+    "y": 1641.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1fe97a53.6160f6",
+    "id": "77c7f195.03bd88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4161.400283813477,
-    "y": 1635.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4163.400283813477,
+    "y": 1586.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7231501f.55645",
+    "id": "4e15930.1f2346c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4145.782608032227,
-    "y": 1574.9415435791016,
-    "z": "2414cd0b.85dac2",
+    "x": 4147.782608032227,
+    "y": 1525.9415435791016,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c3bee3fa.d3a9e"
+        "3bb66f6b.2423e"
       ]
     ]
   },
   {
-    "id": "26977aa5.25dd2e",
+    "id": "5a5e37bd.3076e",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
     "comments": "",
-    "x": 4450.900161743164,
-    "y": 1710.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4452.900161743164,
+    "y": 1661.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "72fafff.27e4d",
+    "id": "6e346008.c0c8d",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
     "comments": "",
-    "x": 4451.900161743164,
-    "y": 1815.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4453.900161743164,
+    "y": 1766.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3c2418c7.4572c8",
+    "id": "f684cc96.93a36",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4446.900161743164,
-    "y": 1764.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4448.900161743164,
+    "y": 1715.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "350b3e58.c792ea",
+    "id": "837cca48.ec2188",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4467.017349243164,
-    "y": 1904.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 4469.017349243164,
+    "y": 1855.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5da8c5d3.b9f55c",
-        "1242abaf.e56384",
-        "ed6b22ec.e3cd3"
+        "4370bd5a.9f5934",
+        "1bda5a20.b54946",
+        "7ecac2a.84cd6bc"
       ]
     ]
   },
   {
-    "id": "5da8c5d3.b9f55c",
+    "id": "4370bd5a.9f5934",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4682.017349243164,
-    "y": 1866.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 4684.017349243164,
+    "y": 1817.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1242abaf.e56384",
+    "id": "1bda5a20.b54946",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4679.017349243164,
-    "y": 1905.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 4681.017349243164,
+    "y": 1856.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "44aa2b45.5157d4"
+        "e1da362d.0aaf38"
       ]
     ]
   },
   {
-    "id": "ed6b22ec.e3cd3",
+    "id": "7ecac2a.84cd6bc",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4634.517349243164,
-    "y": 1947.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 4636.517349243164,
+    "y": 1898.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "44aa2b45.5157d4",
+    "id": "e1da362d.0aaf38",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4859.517349243164,
-    "y": 1904.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 4861.517349243164,
+    "y": 1855.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cd8ad202.8d323"
+        "4842e5f.6c9081c"
       ]
     ]
   },
   {
-    "id": "cd8ad202.8d323",
+    "id": "4842e5f.6c9081c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5017.517349243164,
-    "y": 1904.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 5019.517349243164,
+    "y": 1855.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3d8ba8c1.7feef8"
+        "d2ac7d5.8c2918"
       ]
     ]
   },
   {
-    "id": "3d8ba8c1.7feef8",
+    "id": "d2ac7d5.8c2918",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5224.517349243164,
-    "y": 1904.626205444336,
-    "z": "2414cd0b.85dac2",
+    "x": 5226.517349243164,
+    "y": 1855.626205444336,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "64248373.c0f1e4",
+    "id": "d8873c57.456df",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4727.900161743164,
-    "y": 1593.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4729.900161743164,
+    "y": 1544.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ebf5d941.b9751"
+        "bf2c165b.0d277"
       ]
     ]
   },
   {
-    "id": "ebf5d941.b9751",
+    "id": "bf2c165b.0d277",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4904.900161743164,
-    "y": 1585.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4906.900161743164,
+    "y": 1536.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5f21b6d8.97a7a8",
-        "a66d8cdf.7774c"
+        "7f001b92.6c2014",
+        "47ea9781.67241"
       ]
     ]
   },
   {
-    "id": "c3bee3fa.d3a9e",
+    "id": "3bb66f6b.2423e",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4329.900161743164,
-    "y": 1589.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4331.900161743164,
+    "y": 1540.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "768c4246.3384b4"
+        "c9ef5f55.13159"
       ]
     ]
   },
   {
-    "id": "768c4246.3384b4",
+    "id": "c9ef5f55.13159",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4524.900161743164,
-    "y": 1589.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4526.900161743164,
+    "y": 1540.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "64248373.c0f1e4",
-        "d4d1382b.4bf1a8"
+        "d8873c57.456df",
+        "e212cfa3.d9b94"
       ]
     ]
   },
   {
-    "id": "a66d8cdf.7774c",
+    "id": "47ea9781.67241",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5112.900161743164,
-    "y": 1592.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5114.900161743164,
+    "y": 1543.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "798943c1.0b7f24",
-        "dbd1300d.b2d4d8",
-        "c22228e5.5f04a"
+        "46f5dd83.067904",
+        "97b572f2.cabba",
+        "90953f01.0039c"
       ]
     ]
   },
   {
-    "id": "4ab59831.7b5d28",
+    "id": "666bc3f3.f942ac",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4906.900161743164,
-    "y": 1658.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4908.900161743164,
+    "y": 1609.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b63665cd.e9bca8"
+        "af972400.78ec68"
       ]
     ]
   },
   {
-    "id": "d4d1382b.4bf1a8",
+    "id": "e212cfa3.d9b94",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4729.900161743164,
-    "y": 1666.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4731.900161743164,
+    "y": 1617.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4ab59831.7b5d28"
+        "666bc3f3.f942ac"
       ]
     ]
   },
   {
-    "id": "5f21b6d8.97a7a8",
+    "id": "7f001b92.6c2014",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainB id",
     "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5142.900161743164,
-    "y": 1540.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5144.900161743164,
+    "y": 1491.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b63665cd.e9bca8",
+    "id": "af972400.78ec68",
     "type": "set",
     "name": "set domainB ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5088.900161743164,
-    "y": 1722.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5090.900161743164,
+    "y": 1673.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "798943c1.0b7f24",
+    "id": "46f5dd83.067904",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5322.900161743164,
-    "y": 1583.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5324.900161743164,
+    "y": 1534.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4408e043.c54b2"
+        "9ccd655c.46849"
       ]
     ]
   },
   {
-    "id": "dbd1300d.b2d4d8",
+    "id": "97b572f2.cabba",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5314.900161743164,
-    "y": 1638.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5316.900161743164,
+    "y": 1589.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "90ad08da.8c4d18"
+        "4f6c8e9e.87ef88"
       ]
     ]
   },
   {
-    "id": "c22228e5.5f04a",
+    "id": "90953f01.0039c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5319.900161743164,
-    "y": 1695.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5321.900161743164,
+    "y": 1646.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "de4c591d.7f2f48"
+        "5fa05e22.fdafa8"
       ]
     ]
   },
   {
-    "id": "de4c591d.7f2f48",
+    "id": "5fa05e22.fdafa8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5471.900161743164,
-    "y": 1696.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5473.900161743164,
+    "y": 1647.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "90ad08da.8c4d18",
+    "id": "4f6c8e9e.87ef88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5482.900161743164,
-    "y": 1641.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5484.900161743164,
+    "y": 1592.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4408e043.c54b2",
+    "id": "9ccd655c.46849",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5467.282485961914,
-    "y": 1580.9415435791016,
-    "z": "2414cd0b.85dac2",
+    "x": 5469.282485961914,
+    "y": 1531.9415435791016,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2133344e.893bec"
+        "9bc41fad.100098"
       ]
     ]
   },
   {
-    "id": "2133344e.893bec",
+    "id": "9bc41fad.100098",
     "type": "set",
     "name": "set controller domainB data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5681.900161743164,
-    "y": 1577.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5683.900161743164,
+    "y": 1528.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fd9bd7ab.c92bd8",
+    "id": "aac95e09.ab90b8",
     "type": "set",
     "name": "set LEAF stuff",
     "xml": "<set>\n<parameter name='tmp.LEAF.pnf-name-long' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n\n<!--<parameter name='tmp.LEAF.pnf-name-short' value=\"`$param-prefix-domainA-pnfName[8]`\" />-->\n<parameter name='tmp.LEAF.pnf-name-short' value=\"`$tmp.src.pnf-name`\" />\n\n<parameter name='tmp.LEAF.uni-p-interface-long' value=\"`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
     "comments": "",
-    "x": 3270.566665649414,
-    "y": 1399.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3272.566665649414,
+    "y": 1350.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6a9b0f1.984457",
+    "id": "c158f2ac.9bf138",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4547.566177368164,
-    "y": 539.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4549.566177368164,
+    "y": 490.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2f61d3b4.f418bc",
+    "id": "1c9be409.368d34",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4615.565933227539,
-    "y": 741.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4617.565933227539,
+    "y": 692.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b37c5dee.6ca208",
+    "id": "d36e02ea.349dc",
     "type": "set",
     "name": "set ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.ROOT.pnf-name-long' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.ROOT.pnf-name-short' value=\"`$tmp.dst.pnf-name`\" />\n\n<parameter name='tmp.ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
     "comments": "",
-    "x": 3166.566665649414,
-    "y": 1960.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3168.566665649414,
+    "y": 1911.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1bc9df09.d67e59",
+    "id": "ad429900.4c716",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-logic",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3428.566665649414,
-    "y": 2873.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3430.566665649414,
+    "y": 2824.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e895a21.1d4594",
+    "id": "456e0186.bd36f8",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3305.566665649414,
-    "y": 2983.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3307.566665649414,
+    "y": 2934.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cef17f20.edf7e8",
-        "6dda4254.968224"
+        "1a6260f2.b38e77",
+        "151ade37.c8cbba"
       ]
     ]
   },
   {
-    "id": "cef17f20.edf7e8",
+    "id": "1a6260f2.b38e77",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3489.566665649414,
-    "y": 2962.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3491.566665649414,
+    "y": 2913.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d8fe6f8d.d7595"
+        "ba23a41e.50085"
       ]
     ]
   },
   {
-    "id": "6dda4254.968224",
+    "id": "151ade37.c8cbba",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3025.566665649414,
-    "y": 4548.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3027.566665649414,
+    "y": 4499.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d77e7161.5348c8"
+        "f3de805.eee03"
       ]
     ]
   },
   {
-    "id": "300daee4.3b0352",
+    "id": "e429a394.1622b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3536.566665649414,
-    "y": 5133.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3538.566665649414,
+    "y": 5084.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "318b9beb.21378c",
-        "1992e083.76e587",
-        "aaed5b46.7e8eb",
-        "c7aee100.ec3998",
-        "b969bbc7.e53528",
-        "54f08fa.71777f"
+        "ee345eb7.dd48b",
+        "78110e1d.34a828",
+        "399c8052.14794",
+        "7855b68f.e847e",
+        "7a90992b.99ef7",
+        "2987a87c.d9af38"
       ]
     ]
   },
   {
-    "id": "d8fe6f8d.d7595",
+    "id": "ba23a41e.50085",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6202.566665649414,
-    "y": 1782.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6204.566665649414,
+    "y": 1733.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1a1f2023.50c9f8",
-        "e814ac2.6d99cd",
-        "27a9213f.e489d6",
-        "904795f3.631878",
-        "c284bcb.2b7c44",
-        "1d8604a2.381ee3",
-        "5946c797.be74d",
-        "a66844b6.e099c",
-        "37c7ecba.efaa4c",
-        "72cc1cfb.a77694",
-        "1e88893b.a079df",
-        "f9c59fe9.ee503",
-        "4573e73f.58afa8",
-        "c53261d3.0987a8",
-        "f109d109.e8eb",
-        "4c9e5bd3.54a49c",
-        "e1cb1e55.b0357",
-        "e177a7a3.e48c7",
-        "6fa889cc.c9cce",
-        "c91e3a5e.c6511",
-        "162cf27b.802c36",
-        "5a5c80f6.6318b8"
+        "18ef4940.2cc947",
+        "10bd34b9.d586b3",
+        "c874118.0dda17",
+        "e01a8555.4482f8",
+        "48a8a99c.f1479",
+        "65f7f754.67c0f8",
+        "a9eb431c.c27b3",
+        "9d81d981.8859c8",
+        "9ef240b6.5338",
+        "56d51e0c.3fbb48",
+        "f1e4ada5.0d8a28",
+        "9aa0ecc9.b21a38",
+        "1d111c3e.37b394",
+        "b8b78e91.784a68",
+        "43c8a40f.539994",
+        "b8201609.6ece6",
+        "6d3e15fd.90249c",
+        "7bb73f8a.b1ab48",
+        "c917b2c2.68a8d",
+        "f8b29c6c.19b2e8",
+        "374c089f.fa2538",
+        "c9cb4066.4924"
       ]
     ]
   },
   {
-    "id": "37c7ecba.efaa4c",
+    "id": "9ef240b6.5338",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainB",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6573.566665649414,
-    "y": 1705.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6575.566665649414,
+    "y": 1656.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1a1f2023.50c9f8",
+    "id": "18ef4940.2cc947",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6527.566665649414,
-    "y": 1803.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6529.566665649414,
+    "y": 1754.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e814ac2.6d99cd",
+    "id": "10bd34b9.d586b3",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6663.566665649414,
-    "y": 1850.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6665.566665649414,
+    "y": 1801.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "2ad7ea9.f129796",
+    "id": "577f8c89.2e206c",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6494.566665649414,
-    "y": 1654.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6496.566665649414,
+    "y": 1605.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "942a9804.0c79c",
+    "id": "267ba619.c9af8a",
     "type": "comment",
     "name": "create middle man connectivity and ...",
     "info": "1- create middle man connectivity\n2- create relation with all connectivities\n   in the path\n3- put srcTtp (+dstTtp) somewhere in the\n   vpn-binding -> this is for later on to find\n   which OTN tunnel's bandwidth has to be increased.\n5- create UNIs\n4- create relationship to UNIs",
     "comments": "",
-    "x": 6990.566665649414,
-    "y": 2390.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6992.566665649414,
+    "y": 2341.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "27a9213f.e489d6",
+    "id": "c874118.0dda17",
     "type": "execute",
     "name": "execute UUID generator for connectivity middle-man",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-middle-man-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6554.566665649414,
-    "y": 2429.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6556.566665649414,
+    "y": 2380.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "904795f3.631878",
+    "id": "e01a8555.4482f8",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6502.566665649414,
-    "y": 2480.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6504.566665649414,
+    "y": 2431.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c284bcb.2b7c44",
+    "id": "48a8a99c.f1479",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-middle-man-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-middle-man-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6638.566665649414,
-    "y": 2527.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6640.566665649414,
+    "y": 2478.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "887b2dbb.8eb65",
+    "id": "52e24832.034e88",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6495.566665649414,
-    "y": 2389.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6497.566665649414,
+    "y": 2340.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "8252fd61.bfc208",
+    "id": "debe9e97.cd8f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6925.566665649414,
-    "y": 2586.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6927.566665649414,
+    "y": 2537.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1d8604a2.381ee3",
+    "id": "65f7f754.67c0f8",
     "type": "save",
     "name": "get middle-man connectivity from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $prop.connectivity-middle-man-uuid\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"middle-man-conn\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 6516.566665649414,
-    "y": 2633.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6518.566665649414,
+    "y": 2584.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "68a11957.d1e54",
-        "98ce32f4.8ab98",
-        "ceda9f28.da773"
+        "85091e88.c72c7",
+        "7dba75fe.6c5c54",
+        "3df3f46e.6f2edc"
       ]
     ]
   },
   {
-    "id": "68a11957.d1e54",
+    "id": "85091e88.c72c7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6763.566665649414,
-    "y": 2587.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6765.566665649414,
+    "y": 2538.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8252fd61.bfc208"
+        "debe9e97.cd8f"
       ]
     ]
   },
   {
-    "id": "98ce32f4.8ab98",
+    "id": "7dba75fe.6c5c54",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6764.057632446289,
-    "y": 2632.8597869873047,
-    "z": "2414cd0b.85dac2",
+    "x": 6766.057632446289,
+    "y": 2583.8597869873047,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9afbaf66.fb0d68"
+        "3c115d7c.ba4cb2"
       ]
     ]
   },
   {
-    "id": "ceda9f28.da773",
+    "id": "3df3f46e.6f2edc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6761.566665649414,
-    "y": 2676.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6763.566665649414,
+    "y": 2627.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3e284ec9.e9b522"
+        "3193d0af.6d5de8"
       ]
     ]
   },
   {
-    "id": "9afbaf66.fb0d68",
+    "id": "3c115d7c.ba4cb2",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 6926.629043579102,
-    "y": 2633.145523071289,
-    "z": "2414cd0b.85dac2",
+    "x": 6928.629043579102,
+    "y": 2584.145523071289,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3e284ec9.e9b522",
+    "id": "3193d0af.6d5de8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 6930.566665649414,
-    "y": 2677.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6932.566665649414,
+    "y": 2628.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "f109d109.e8eb",
+    "id": "43c8a40f.539994",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6570.566665649414,
-    "y": 2949.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6572.566665649414,
+    "y": 2900.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c9e5bd3.54a49c",
+    "id": "b8201609.6ece6",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6573.566665649414,
-    "y": 2994.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6575.566665649414,
+    "y": 2945.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e177a7a3.e48c7",
+    "id": "7bb73f8a.b1ab48",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6565.566665649414,
-    "y": 2748.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6567.566665649414,
+    "y": 2699.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "6fa889cc.c9cce",
+    "id": "c917b2c2.68a8d",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6567.566665649414,
-    "y": 2795.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6569.566665649414,
+    "y": 2746.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5dea74d5.1b4aa4",
+    "id": "8bd704e.d0521f8",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6486.566665649414,
-    "y": 2902.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6488.566665649414,
+    "y": 2853.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3dd8554.be5c5aa",
+    "id": "e06e4d85.94c0f8",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4486.566909790039,
-    "y": 5295.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4488.566909790039,
+    "y": 5246.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "318b9beb.21378c",
+    "id": "ee345eb7.dd48b",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3751.566665649414,
-    "y": 5114.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3753.566665649414,
+    "y": 5065.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "37cde52f.e57ab2",
-        "655366f1.7fdc7"
+        "c561431f.f6e0f",
+        "49468e15.59ced"
       ]
     ]
   },
   {
-    "id": "655366f1.7fdc7",
+    "id": "49468e15.59ced",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3923.566665649414,
-    "y": 5111.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3925.566665649414,
+    "y": 5062.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "828433f7.b11a2"
+        "997265fa.7d7f1"
       ]
     ]
   },
   {
-    "id": "37cde52f.e57ab2",
+    "id": "c561431f.f6e0f",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3875.566665649414,
-    "y": 5958.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3877.566665649414,
+    "y": 5909.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e6235853.96452"
+        "e1ebd454.f4cdb8"
       ]
     ]
   },
   {
-    "id": "4ddc3818.58ee88",
+    "id": "604349fc.e0a658",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3936.566665649414,
-    "y": 5081.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3938.566665649414,
+    "y": 5032.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bc0b6e25.72063",
+    "id": "8edd5f5.78488a",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3946.566665649414,
-    "y": 5916.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3948.566665649414,
+    "y": 5867.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5946c797.be74d",
+    "id": "a9eb431c.c27b3",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6572.566665649414,
-    "y": 3128.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6574.566665649414,
+    "y": 3079.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "828433f7.b11a2",
+    "id": "997265fa.7d7f1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4099.566665649414,
-    "y": 5113.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4101.566665649414,
+    "y": 5064.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ec3ed36f.33f8e",
-        "2da9765.20a818a",
-        "583fc579.afbe3c",
-        "92f3ada6.6626b",
-        "d0f2c5e0.41cd1",
-        "80308a85.281f5",
-        "3dd8554.be5c5aa",
-        "b727caf7.37ccd",
-        "9d76b5ce.608a08"
+        "bcf60ed5.161338",
+        "8a063d24.55e818",
+        "27d5e3fa.d1fc64",
+        "eb431097.375ee8",
+        "146ee230.44ecc6",
+        "a86e4db4.94773",
+        "e06e4d85.94c0f8",
+        "b311bb82.023748",
+        "f2f4b1c2.9aee8"
       ]
     ]
   },
   {
-    "id": "730f8b58.f71bb4",
+    "id": "5b2e4a79.26fcd4",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5543.566421508789,
-    "y": 5038.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5545.566421508789,
+    "y": 4989.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "ec3ed36f.33f8e",
+    "id": "bcf60ed5.161338",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4345.566909790039,
-    "y": 5794.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4347.566909790039,
+    "y": 5745.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a66844b6.e099c",
+    "id": "9d81d981.8859c8",
     "type": "save",
     "name": "save connectivityB relationship to UNI-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6579.566665649414,
-    "y": 2044.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6581.566665649414,
+    "y": 1995.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "723517cc.862aa8",
+    "id": "2ed6ffae.15a9",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid=tmp.ROOT.uni-p-interface-long",
     "xml": "<set>\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />\n",
     "comments": "",
-    "x": 6629.566665649414,
-    "y": 1747.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6631.566665649414,
+    "y": 1698.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "72cc1cfb.a77694",
+    "id": "56d51e0c.3fbb48",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6576.566665649414,
-    "y": 1335.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6578.566665649414,
+    "y": 1286.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e88893b.a079df",
+    "id": "f1e4ada5.0d8a28",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\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`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\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`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6524.566665649414,
-    "y": 1383.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6526.566665649414,
+    "y": 1334.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f9c59fe9.ee503",
+    "id": "9aa0ecc9.b21a38",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6652.566665649414,
-    "y": 1430.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6654.566665649414,
+    "y": 1381.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5271815d.5f082",
+    "id": "59c3b9a9.bee328",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6489.566665649414,
-    "y": 1293.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6491.566665649414,
+    "y": 1244.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4573e73f.58afa8",
+    "id": "1d111c3e.37b394",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 6486.566665649414,
-    "y": 1521.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6488.566665649414,
+    "y": 1472.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c53261d3.0987a8",
+    "id": "b8b78e91.784a68",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6579.566665649414,
-    "y": 1574.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6581.566665649414,
+    "y": 1525.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "61b6e37e.ff4414",
+    "id": "b1590465.c06e9",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6470.566665649414,
-    "y": 1477.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6472.566665649414,
+    "y": 1428.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b4d51e76.274848",
+    "id": "4fd8fae5.4af44c",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6476.566665649414,
-    "y": 1927.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6478.566665649414,
+    "y": 1878.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "92f3ada6.6626b",
+    "id": "eb431097.375ee8",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4412.566421508789,
-    "y": 5046.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4414.566421508789,
+    "y": 4997.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "cb8799d5.d6fa78",
+    "id": "111c6f80.d662f1",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4396.566421508789,
-    "y": 5002.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4398.566421508789,
+    "y": 4953.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "baf89c3.a308c6",
+    "id": "f6ae128e.43e818",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5143.566421508789,
-    "y": 5033.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5145.566421508789,
+    "y": 4984.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6ac119cc.845568",
+    "id": "273e73f0.d7fa54",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainA",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5230.566421508789,
-    "y": 5075.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5232.566421508789,
+    "y": 5026.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "be6577a4.990a1",
+    "id": "78d97bc5.d96984",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\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`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\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`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5178.566421508789,
-    "y": 5123.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5180.566421508789,
+    "y": 5074.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "ed1c0a9d.7a148",
+    "id": "464f510d.72c448",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5306.566421508789,
-    "y": 5170.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5308.566421508789,
+    "y": 5121.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "80308a85.281f5",
+    "id": "a86e4db4.94773",
     "type": "save",
     "name": "save connectivityA relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4474.566909790039,
-    "y": 5337.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4476.566909790039,
+    "y": 5288.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "43c35fa0.488f88",
+    "id": "da1f3bba.7aa878",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4457.566909790039,
-    "y": 5399.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4459.566909790039,
+    "y": 5350.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2da9765.20a818a",
+    "id": "8a063d24.55e818",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4568.566909790039,
-    "y": 5441.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4570.566909790039,
+    "y": 5392.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f1717ef6.023738",
+    "id": "cfd66aba.0bb4b",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5025.566421508789,
-    "y": 5612.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5027.566421508789,
+    "y": 5563.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "99843e38.83dd4",
+    "id": "d34f3733.82b438",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 4335.566421508789,
-    "y": 6310.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4337.566421508789,
+    "y": 6261.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3c45c16a.44e536",
+    "id": "a5e6b4f4.57a38",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4268.566421508789,
-    "y": 6264.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4270.566421508789,
+    "y": 6215.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "ff6ff2f.c8fff1",
+    "id": "ea2fb779.5cdf1",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4217.566421508789,
-    "y": 6215.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4219.566421508789,
+    "y": 6166.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1431401.84d5c4",
+    "id": "cea8b041.47c29",
     "type": "save",
     "name": "save the-connectivity relationship to UNI-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5000.566665649414,
-    "y": 6421.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5002.566665649414,
+    "y": 6372.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "583fc579.afbe3c",
+    "id": "27d5e3fa.d1fc64",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4395.566909790039,
-    "y": 5498.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4397.566909790039,
+    "y": 5449.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "57091b18.0fc4d4",
-        "6835f627.925db8"
+        "76f33e89.9589e",
+        "2dcff9f1.2ed2e6"
       ]
     ]
   },
   {
-    "id": "57091b18.0fc4d4",
+    "id": "76f33e89.9589e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4606.566909790039,
-    "y": 5498.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4608.566909790039,
+    "y": 5449.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "328e270e.4a59d8"
+        "53185310.1e3aac"
       ]
     ]
   },
   {
-    "id": "328e270e.4a59d8",
+    "id": "53185310.1e3aac",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4762.566909790039,
-    "y": 5494.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4764.566909790039,
+    "y": 5445.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f1717ef6.023738",
-        "d4dec9b1.cf9de8",
-        "6712b992.157"
+        "cfd66aba.0bb4b",
+        "d5527664.91c39",
+        "7871c32f.9d91cc"
       ]
     ]
   },
   {
-    "id": "6835f627.925db8",
+    "id": "2dcff9f1.2ed2e6",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4602.566909790039,
-    "y": 5546.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4604.566909790039,
+    "y": 5497.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bc00cffe.21aeb8"
+        "74066864.f6923"
       ]
     ]
   },
   {
-    "id": "bc00cffe.21aeb8",
+    "id": "74066864.f6923",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 4750.566909790039,
-    "y": 5541.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4752.566909790039,
+    "y": 5492.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "684d6198.d250c8",
+    "id": "3e678579.1103ca",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-LEAF, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 5267.566421508789,
-    "y": 5241.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5269.566421508789,
+    "y": 5192.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "ab78fc6f.8a0998",
+    "id": "1902c403.6fb814",
     "type": "execute",
     "name": "execute UUID generator for ethernet-service-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2434.566665649414,
-    "y": 200.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2436.566665649414,
+    "y": 151.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1e0dcc9a.c7d15b",
+    "id": "b21e9d77.e0db",
     "type": "set",
     "name": "set new ethernet-service-name",
     "xml": "<set>\n<!--<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-name`\" />-->\n<parameter name='prop.ethernet-service-name' value=\"`$tmp.aai.logical-link.link-id`\" />\n\n\n",
     "comments": "",
-    "x": 2368.566665649414,
-    "y": 236.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2370.566665649414,
+    "y": 187.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7f3a574e.dafd48",
+    "id": "9b031e24.c71f38",
     "type": "comment",
     "name": "The following two nodes are to make sure all connectivities for an E-Tree have same etht-srv-name",
     "info": "",
     "comments": "",
-    "x": 2553.566665649414,
-    "y": 163.28575134277344,
-    "z": "2414cd0b.85dac2",
+    "x": 2555.566665649414,
+    "y": 114.28575134277344,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "131a46fd.415b69",
+    "id": "2b3dd3ef.75d514",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 4302.566421508789,
-    "y": 6376.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4304.566421508789,
+    "y": 6327.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bd42462a.156a88",
+    "id": "44cea2e2.e10b04",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4435.566421508789,
-    "y": 6424.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4437.566421508789,
+    "y": 6375.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "28f03df7.2bcada",
+    "id": "32da350f.e91202",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4254.566421508789,
-    "y": 6482.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4256.566421508789,
+    "y": 6433.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "81c1148f.4cc3d8",
-        "1bb40996.4838a6"
+        "5b9298a4.1ed118",
+        "7163c900.606df8"
       ]
     ]
   },
   {
-    "id": "81c1148f.4cc3d8",
+    "id": "5b9298a4.1ed118",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4447.566421508789,
-    "y": 6483.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4449.566421508789,
+    "y": 6434.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5632e5bc.008fd4"
+        "5b9bdf25.e9536"
       ]
     ]
   },
   {
-    "id": "5632e5bc.008fd4",
+    "id": "5b9bdf25.e9536",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Connectivity should have been created' />\n",
     "comments": "",
-    "x": 4603.566421508789,
-    "y": 6480.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4605.566421508789,
+    "y": 6431.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1bb40996.4838a6",
+    "id": "7163c900.606df8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4451.566421508789,
-    "y": 6527.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4453.566421508789,
+    "y": 6478.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2400d348.1454e4"
+        "1fa38b13.5c2175"
       ]
     ]
   },
   {
-    "id": "2400d348.1454e4",
+    "id": "1fa38b13.5c2175",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4590.566421508789,
-    "y": 6522.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4592.566421508789,
+    "y": 6473.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1431401.84d5c4",
-        "cfbbd347.67bf98",
-        "4f0e8fb5.8e798",
-        "e1e51f2c.3838b",
-        "38f3723d.fc373e",
-        "556b17f.21493e8",
-        "72f64404.57e414",
-        "4c65c6ba.14ece",
-        "72bff017.143e6",
-        "debab96e.421598",
-        "e11abdc.71e19c",
-        "6a0cb0e4.5bec78",
-        "811fcd41.48413"
+        "cea8b041.47c29",
+        "ab589b66.44dca",
+        "bec4134.89e1d7",
+        "93569c40.48d5d8",
+        "21f4d700.883112",
+        "10882f4c.ff2cd1",
+        "2d523fb9.b5b8c8",
+        "54f95ba1.fd5b14",
+        "b2a13863.b94908",
+        "8b96c2fb.4933a8",
+        "ac6c48.3b961bb8",
+        "f3a1ad9d.6eb4a8",
+        "f140933b.8acec"
       ]
     ]
   },
   {
-    "id": "72f64404.57e414",
+    "id": "2d523fb9.b5b8c8",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4787.566421508789,
-    "y": 7201.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4789.566421508789,
+    "y": 7152.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f17dbf11.a99f78",
-        "840879a8.da7ac",
-        "ff33cdc7.aad138"
+        "85a32ae2.fd7ca",
+        "2bd9412f.d2a736",
+        "14d3449f.8afb4b"
       ]
     ]
   },
   {
-    "id": "f17dbf11.a99f78",
+    "id": "85a32ae2.fd7ca",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4982.566635131836,
-    "y": 7177.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4984.566635131836,
+    "y": 7128.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9d7f152f.0d13"
+        "802d4aff.ed19c"
       ]
     ]
   },
   {
-    "id": "840879a8.da7ac",
+    "id": "2bd9412f.d2a736",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4975.057601928711,
-    "y": 7213.859756469727,
-    "z": "2414cd0b.85dac2",
+    "x": 4977.057601928711,
+    "y": 7164.859756469727,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "722c6254.b53dd4"
+        "1d4f1ec2.11c199"
       ]
     ]
   },
   {
-    "id": "ff33cdc7.aad138",
+    "id": "14d3449f.8afb4b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4972.566635131836,
-    "y": 7257.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4974.566635131836,
+    "y": 7208.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2dfdab6e.e9f304"
+        "1bbce323.6599c5"
       ]
     ]
   },
   {
-    "id": "9d7f152f.0d13",
+    "id": "802d4aff.ed19c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5154.566635131836,
-    "y": 7175.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5156.566635131836,
+    "y": 7126.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f4de49b1.9e78c8"
+        "dd0eed5a.ced22"
       ]
     ]
   },
   {
-    "id": "722c6254.b53dd4",
+    "id": "1d4f1ec2.11c199",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5137.629013061523,
-    "y": 7214.145492553711,
-    "z": "2414cd0b.85dac2",
+    "x": 5139.629013061523,
+    "y": 7165.145492553711,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2dfdab6e.e9f304",
+    "id": "1bbce323.6599c5",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5139.566635131836,
-    "y": 7256.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5141.566635131836,
+    "y": 7207.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "f4de49b1.9e78c8",
+    "id": "dd0eed5a.ced22",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5395.566421508789,
-    "y": 7209.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5397.566421508789,
+    "y": 7160.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c3d85a4.1f615a8"
+        "315a5202.03b08e"
       ]
     ]
   },
   {
-    "id": "c3d85a4.1f615a8",
+    "id": "315a5202.03b08e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5632.566421508789,
-    "y": 7205.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5634.566421508789,
+    "y": 7156.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f610bb15.d46c3"
+        "ffe78e55.58a2"
       ]
     ]
   },
   {
-    "id": "3165802b.467878",
+    "id": "406bc3a2.6f4c5c",
     "type": "switchNode",
     "name": "switch vpnuuid is for this slice",
     "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5899.566421508789,
-    "y": 7171.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5901.566421508789,
+    "y": 7122.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fa2a5991.1b9ca",
-        "bf56d405.cdd208"
+        "efd6821.7606e8",
+        "dc64cef5.f4e71"
       ]
     ]
   },
   {
-    "id": "fa2a5991.1b9ca",
+    "id": "efd6821.7606e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6080.566421508789,
-    "y": 7197.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 6082.566421508789,
+    "y": 7148.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f610bb15.d46c3"
+        "ffe78e55.58a2"
       ]
     ]
   },
   {
-    "id": "bf56d405.cdd208",
+    "id": "dc64cef5.f4e71",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6079.566421508789,
-    "y": 7150.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 6081.566421508789,
+    "y": 7101.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f610bb15.d46c3",
+    "id": "ffe78e55.58a2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4596.566635131836,
-    "y": 7345.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4598.566635131836,
+    "y": 7296.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c29275cf.22abd8"
+        "b29b6e84.3ec808"
       ]
     ]
   },
   {
-    "id": "424309da.5dae7",
+    "id": "aa51daf8.235328",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 5672.566421508789,
-    "y": 7377.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5674.566421508789,
+    "y": 7328.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "37faaddd.0a2fe2",
+    "id": "3e921b26.a61a44",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4885.566635131836,
-    "y": 7113.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4887.566635131836,
+    "y": 7064.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "556b17f.21493e8",
+    "id": "10882f4c.ff2cd1",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4769.566421508789,
-    "y": 6997.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4771.566421508789,
+    "y": 6948.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bbd937d0.174fa8",
+    "id": "649ceff4.e9cc5",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5114.566421508789,
-    "y": 6828.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5116.566421508789,
+    "y": 6779.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "74d7f148.c83f28"
+        "b90f13f5.a31078"
       ]
     ]
   },
   {
-    "id": "74d7f148.c83f28",
+    "id": "b90f13f5.a31078",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5334.566421508789,
-    "y": 6834.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5336.566421508789,
+    "y": 6785.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e33037d6.9207c"
+        "4aedc9d4.9239e8"
       ]
     ]
   },
   {
-    "id": "e33037d6.9207c",
+    "id": "4aedc9d4.9239e8",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5519.566421508789,
-    "y": 6833.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5521.566421508789,
+    "y": 6784.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ff68f8c5.ac398"
+        "8b4beaf0.bd49c8"
       ]
     ]
   },
   {
-    "id": "ff68f8c5.ac398",
+    "id": "8b4beaf0.bd49c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5711.566421508789,
-    "y": 6836.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5713.566421508789,
+    "y": 6787.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3023756a.3df6f2"
+        "67fe9740.178f68"
       ]
     ]
   },
   {
-    "id": "3023756a.3df6f2",
+    "id": "67fe9740.178f68",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5920.566421508789,
-    "y": 6834.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5922.566421508789,
+    "y": 6785.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4c65c6ba.14ece",
+    "id": "54f95ba1.fd5b14",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4821.566421508789,
-    "y": 6822.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4823.566421508789,
+    "y": 6773.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bbd937d0.174fa8"
+        "649ceff4.e9cc5"
       ]
     ]
   },
   {
-    "id": "4f0e8fb5.8e798",
+    "id": "bec4134.89e1d7",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4829.566421508789,
-    "y": 6715.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4831.566421508789,
+    "y": 6666.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "689e25a7.4ec344",
-        "fb96069a.99a898",
-        "67a95680.dd059"
+        "88715119.2c7c68",
+        "d632295f.b3442",
+        "973f1048.6edbb"
       ]
     ]
   },
   {
-    "id": "689e25a7.4ec344",
+    "id": "88715119.2c7c68",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5065.566421508789,
-    "y": 6698.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5067.566421508789,
+    "y": 6649.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "fb96069a.99a898",
+    "id": "d632295f.b3442",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5062.566421508789,
-    "y": 6739.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5064.566421508789,
+    "y": 6690.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "67a95680.dd059",
+    "id": "973f1048.6edbb",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5076.566421508789,
-    "y": 6779.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5078.566421508789,
+    "y": 6730.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e1e51f2c.3838b",
+    "id": "93569c40.48d5d8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4765.566421508789,
-    "y": 6874.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4767.566421508789,
+    "y": 6825.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "38f3723d.fc373e",
+    "id": "21f4d700.883112",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4773.566421508789,
-    "y": 6932.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4775.566421508789,
+    "y": 6883.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "cfbbd347.67bf98",
+    "id": "ab589b66.44dca",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4778.566421508789,
-    "y": 6672.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4780.566421508789,
+    "y": 6623.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b798d2b8.423e4",
+    "id": "9ae90ae.274be78",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4893.566421508789,
-    "y": 6624.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4895.566421508789,
+    "y": 6575.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c29275cf.22abd8",
+    "id": "b29b6e84.3ec808",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4886.566635131836,
-    "y": 7340.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4888.566635131836,
+    "y": 7291.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "48d3293f.1d09c8",
-        "2e7c42e6.c2eade"
+        "ce3c2be3.503e38",
+        "f854c5fa.9550e8"
       ]
     ]
   },
   {
-    "id": "48d3293f.1d09c8",
+    "id": "ce3c2be3.503e38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5142.566635131836,
-    "y": 7312.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5144.566635131836,
+    "y": 7263.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fc947668.8a9d8"
+        "eb8749e3.22de7"
       ]
     ]
   },
   {
-    "id": "2e7c42e6.c2eade",
+    "id": "f854c5fa.9550e8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5142.566635131836,
-    "y": 7361.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5144.566635131836,
+    "y": 7312.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "86241828.71762",
+    "id": "268cfed4.3ed072",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5408.566635131836,
-    "y": 7353.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5410.566635131836,
+    "y": 7304.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "78fc3e29.1eba58",
-        "424309da.5dae7",
-        "7b230c0f.716d14"
+        "acce766e.9c38a",
+        "aa51daf8.235328",
+        "f459d871.345a18"
       ]
     ]
   },
   {
-    "id": "ec22280e.4e15f",
+    "id": "2f1cf9f0.50adbe",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 5800.566421508789,
-    "y": 7431.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5802.566421508789,
+    "y": 7382.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7b230c0f.716d14",
+    "id": "f459d871.345a18",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />\n\n<parameter name='operational-status' value='Modified' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5770.566421508789,
-    "y": 7491.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5772.566421508789,
+    "y": 7442.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "78fc3e29.1eba58",
+    "id": "acce766e.9c38a",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5677.566421508789,
-    "y": 7319.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5679.566421508789,
+    "y": 7270.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e6235853.96452",
+    "id": "e1ebd454.f4cdb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4027.566665649414,
-    "y": 5957.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4029.566665649414,
+    "y": 5908.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3c45c16a.44e536",
-        "131a46fd.415b69",
-        "bd42462a.156a88",
-        "28f03df7.2bcada",
-        "99843e38.83dd4"
+        "a5e6b4f4.57a38",
+        "2b3dd3ef.75d514",
+        "44cea2e2.e10b04",
+        "32da350f.e91202",
+        "d34f3733.82b438"
       ]
     ]
   },
   {
-    "id": "825ad15b.e200f",
+    "id": "6a9fab50.2b8dbc",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4770.566421508789,
-    "y": 6772.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4772.566421508789,
+    "y": 6723.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "72bff017.143e6",
+    "id": "b2a13863.b94908",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4893.566665649414,
-    "y": 6502.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4895.566665649414,
+    "y": 6453.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "218269db.41502e",
+    "id": "eedbe7ee.2e17",
     "type": "comment",
     "name": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "info": "Update the existing eth-srv by adding the new LEAF UNI into its list of endpoints",
     "comments": "",
-    "x": 5030.566665649414,
-    "y": 6452.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5032.566665649414,
+    "y": 6403.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e1cb1e55.b0357",
+    "id": "6d3e15fd.90249c",
     "type": "save",
     "name": "save ROOT UNI in AAI",
     "xml": "<save 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='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6492.566665649414,
-    "y": 1986.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6494.566665649414,
+    "y": 1937.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d01f4492.e07e28",
+    "id": "74dbf9c4.a2cac",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3758.566665649414,
-    "y": 1380.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3760.566665649414,
+    "y": 1331.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "27d91ce4.eff5e4",
+    "id": "691659c.355b428",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3896.566665649414,
-    "y": 1868.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3898.566665649414,
+    "y": 1819.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bcdaf6d5.61613",
+    "id": "b49b44ed.34c0f",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6453.566665649414,
-    "y": 2698.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 6455.566665649414,
+    "y": 2649.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1992e083.76e587",
+    "id": "78110e1d.34a828",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3745.566665649414,
-    "y": 4974.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3747.566665649414,
+    "y": 4925.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "aaed5b46.7e8eb",
+    "id": "399c8052.14794",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3878.566665649414,
-    "y": 5022.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3880.566665649414,
+    "y": 4973.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d0f2c5e0.41cd1",
+    "id": "146ee230.44ecc6",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4423.566421508789,
-    "y": 5102.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4425.566421508789,
+    "y": 5053.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c51b9855.45ff88",
-        "4079da5.fe1c9a4"
+        "939f1799.36d378",
+        "a646c5c3.cf3a8"
       ]
     ]
   },
   {
-    "id": "c51b9855.45ff88",
+    "id": "939f1799.36d378",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4616.566421508789,
-    "y": 5103.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4618.566421508789,
+    "y": 5054.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "69766fb9.fbb74"
+        "bace55c5.99f12"
       ]
     ]
   },
   {
-    "id": "4079da5.fe1c9a4",
+    "id": "a646c5c3.cf3a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620.566421508789,
-    "y": 5147.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4622.566421508789,
+    "y": 5098.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1a522b67.5bcd1d"
+        "4039180c.15981"
       ]
     ]
   },
   {
-    "id": "1a522b67.5bcd1d",
+    "id": "4039180c.15981",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4759.566421508789,
-    "y": 5142.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4761.566421508789,
+    "y": 5093.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e1cf34bb.9518e",
-        "6d11acf9.928044",
-        "613e9b77.298d54"
+        "7ef13e15.cc2028",
+        "de57bd6c.da094",
+        "2e1e6c02.39beec"
       ]
     ]
   },
   {
-    "id": "69766fb9.fbb74",
+    "id": "bace55c5.99f12",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4759.566421508789,
-    "y": 5099.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4761.566421508789,
+    "y": 5050.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6ac119cc.845568",
-        "be6577a4.990a1",
-        "ed1c0a9d.7a148",
-        "684d6198.d250c8"
+        "273e73f0.d7fa54",
+        "78d97bc5.d96984",
+        "464f510d.72c448",
+        "3e678579.1103ca"
       ]
     ]
   },
   {
-    "id": "e1cf34bb.9518e",
+    "id": "7ef13e15.cc2028",
     "type": "set",
     "name": "set prop.connectivity-domainA-uuid",
     "xml": "<set>\n<parameter name='uuid.connectivity-domainA-uuid' value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5153.566421508789,
-    "y": 5393.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5155.566421508789,
+    "y": 5344.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "63360813.209ad8",
+    "id": "e4f0f550.01eee8",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5160.566421508789,
-    "y": 5347.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5162.566421508789,
+    "y": 5298.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "debab96e.421598",
+    "id": "8b96c2fb.4933a8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4950.566635131836,
-    "y": 7062.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4952.566635131836,
+    "y": 7013.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "6d11acf9.928044",
+    "id": "de57bd6c.da094",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5272.566421508789,
-    "y": 5446.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5274.566421508789,
+    "y": 5397.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d4dec9b1.cf9de8",
+    "id": "d5527664.91c39",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5154.566421508789,
-    "y": 5664.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 5156.566421508789,
+    "y": 5615.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "dbce4650.6b5848",
+    "id": "9e36b46b.83aaa",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3700.566665649414,
-    "y": 4423.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3702.566665649414,
+    "y": 4374.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "edcfccb6.0b10e8",
+    "id": "dba3b4ab.601e58",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4034.566665649414,
-    "y": 4606.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4036.566665649414,
+    "y": 4557.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c7aee100.ec3998",
+    "id": "7855b68f.e847e",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3646.566665649414,
-    "y": 4473.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3648.566665649414,
+    "y": 4424.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1339ee7e.d32932",
-        "f08ce63a.aff18",
-        "a999ee96.e09558"
+        "27b19c0a.0b96bc",
+        "3755d72e.8ad5d8",
+        "e7a32b57.4d11"
       ]
     ]
   },
   {
-    "id": "f08ce63a.aff18",
+    "id": "3755d72e.8ad5d8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3874.057632446289,
-    "y": 4445.859725952148,
-    "z": "2414cd0b.85dac2",
+    "x": 3876.057632446289,
+    "y": 4396.859725952148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1c6fd05d.948d88"
+        "8db24f9.ca62db"
       ]
     ]
   },
   {
-    "id": "a999ee96.e09558",
+    "id": "e7a32b57.4d11",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3869.566665649414,
-    "y": 4490.285690307617,
-    "z": "2414cd0b.85dac2",
+    "x": 3871.566665649414,
+    "y": 4441.285690307617,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1f86883b.9ad4a8"
+        "c7878375.542c6"
       ]
     ]
   },
   {
-    "id": "1c6fd05d.948d88",
+    "id": "8db24f9.ca62db",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4036.629165649414,
-    "y": 4445.145431518555,
-    "z": "2414cd0b.85dac2",
+    "x": 4038.629165649414,
+    "y": 4396.145431518555,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1f86883b.9ad4a8",
+    "id": "c7878375.542c6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4037.566665649414,
-    "y": 4490.285690307617,
-    "z": "2414cd0b.85dac2",
+    "x": 4039.566665649414,
+    "y": 4441.285690307617,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1213361d.be12aa",
+    "id": "32e0d279.a6eca6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3822.566665649414,
-    "y": 4563.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3824.566665649414,
+    "y": 4514.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fbd53f4.dd8234",
-        "edcfccb6.0b10e8"
+        "a8a8e968.d6c638",
+        "dba3b4ab.601e58"
       ]
     ]
   },
   {
-    "id": "1339ee7e.d32932",
+    "id": "27b19c0a.0b96bc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3653.566665649414,
-    "y": 4563.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3655.566665649414,
+    "y": 4514.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1213361d.be12aa"
+        "32e0d279.a6eca6"
       ]
     ]
   },
   {
-    "id": "fbd53f4.dd8234",
+    "id": "a8a8e968.d6c638",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4011.566665649414,
-    "y": 4555.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 4013.566665649414,
+    "y": 4506.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b969bbc7.e53528",
+    "id": "7a90992b.99ef7",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $middle-man-conn.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$middle-man-conn.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 3853.566665649414,
-    "y": 4850.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3855.566665649414,
+    "y": 4801.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a6ad0dd0.a6fcc8",
+    "id": "258c7b31.2a3584",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3636.566665649414,
-    "y": 2933.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3638.566665649414,
+    "y": 2884.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d73dbef9.62ae5",
+    "id": "5517fa40.8d63c4",
     "type": "comment",
     "name": "We are doing modify and middle man exists, check if LEAF UNI already exists in AAI or not. If yes, consider the possible bw change. If it does not, then it is a new link needs to be added",
     "info": "",
     "comments": "",
-    "x": 2841.566665649414,
-    "y": 4495.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 2843.566665649414,
+    "y": 4446.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "38b3d969.be8c96",
+    "id": "872d6ff1.04a5b8",
     "type": "exists",
     "name": "exists LEAF UNI",
     "xml": "<exists plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3264.566665649414,
-    "y": 4768.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3266.566665649414,
+    "y": 4719.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4afa5be1.7f901c",
-        "3036b28a.042a4e"
+        "99cdf1e3.76daa8",
+        "8ce192f6.43321"
       ]
     ]
   },
   {
-    "id": "d77e7161.5348c8",
+    "id": "f3de805.eee03",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3096.566665649414,
-    "y": 4771.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3098.566665649414,
+    "y": 4722.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "38b3d969.be8c96"
+        "872d6ff1.04a5b8"
       ]
     ]
   },
   {
-    "id": "3036b28a.042a4e",
+    "id": "8ce192f6.43321",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3427.566665649414,
-    "y": 4787.285751342773,
-    "z": "2414cd0b.85dac2",
+    "x": 3429.566665649414,
+    "y": 4738.285751342773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "300daee4.3b0352"
+        "e429a394.1622b"
       ]
     ]
   },
   {
-    "id": "4afa5be1.7f901c",
+    "id": "99cdf1e3.76daa8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3463.566665649414,
-    "y": 3394.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3465.566665649414,
+    "y": 3345.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "afe0131e.843c9"
+        "45ad7f75.acf2c"
       ]
     ]
   },
   {
-    "id": "40724b83.4d51bc",
+    "id": "894a7fb9.0e7198",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3812.566665649414,
-    "y": 3236.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3814.566665649414,
+    "y": 3187.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "822b2d43.9a91a",
-        "33ca94.ea4af56c"
+        "fc9baa20.3cffe",
+        "9e39c7e6.dd8a38"
       ]
     ]
   },
   {
-    "id": "822b2d43.9a91a",
+    "id": "fc9baa20.3cffe",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4017.566665649414,
-    "y": 3232.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4019.566665649414,
+    "y": 3183.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "33ca94.ea4af56c",
+    "id": "9e39c7e6.dd8a38",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4019.566665649414,
-    "y": 3282.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4021.566665649414,
+    "y": 3233.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1d0af02e.93b4f"
+        "d198772b.5f2b"
       ]
     ]
   },
   {
-    "id": "1d0af02e.93b4f",
+    "id": "d198772b.5f2b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4175.566665649414,
-    "y": 3288.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4177.566665649414,
+    "y": 3239.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "523d0093.735cb",
-        "21f4d27b.d11a96",
-        "1c5f100e.a5d978",
-        "2d4de683.3992d2"
+        "23f5cc1d.41fbe4",
+        "fed6a907.2b3e28",
+        "fdf1da6c.032aa",
+        "51c677f3.cc82f"
       ]
     ]
   },
   {
-    "id": "523d0093.735cb",
+    "id": "23f5cc1d.41fbe4",
     "type": "set",
     "name": "set bwModified",
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 4401.566909790039,
-    "y": 3029.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4403.566909790039,
+    "y": 2980.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fce8efa1.5f12e",
+    "id": "84e42d5e.8f28b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4900.566390991211,
-    "y": 4326.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4902.566390991211,
+    "y": 4277.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e3611e5a.49f6f",
-        "7474f571.02042c"
+        "7591914.05111f",
+        "4f3fe980.0cfee8"
       ]
     ]
   },
   {
-    "id": "7474f571.02042c",
+    "id": "4f3fe980.0cfee8",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5102.566146850586,
-    "y": 4293.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 5104.566146850586,
+    "y": 4244.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c554c9c8.b91c38",
+    "id": "7cabc91f.298798",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4786.566635131836,
-    "y": 4503.28547668457,
-    "z": "2414cd0b.85dac2",
+    "x": 4788.566635131836,
+    "y": 4454.28547668457,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9c21225.8549a6",
+    "id": "6e8a6a19.d50624",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4783.628768920898,
-    "y": 4452.145492553711,
-    "z": "2414cd0b.85dac2",
+    "x": 4785.628768920898,
+    "y": 4403.145492553711,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6669e686.3a92d",
+    "id": "83166069.2f46b",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4366.566390991211,
-    "y": 4326.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4368.566390991211,
+    "y": 4277.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6cdd29ff.2176f"
+        "b23ac34.b9f8bc"
       ]
     ]
   },
   {
-    "id": "6cdd29ff.2176f",
+    "id": "b23ac34.b9f8bc",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4571.566390991211,
-    "y": 4326.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4573.566390991211,
+    "y": 4277.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "462e489b.1c9ea8"
+        "37a61cf7.b75674"
       ]
     ]
   },
   {
-    "id": "462e489b.1c9ea8",
+    "id": "37a61cf7.b75674",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4737.566390991211,
-    "y": 4326.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4739.566390991211,
+    "y": 4277.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fce8efa1.5f12e"
+        "84e42d5e.8f28b8"
       ]
     ]
   },
   {
-    "id": "e3611e5a.49f6f",
+    "id": "7591914.05111f",
     "type": "save",
     "name": "get vpn-binding from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4409.566390991211,
-    "y": 4404.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4411.566390991211,
+    "y": 4355.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5af860a5.71ed3",
-        "234eb12a.7530fe",
-        "358a6c9c.71984c"
+        "4b066055.dca1d",
+        "4c3bb63f.abb268",
+        "afaed0ec.37401"
       ]
     ]
   },
   {
-    "id": "5af860a5.71ed3",
+    "id": "4b066055.dca1d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620.566390991211,
-    "y": 4406.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4622.566390991211,
+    "y": 4357.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e32197a7.4c81d8"
+        "7a2986e1.36d518"
       ]
     ]
   },
   {
-    "id": "234eb12a.7530fe",
+    "id": "4c3bb63f.abb268",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4621.057357788086,
-    "y": 4451.859756469727,
-    "z": "2414cd0b.85dac2",
+    "x": 4623.057357788086,
+    "y": 4402.859756469727,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9c21225.8549a6"
+        "6e8a6a19.d50624"
       ]
     ]
   },
   {
-    "id": "358a6c9c.71984c",
+    "id": "afaed0ec.37401",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4618.566390991211,
-    "y": 4495.285720825195,
-    "z": "2414cd0b.85dac2",
+    "x": 4620.566390991211,
+    "y": 4446.285720825195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c554c9c8.b91c38"
+        "7cabc91f.298798"
       ]
     ]
   },
   {
-    "id": "afe0131e.843c9",
+    "id": "45ad7f75.acf2c",
     "type": "save",
     "name": "get LEAF uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.LEAF.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.leafuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3686.566665649414,
-    "y": 3079.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3688.566665649414,
+    "y": 3030.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9dbeb0e5.86c59",
-        "ca19c457.91ce7",
-        "a8db99d3.ea1d58"
+        "77412c28.93cabc",
+        "a9cae5b1.bd79",
+        "fb412e94.ff6ef8"
       ]
     ]
   },
   {
-    "id": "ca19c457.91ce7",
+    "id": "a9cae5b1.bd79",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3914.057632446289,
-    "y": 3051.8597259521484,
-    "z": "2414cd0b.85dac2",
+    "x": 3916.057632446289,
+    "y": 3002.8597259521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "940a0baf.b50538"
+        "a9cc314f.91999"
       ]
     ]
   },
   {
-    "id": "a8db99d3.ea1d58",
+    "id": "fb412e94.ff6ef8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3909.566665649414,
-    "y": 3096.285690307617,
-    "z": "2414cd0b.85dac2",
+    "x": 3911.566665649414,
+    "y": 3047.285690307617,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "199d9fc8.23d478"
+        "7c451252.08c29c"
       ]
     ]
   },
   {
-    "id": "940a0baf.b50538",
+    "id": "a9cc314f.91999",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4076.629165649414,
-    "y": 3051.1454315185547,
-    "z": "2414cd0b.85dac2",
+    "x": 4078.629165649414,
+    "y": 3002.1454315185547,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "199d9fc8.23d478",
+    "id": "7c451252.08c29c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4077.566665649414,
-    "y": 3096.285690307617,
-    "z": "2414cd0b.85dac2",
+    "x": 4079.566665649414,
+    "y": 3047.285690307617,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9dbeb0e5.86c59",
+    "id": "77412c28.93cabc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3921.566665649414,
-    "y": 3146.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3923.566665649414,
+    "y": 3097.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "40724b83.4d51bc"
+        "894a7fb9.0e7198"
       ]
     ]
   },
   {
-    "id": "667c445f.dc3e5c",
+    "id": "22440324.4f2fcc",
     "type": "comment",
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
     "info": "",
     "comments": "",
-    "x": 3811.449996948242,
-    "y": 3337.1690826416016,
-    "z": "2414cd0b.85dac2",
+    "x": 3813.449996948242,
+    "y": 3288.1690826416016,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7651a38e.4e7e44",
+    "id": "e0dae0e2.18c628",
     "type": "set",
     "name": "set current-provider-id and current-cvlan-id",
     "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />-->",
     "comments": "",
-    "x": 3793.166763305664,
-    "y": 3898.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 3795.166763305664,
+    "y": 3849.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e0666b60.cb174",
+    "id": "6f17d5e2.9b03b4",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3931.166763305664,
-    "y": 3956.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 3933.166763305664,
+    "y": 3907.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "21f4d27b.d11a96",
+    "id": "fed6a907.2b3e28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3509.166763305664,
-    "y": 3638.3690032958984,
-    "z": "2414cd0b.85dac2",
+    "x": 3511.166763305664,
+    "y": 3589.3690032958984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "407839fb.167e2",
-        "931a7a68.51c848",
-        "f4ea682a.e63f08"
+        "db019ae8.f69e68",
+        "cb5f4cbc.1262b8",
+        "ca40fb3f.0ddd08"
       ]
     ]
   },
   {
-    "id": "91a690e7.1a5918",
+    "id": "a1e56d0c.c484e8",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3750.166763305664,
-    "y": 4066.7691497802734,
-    "z": "2414cd0b.85dac2",
+    "x": 3752.166763305664,
+    "y": 4017.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "34fa09a4.b2b1ae",
-        "809131d.392dfd"
+        "25e879f6.3e709e",
+        "8478688.57aab18"
       ]
     ]
   },
   {
-    "id": "34fa09a4.b2b1ae",
+    "id": "25e879f6.3e709e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3943.166763305664,
-    "y": 4067.7691497802734,
-    "z": "2414cd0b.85dac2",
+    "x": 3945.166763305664,
+    "y": 4018.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b77388f8.551df8"
+        "2c016cde.6263ac"
       ]
     ]
   },
   {
-    "id": "809131d.392dfd",
+    "id": "8478688.57aab18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3947.166763305664,
-    "y": 4111.769149780273,
-    "z": "2414cd0b.85dac2",
+    "x": 3949.166763305664,
+    "y": 4062.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2e72f134.3b345e"
+        "f613ca73.1c6bb8"
       ]
     ]
   },
   {
-    "id": "2e72f134.3b345e",
+    "id": "f613ca73.1c6bb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4086.166763305664,
-    "y": 4106.769149780273,
-    "z": "2414cd0b.85dac2",
+    "x": 4088.166763305664,
+    "y": 4057.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6669e686.3a92d"
+        "83166069.2f46b"
       ]
     ]
   },
   {
-    "id": "b77388f8.551df8",
+    "id": "2c016cde.6263ac",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"LEAF CONN DOES NOT EXIST BUT IT SHOULD BE.\" />\n\n",
     "comments": "",
-    "x": 4087.166763305664,
-    "y": 4063.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 4089.166763305664,
+    "y": 4014.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1c5f100e.a5d978",
+    "id": "fdf1da6c.032aa",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4435.283706665039,
-    "y": 3285.5691986083984,
-    "z": "2414cd0b.85dac2",
+    "x": 4437.283706665039,
+    "y": 3236.5691986083984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f17d25a9.fc3a28",
-        "d1a832ec.f421b"
+        "624fa50f.6c863c",
+        "2cbb1141.892c6e"
       ]
     ]
   },
   {
-    "id": "f17d25a9.fc3a28",
+    "id": "624fa50f.6c863c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4634.450698852539,
-    "y": 3352.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 4636.450698852539,
+    "y": 3303.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3ef002bf.b5c35e"
+        "dec3e17a.4aeb5"
       ]
     ]
   },
   {
-    "id": "d1a832ec.f421b",
+    "id": "2cbb1141.892c6e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4656.450698852539,
-    "y": 3197.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 4658.450698852539,
+    "y": 3148.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d05f5529.96a4b8"
+        "591bc18f.862f3"
       ]
     ]
   },
   {
-    "id": "2d4de683.3992d2",
+    "id": "51c677f3.cc82f",
     "type": "save",
     "name": "update LEAF UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4434.283706665039,
-    "y": 3140.7691497802734,
-    "z": "2414cd0b.85dac2",
+    "x": 4436.283706665039,
+    "y": 3091.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e42871e4.7e7078",
+    "id": "84a6fa88.639cd8",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4450.450698852539,
-    "y": 3094.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 4452.450698852539,
+    "y": 3045.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "dcbc2987.d3bdd",
+    "id": "281d0553.9e5102",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5005.216567993164,
-    "y": 2549.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5007.216567993164,
+    "y": 2500.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "feb1ef44.b73648",
+    "id": "e4f725a7.1779b8",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5607.216567993164,
-    "y": 2654.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5609.216567993164,
+    "y": 2605.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "56698383.1dde24",
+    "id": "1e1b1c4e.72c2bc",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4997.216323852539,
-    "y": 2595.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 4999.216323852539,
+    "y": 2546.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b538dd4e.00fce",
-        "3917ea5e.68d896",
-        "234d36ee.00b9a2"
+        "d8429e74.2e1a2",
+        "e4667648.c01938",
+        "4ea5d18f.5a2f38"
       ]
     ]
   },
   {
-    "id": "3917ea5e.68d896",
+    "id": "e4667648.c01938",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5224.707290649414,
-    "y": 2567.7430267333984,
-    "z": "2414cd0b.85dac2",
+    "x": 5226.707290649414,
+    "y": 2518.7430267333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bb66fc72.62525"
+        "1f89164b.95601a"
       ]
     ]
   },
   {
-    "id": "234d36ee.00b9a2",
+    "id": "4ea5d18f.5a2f38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5220.216323852539,
-    "y": 2612.168991088867,
-    "z": "2414cd0b.85dac2",
+    "x": 5222.216323852539,
+    "y": 2563.168991088867,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2eceea5f.8355a6"
+        "88705cd9.03d55"
       ]
     ]
   },
   {
-    "id": "bb66fc72.62525",
+    "id": "1f89164b.95601a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5387.278823852539,
-    "y": 2567.0287322998047,
-    "z": "2414cd0b.85dac2",
+    "x": 5389.278823852539,
+    "y": 2518.0287322998047,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2eceea5f.8355a6",
+    "id": "88705cd9.03d55",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5388.216323852539,
-    "y": 2612.168991088867,
-    "z": "2414cd0b.85dac2",
+    "x": 5390.216323852539,
+    "y": 2563.168991088867,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b5d59b15.1b765",
+    "id": "2e8d1bdd.85c644",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5385.216323852539,
-    "y": 2662.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5387.216323852539,
+    "y": 2613.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "85d5ae48.70e33",
-        "feb1ef44.b73648"
+        "f78dc911.45f94",
+        "e4f725a7.1779b8"
       ]
     ]
   },
   {
-    "id": "b538dd4e.00fce",
+    "id": "d8429e74.2e1a2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5216.216323852539,
-    "y": 2662.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5218.216323852539,
+    "y": 2613.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b5d59b15.1b765"
+        "2e8d1bdd.85c644"
       ]
     ]
   },
   {
-    "id": "85d5ae48.70e33",
+    "id": "f78dc911.45f94",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5567.217056274414,
-    "y": 2604.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5569.217056274414,
+    "y": 2555.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3c4fd972.8c727e",
+    "id": "d33826b1.ef8f58",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4648.449996948242,
-    "y": 3159.1690826416016,
-    "z": "2414cd0b.85dac2",
+    "x": 4650.449996948242,
+    "y": 3110.1690826416016,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9a2b9c1d.56f0c",
+    "id": "84f3d20e.4f91a8",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4647.283706665039,
-    "y": 3315.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 4649.283706665039,
+    "y": 3266.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "22475743.9e3838",
+    "id": "48adb9de.8dd8c8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5096.282974243164,
-    "y": 2888.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5098.282974243164,
+    "y": 2839.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "791cfc48.d2aabc",
+    "id": "ccc0529e.d89b08",
     "type": "save",
     "name": "update ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5698.282974243164,
-    "y": 2993.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5700.282974243164,
+    "y": 2944.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "b94b085c.7cb5a8",
+    "id": "337b01b3.8933a6",
     "type": "save",
     "name": "get root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.rootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5088.282730102539,
-    "y": 2934.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5090.282730102539,
+    "y": 2885.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d976d76c.67e958",
-        "8e60ee6f.c2d2f",
-        "835f78f2.c41258"
+        "799a0808.a03288",
+        "b771a02d.8b4ba",
+        "6a9817e4.946118"
       ]
     ]
   },
   {
-    "id": "8e60ee6f.c2d2f",
+    "id": "b771a02d.8b4ba",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5315.773696899414,
-    "y": 2907.5430755615234,
-    "z": "2414cd0b.85dac2",
+    "x": 5317.773696899414,
+    "y": 2858.5430755615234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bf2ec467.02c0d8"
+        "6b02c11a.d4f898"
       ]
     ]
   },
   {
-    "id": "835f78f2.c41258",
+    "id": "6a9817e4.946118",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5311.282730102539,
-    "y": 2951.969039916992,
-    "z": "2414cd0b.85dac2",
+    "x": 5313.282730102539,
+    "y": 2902.969039916992,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c322ac12.a985c8"
+        "130a98d8.a059e7"
       ]
     ]
   },
   {
-    "id": "bf2ec467.02c0d8",
+    "id": "6b02c11a.d4f898",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5478.345230102539,
-    "y": 2906.8287811279297,
-    "z": "2414cd0b.85dac2",
+    "x": 5480.345230102539,
+    "y": 2857.8287811279297,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c322ac12.a985c8",
+    "id": "130a98d8.a059e7",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5479.282730102539,
-    "y": 2951.969039916992,
-    "z": "2414cd0b.85dac2",
+    "x": 5481.282730102539,
+    "y": 2902.969039916992,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "380b5701.029218",
+    "id": "ff63a7c4.86cf08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5476.282730102539,
-    "y": 3001.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5478.282730102539,
+    "y": 2952.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2037a317.5823d4",
-        "791cfc48.d2aabc"
+        "871b9cd5.ec522",
+        "ccc0529e.d89b08"
       ]
     ]
   },
   {
-    "id": "d976d76c.67e958",
+    "id": "799a0808.a03288",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5307.282730102539,
-    "y": 3001.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5309.282730102539,
+    "y": 2952.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "380b5701.029218"
+        "ff63a7c4.86cf08"
       ]
     ]
   },
   {
-    "id": "2037a317.5823d4",
+    "id": "871b9cd5.ec522",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5658.283462524414,
-    "y": 2943.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5660.283462524414,
+    "y": 2894.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d383ac36.342cc",
+    "id": "dce7c6b5.af48e",
     "type": "set",
     "name": "set delta",
     "xml": "<set>\n<parameter name='tmp.delta' value='`$tmp.aai.leafuni.data-source - $gfp`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='false' />\n\n\n",
     "comments": "",
-    "x": 5013.282730102539,
-    "y": 2847.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 5015.282730102539,
+    "y": 2798.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3ef002bf.b5c35e",
+    "id": "dec3e17a.4aeb5",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4806.449996948242,
-    "y": 3341.1690826416016,
-    "z": "2414cd0b.85dac2",
+    "x": 4808.449996948242,
+    "y": 3292.1690826416016,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d383ac36.342cc",
-        "b94b085c.7cb5a8",
-        "37f3e792.01b98"
+        "dce7c6b5.af48e",
+        "337b01b3.8933a6",
+        "9c79a60.2e838d8"
       ]
     ]
   },
   {
-    "id": "d05f5529.96a4b8",
+    "id": "591bc18f.862f3",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4827.183364868164,
-    "y": 3167.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 4829.183364868164,
+    "y": 3118.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "30b48cfc.8858f4",
-        "56698383.1dde24",
-        "9f73e0e4.5bd9a8"
+        "c0c09747.1b1be",
+        "1e1b1c4e.72c2bc",
+        "615783e8.7114bc"
       ]
     ]
   },
   {
-    "id": "30b48cfc.8858f4",
+    "id": "c0c09747.1b1be",
     "type": "set",
     "name": "set delta",
     "xml": "<set>\n<parameter name='tmp.delta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />\n<parameter name='tmp.isBwIncreased' value='true' />\n",
     "comments": "",
-    "x": 4962.016128540039,
-    "y": 2473.7691497802734,
-    "z": "2414cd0b.85dac2",
+    "x": 4964.016128540039,
+    "y": 2424.7691497802734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "eb34d49c.d22a8",
+    "id": "1fd4804f.571bd8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4421.333267211914,
-    "y": 3240.9691009521484,
-    "z": "2414cd0b.85dac2",
+    "x": 4423.333267211914,
+    "y": 3191.9691009521484,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2675acce.b9a12c",
+    "id": "793c3d11.91f2fc",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3890.666732788086,
-    "y": 4229.769607543945,
-    "z": "2414cd0b.85dac2",
+    "x": 3892.666732788086,
+    "y": 4180.769607543945,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "b63f121.ce4247",
+    "id": "334968de.3ae5d",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3725.666732788086,
-    "y": 4301.96955871582,
-    "z": "2414cd0b.85dac2",
+    "x": 3727.666732788086,
+    "y": 4252.96955871582,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8b9ac42e.1e08f",
-        "109545ec.57786a"
+        "420a91d4.f005f",
+        "9e2d332a.723078"
       ]
     ]
   },
   {
-    "id": "8b9ac42e.1e08f",
+    "id": "420a91d4.f005f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3936.666732788086,
-    "y": 4301.96955871582,
-    "z": "2414cd0b.85dac2",
+    "x": 3938.666732788086,
+    "y": 4252.96955871582,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8bee6e1e.eff33"
+        "692a8c7a.fda954"
       ]
     ]
   },
   {
-    "id": "109545ec.57786a",
+    "id": "9e2d332a.723078",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3932.666732788086,
-    "y": 4349.96955871582,
-    "z": "2414cd0b.85dac2",
+    "x": 3934.666732788086,
+    "y": 4300.96955871582,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a4995391.fc5358"
+        "6695c568.10d40c"
       ]
     ]
   },
   {
-    "id": "8bee6e1e.eff33",
+    "id": "692a8c7a.fda954",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4092.666732788086,
-    "y": 4297.96955871582,
-    "z": "2414cd0b.85dac2",
+    "x": 4094.666732788086,
+    "y": 4248.96955871582,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b36b53d7.2d66a8"
+        "1378eadb.299955"
       ]
     ]
   },
   {
-    "id": "a4995391.fc5358",
+    "id": "6695c568.10d40c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found but it should have been!' />\n",
     "comments": "",
-    "x": 4080.666732788086,
-    "y": 4344.96955871582,
-    "z": "2414cd0b.85dac2",
+    "x": 4082.666732788086,
+    "y": 4295.96955871582,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "294f0835.1325e",
+    "id": "42d7c1e3.70d63",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4933.632827758789,
-    "y": 4612.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4935.632827758789,
+    "y": 4563.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "66149bc9.393fc4",
-        "ca1fbeb5.c9d45"
+        "48aa49b9.b94898",
+        "9faa5f11.a8b628"
       ]
     ]
   },
   {
-    "id": "ca1fbeb5.c9d45",
+    "id": "9faa5f11.a8b628",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5176.633071899414,
-    "y": 4581.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 5178.633071899414,
+    "y": 4532.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fb61c0ac.1edc98",
+    "id": "6b7d6b27.bf3f6c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4793.632827758789,
-    "y": 4722.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4795.632827758789,
+    "y": 4673.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3b9c82f6.e6f406"
+        "8f38170c.15c52"
       ]
     ]
   },
   {
-    "id": "ca5b121a.c4f29",
+    "id": "e53eb8db.b4de68",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4781.633071899414,
-    "y": 4815.168563842773,
-    "z": "2414cd0b.85dac2",
+    "x": 4783.633071899414,
+    "y": 4766.168563842773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "27d3cdcb.a5be82",
+    "id": "8d6af4a3.13c21",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4783.695205688477,
-    "y": 4770.028091430664,
-    "z": "2414cd0b.85dac2",
+    "x": 4785.695205688477,
+    "y": 4721.028091430664,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b36b53d7.2d66a8",
+    "id": "1378eadb.299955",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.ROOT.connectivity.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4399.632827758789,
-    "y": 4612.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4401.632827758789,
+    "y": 4563.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a0726a73.552d38"
+        "b83aa531.8a6d18"
       ]
     ]
   },
   {
-    "id": "a0726a73.552d38",
+    "id": "b83aa531.8a6d18",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4604.632827758789,
-    "y": 4612.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4606.632827758789,
+    "y": 4563.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c054f471.25372"
+        "a88f4eb0.5f047"
       ]
     ]
   },
   {
-    "id": "c054f471.25372",
+    "id": "a88f4eb0.5f047",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4770.632827758789,
-    "y": 4612.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4772.632827758789,
+    "y": 4563.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "294f0835.1325e"
+        "42d7c1e3.70d63"
       ]
     ]
   },
   {
-    "id": "66149bc9.393fc4",
+    "id": "48aa49b9.b94898",
     "type": "save",
     "name": "get vpn-binding from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4409.632827758789,
-    "y": 4722.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4411.632827758789,
+    "y": 4673.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6e23d592.fd6b7c",
-        "ebdcd4d0.c0565",
-        "cbc774c8.750668"
+        "7a79979c.8eea88",
+        "442b3988.19bc",
+        "5c729d6c.56aa94"
       ]
     ]
   },
   {
-    "id": "6e23d592.fd6b7c",
+    "id": "7a79979c.8eea88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4620.632827758789,
-    "y": 4724.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4622.632827758789,
+    "y": 4675.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fb61c0ac.1edc98"
+        "6b7d6b27.bf3f6c"
       ]
     ]
   },
   {
-    "id": "ebdcd4d0.c0565",
+    "id": "442b3988.19bc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4621.123794555664,
-    "y": 4769.74235534668,
-    "z": "2414cd0b.85dac2",
+    "x": 4623.123794555664,
+    "y": 4720.74235534668,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "27d3cdcb.a5be82"
+        "8d6af4a3.13c21"
       ]
     ]
   },
   {
-    "id": "cbc774c8.750668",
+    "id": "5c729d6c.56aa94",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4618.632827758789,
-    "y": 4813.168319702148,
-    "z": "2414cd0b.85dac2",
+    "x": 4620.632827758789,
+    "y": 4764.168319702148,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ca5b121a.c4f29"
+        "e53eb8db.b4de68"
       ]
     ]
   },
   {
-    "id": "c9811fe.3333a6",
+    "id": "4e4fb9a1.270b08",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 6029.449722290039,
-    "y": 7111.369247436523,
-    "z": "2414cd0b.85dac2",
+    "x": 6031.449722290039,
+    "y": 7062.369247436523,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e4958a72.db4418",
+    "id": "16ba58e8.574907",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5297.916732788086,
-    "y": 4342.568923950195,
-    "z": "2414cd0b.85dac2",
+    "x": 5299.916732788086,
+    "y": 4293.568923950195,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e32197a7.4c81d8",
+    "id": "7a2986e1.36d518",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4799.916976928711,
-    "y": 4408.568923950195,
-    "z": "2414cd0b.85dac2",
+    "x": 4801.916976928711,
+    "y": 4359.568923950195,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c808b6be.91a2f",
+    "id": "f1d3809d.7253c8",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5330.916732788086,
-    "y": 4410.568923950195,
-    "z": "2414cd0b.85dac2",
+    "x": 5332.916732788086,
+    "y": 4361.568923950195,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "81cfd436.09d848",
-        "56387492.e922bc"
+        "2b6629f8.8ae99e",
+        "6b873c45.812654"
       ]
     ]
   },
   {
-    "id": "81cfd436.09d848",
+    "id": "2b6629f8.8ae99e",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5455.916732788086,
-    "y": 4308.56867980957,
-    "z": "2414cd0b.85dac2",
+    "x": 5457.916732788086,
+    "y": 4259.56867980957,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f77cd261.9bc248"
+        "575e916.aaad5f"
       ]
     ]
   },
   {
-    "id": "56387492.e922bc",
+    "id": "6b873c45.812654",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5574.916763305664,
-    "y": 4382.568710327148,
-    "z": "2414cd0b.85dac2",
+    "x": 5576.916763305664,
+    "y": 4333.568710327148,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "ebf96cf8.b5e018",
+    "id": "1440683a.de744",
     "type": "set",
     "name": "set srcTtp OTN layer",
     "xml": "<set>\n<!--<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node + '-' + -->\n<!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->\n<!--                                             $tmp.source.ttp-id`\" />-->\n\n<parameter name='tmp.srcTtpOtnLayer' value=\"`$tmp.pce-src-node`\" />\n\n\n",
     "comments": "",
-    "x": 4543.599868774414,
-    "y": 3954.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4545.599868774414,
+    "y": 3905.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "305ba790.74ff78",
+    "id": "c9d5b018.f8051",
     "type": "switchNode",
     "name": "switch provider-id domainA",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4888.599868774414,
-    "y": 3816.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4890.599868774414,
+    "y": 3767.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "810cd856.9ccc78"
+        "74718a63.36de84"
       ]
     ]
   },
   {
-    "id": "c7beb2fc.58c5e",
+    "id": "55284001.8f5b08",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4595.599868774414,
-    "y": 3810.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4597.599868774414,
+    "y": 3761.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "305ba790.74ff78"
+        "c9d5b018.f8051"
       ]
     ]
   },
   {
-    "id": "42cb0058.08b348",
+    "id": "75332f13.262108",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4850.599868774414,
-    "y": 3767.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4852.599868774414,
+    "y": 3718.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f96c39ea.1e754",
+    "id": "1dffa908.5b5767",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4539.599868774414,
-    "y": 3862.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4541.599868774414,
+    "y": 3813.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9b7536d9.f58d3",
+    "id": "2247e7bb.aa6698",
     "type": "set",
     "name": "set tmp.pce-src-node",
     "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $otnTopoIdSrc + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />",
     "comments": "",
-    "x": 4547.599868774414,
-    "y": 3907.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4549.599868774414,
+    "y": 3858.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "78f36f08.9d23a",
+    "id": "766a8bc6.9fb0cc",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4544.599868774414,
-    "y": 3760.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4546.599868774414,
+    "y": 3711.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "810cd856.9ccc78",
+    "id": "74718a63.36de84",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4797.599868774414,
-    "y": 3884.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4799.599868774414,
+    "y": 3835.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "842c0b07.9daf5"
+        "238ee53c.904a6a"
       ]
     ]
   },
   {
-    "id": "842c0b07.9daf5",
+    "id": "238ee53c.904a6a",
     "type": "switchNode",
     "name": "switch te-topo-id",
     "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4982.599868774414,
-    "y": 3883.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4984.599868774414,
+    "y": 3834.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "effe4e96.61186"
+        "7de620b3.3d3198"
       ]
     ]
   },
   {
-    "id": "effe4e96.61186",
+    "id": "7de620b3.3d3198",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5174.599868774414,
-    "y": 3886.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5176.599868774414,
+    "y": 3837.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e837bc5d.d6f4a"
+        "f9ce03fd.3df508"
       ]
     ]
   },
   {
-    "id": "e837bc5d.d6f4a",
+    "id": "f9ce03fd.3df508",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5346.599868774414,
-    "y": 3882.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 5348.599868774414,
+    "y": 3833.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5ae03ba5.e05364",
+    "id": "d48247ca.056eb",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-find-maximum-used-tpn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4722.599868774414,
-    "y": 3997.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4724.599868774414,
+    "y": 3948.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "407839fb.167e2",
+    "id": "db019ae8.f69e68",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4239.599868774414,
-    "y": 3782.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4241.599868774414,
+    "y": 3733.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "873e71a3.8a59a",
-        "2ae96c09.c29bbc",
-        "f96c39ea.1e754",
-        "9b7536d9.f58d3",
-        "ebf96cf8.b5e018",
-        "c7beb2fc.58c5e",
-        "5ae03ba5.e05364"
+        "d62659b6.160db8",
+        "cf64723d.dfeea8",
+        "1dffa908.5b5767",
+        "2247e7bb.aa6698",
+        "1440683a.de744",
+        "55284001.8f5b08",
+        "d48247ca.056eb"
       ]
     ]
   },
   {
-    "id": "78165047.ec87e8",
+    "id": "1fb81d61.c0c6c3",
     "type": "comment",
     "name": "The following section is to find srcTtp OTN layer (its long name)",
     "info": "The following section is to find srcTtp OTN layer (its long name)",
     "comments": "",
-    "x": 4224.599868774414,
-    "y": 3716.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4226.599868774414,
+    "y": 3667.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2ae96c09.c29bbc",
+    "id": "cf64723d.dfeea8",
     "type": "get-resource",
     "name": "get-resource network-resources-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
     "comments": "",
     "outputs": 1,
-    "x": 4603.599868774414,
-    "y": 3703.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4605.599868774414,
+    "y": 3654.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d4c85a8.dd0a8a8",
-        "e8890a4e.1d2fd",
-        "42cb0058.08b348"
+        "61f8c12d.7ec188",
+        "b0224d35.db0ba",
+        "75332f13.262108"
       ]
     ]
   },
   {
-    "id": "d4c85a8.dd0a8a8",
+    "id": "61f8c12d.7ec188",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4839.599868774414,
-    "y": 3686.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4841.599868774414,
+    "y": 3637.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "e8890a4e.1d2fd",
+    "id": "b0224d35.db0ba",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4836.599868774414,
-    "y": 3727.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4838.599868774414,
+    "y": 3678.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "873e71a3.8a59a",
+    "id": "d62659b6.160db8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4552.599868774414,
-    "y": 3660.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 4554.599868774414,
+    "y": 3611.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "86fc32b9.5b11e8",
+    "id": "cbd695e8.8ce3",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5281.999771118164,
-    "y": 4709.685653686523,
-    "z": "2414cd0b.85dac2",
+    "x": 5283.999771118164,
+    "y": 4660.685653686523,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3b9c82f6.e6f406",
+    "id": "8f38170c.15c52",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5070.999771118164,
-    "y": 4771.685653686523,
-    "z": "2414cd0b.85dac2",
+    "x": 5072.999771118164,
+    "y": 4722.685653686523,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1361709c.aa1da7"
+        "eec0ed64.666e3"
       ]
     ]
   },
   {
-    "id": "1361709c.aa1da7",
+    "id": "eec0ed64.666e3",
     "type": "switchNode",
     "name": "switch ops-note is srcTtpOtnLayer",
     "xml": "<switch test=\"`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5314.999771118164,
-    "y": 4777.685653686523,
-    "z": "2414cd0b.85dac2",
+    "x": 5316.999771118164,
+    "y": 4728.685653686523,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "65e42246.3bc70c",
-        "4c5853af.96f634"
+        "da15375d.9b0ee8",
+        "3ee187ea.cd5be8"
       ]
     ]
   },
   {
-    "id": "65e42246.3bc70c",
+    "id": "da15375d.9b0ee8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5545.999771118164,
-    "y": 4755.685653686523,
-    "z": "2414cd0b.85dac2",
+    "x": 5547.999771118164,
+    "y": 4706.685653686523,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "86c13c.8334e6c8"
+        "7e1ed8b0.7851f"
       ]
     ]
   },
   {
-    "id": "4c5853af.96f634",
+    "id": "3ee187ea.cd5be8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5550.999771118164,
-    "y": 4822.685653686523,
-    "z": "2414cd0b.85dac2",
+    "x": 5552.999771118164,
+    "y": 4773.685653686523,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c5f7e346.0cad5",
+    "id": "33a4fd6a.f05cf2",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5799.883529663086,
-    "y": 4320.36799621582,
-    "z": "2414cd0b.85dac2",
+    "x": 5801.883529663086,
+    "y": 4271.36799621582,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "36b3fe84.38d7ba",
-        "4dc5480c.f82fe8"
+        "e619571d.07b27",
+        "7e5b3b13.527164"
       ]
     ]
   },
   {
-    "id": "36b3fe84.38d7ba",
+    "id": "e619571d.07b27",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5954.883560180664,
-    "y": 4248.368270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 5956.883560180664,
+    "y": 4199.368270874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "55b477cf.ef13f8"
+        "a419c34.20a76c"
       ]
     ]
   },
   {
-    "id": "4dc5480c.f82fe8",
+    "id": "7e5b3b13.527164",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5955.883560180664,
-    "y": 4381.368270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 5957.883560180664,
+    "y": 4332.368270874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c669d5e6.7b56e8"
+        "8b03748e.6511"
       ]
     ]
   },
   {
-    "id": "55b477cf.ef13f8",
+    "id": "a419c34.20a76c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6099.883560180664,
-    "y": 4248.368515014648,
-    "z": "2414cd0b.85dac2",
+    "x": 6101.883560180664,
+    "y": 4199.368515014648,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "13bb5bff.e1f664",
-        "d1738758.598cd8"
+        "e331e060.96ce2",
+        "f02eaafa.80f4b"
       ]
     ]
   },
   {
-    "id": "13bb5bff.e1f664",
+    "id": "e331e060.96ce2",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6392.883560180664,
-    "y": 4226.368270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 6394.883560180664,
+    "y": 4177.368270874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d1738758.598cd8",
+    "id": "f02eaafa.80f4b",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6344.533462524414,
-    "y": 4273.685165405273,
-    "z": "2414cd0b.85dac2",
+    "x": 6346.533462524414,
+    "y": 4224.685165405273,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c20dae0a.c8db1",
+    "id": "fac6e0eb.b7e5e8",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6417.883529663086,
-    "y": 4175.36799621582,
-    "z": "2414cd0b.85dac2",
+    "x": 6419.883529663086,
+    "y": 4126.36799621582,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c669d5e6.7b56e8",
+    "id": "8b03748e.6511",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6111.883560180664,
-    "y": 4380.368515014648,
-    "z": "2414cd0b.85dac2",
+    "x": 6113.883560180664,
+    "y": 4331.368515014648,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fbd54f6b.bd5de8",
-        "4b0d9778.02ef98"
+        "7cde89b.f9cde78",
+        "44d5eb8e.8b5a7c"
       ]
     ]
   },
   {
-    "id": "fbd54f6b.bd5de8",
+    "id": "7cde89b.f9cde78",
     "type": "save",
     "name": "update the-vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 6404.883560180664,
-    "y": 4358.368270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 6406.883560180664,
+    "y": 4309.368270874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "4b0d9778.02ef98",
+    "id": "44d5eb8e.8b5a7c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6356.533462524414,
-    "y": 4405.685165405273,
-    "z": "2414cd0b.85dac2",
+    "x": 6358.533462524414,
+    "y": 4356.685165405273,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "2c35c11.f28a13e",
+    "id": "8783d256.dfbee8",
     "type": "comment",
     "name": "decrease the bw of the-vpn-binding and change status to modified",
     "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6428.883560180664,
-    "y": 4319.368270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 6430.883560180664,
+    "y": 4270.368270874023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "86c13c.8334e6c8",
+    "id": "7e1ed8b0.7851f",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5751.116470336914,
-    "y": 4762.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5753.116470336914,
+    "y": 4713.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f84ec623.3e0358",
-        "579a6f55.5876b8"
+        "cf050a6d.dffd88",
+        "15aed249.cbc52e"
       ]
     ]
   },
   {
-    "id": "f84ec623.3e0358",
+    "id": "cf050a6d.dffd88",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5946.116470336914,
-    "y": 4690.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5948.116470336914,
+    "y": 4641.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7ac296e6.db7d4"
+        "5ed50abf.ff9d7c"
       ]
     ]
   },
   {
-    "id": "579a6f55.5876b8",
+    "id": "15aed249.cbc52e",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5947.116470336914,
-    "y": 4823.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5949.116470336914,
+    "y": 4774.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "63acc8c1.d0489"
+        "2100e232.b11cce"
       ]
     ]
   },
   {
-    "id": "7ac296e6.db7d4",
+    "id": "5ed50abf.ff9d7c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6091.116470336914,
-    "y": 4690.569198608398,
-    "z": "2414cd0b.85dac2",
+    "x": 6093.116470336914,
+    "y": 4641.569198608398,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7470326b.50fd4c",
-        "6067f5da.462f2c"
+        "e4e29811.e1048",
+        "e58be206.dcc488"
       ]
     ]
   },
   {
-    "id": "7470326b.50fd4c",
+    "id": "e4e29811.e1048",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.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<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6384.116470336914,
-    "y": 4668.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 6386.116470336914,
+    "y": 4619.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "6067f5da.462f2c",
+    "id": "e58be206.dcc488",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6335.766372680664,
-    "y": 4715.885848999023,
-    "z": "2414cd0b.85dac2",
+    "x": 6337.766372680664,
+    "y": 4666.885848999023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "b621fab3.fd22d8",
+    "id": "fa3f6ab4.8ef07",
     "type": "comment",
     "name": "increase the bw of the-vpn-binding and change status to modified",
     "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6408.116470336914,
-    "y": 4629.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 6410.116470336914,
+    "y": 4580.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "63acc8c1.d0489",
+    "id": "2100e232.b11cce",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6103.116470336914,
-    "y": 4822.569198608398,
-    "z": "2414cd0b.85dac2",
+    "x": 6105.116470336914,
+    "y": 4773.569198608398,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ab9c7cb.6ee1c8",
-        "478e555b.00c56c"
+        "8a653803.fc1f6",
+        "4431f46f.b3008c"
       ]
     ]
   },
   {
-    "id": "ab9c7cb.6ee1c8",
+    "id": "8a653803.fc1f6",
     "type": "save",
     "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.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<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6396.116470336914,
-    "y": 4800.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 6398.116470336914,
+    "y": 4751.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "478e555b.00c56c",
+    "id": "4431f46f.b3008c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n<!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->\n<!--<parameter name='cir' value='`$gfp *1000000`' />-->\n<!--<parameter name='eir' value='`$gfp *1000000`' />-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 6347.766372680664,
-    "y": 4847.885848999023,
-    "z": "2414cd0b.85dac2",
+    "x": 6349.766372680664,
+    "y": 4798.885848999023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "57c5a214.d70e3c",
+    "id": "bbeeae4d.bca708",
     "type": "comment",
     "name": "decrease the bw of the-vpn-binding and change status to modified",
     "info": "decrease the bw of the-vpn-binding\nchange status to modified\n",
     "comments": "",
-    "x": 6420.116470336914,
-    "y": 4761.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 6422.116470336914,
+    "y": 4712.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b34554cf.aa2d2",
+    "id": "aea70ead.9836b8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5158.966567993164,
-    "y": 5502.769149780273,
-    "z": "2414cd0b.85dac2",
+    "x": 5160.966567993164,
+    "y": 5453.769149780273,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "613e9b77.298d54",
+    "id": "2e1e6c02.39beec",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5156.749771118164,
-    "y": 5542.969345092773,
-    "z": "2414cd0b.85dac2",
+    "x": 5158.749771118164,
+    "y": 5493.969345092773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "95d677c9.726458",
+    "id": "a8fe1a2c.71b3c8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5032.000015258789,
-    "y": 5727.452255249023,
-    "z": "2414cd0b.85dac2",
+    "x": 5034.000015258789,
+    "y": 5678.452255249023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6712b992.157",
+    "id": "7871c32f.9d91cc",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5029.783218383789,
-    "y": 5767.652450561523,
-    "z": "2414cd0b.85dac2",
+    "x": 5031.783218383789,
+    "y": 5718.652450561523,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "abfdee17.12df08",
+    "id": "685061c3.01675",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5129.116470336914,
-    "y": 6051.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5131.116470336914,
+    "y": 6002.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "1b1c3355.4ab2b5",
+    "id": "29335c50.b3bc5c",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4956.116470336914,
-    "y": 6108.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 4958.116470336914,
+    "y": 6059.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5c00f9d2.103a1",
-        "4db44e39.57056"
+        "a0a30ce1.826348",
+        "8ce5c005.55e608"
       ]
     ]
   },
   {
-    "id": "5c00f9d2.103a1",
+    "id": "a0a30ce1.826348",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5167.116470336914,
-    "y": 6108.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5169.116470336914,
+    "y": 6059.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e62c2a04.834ba8"
+        "590e11da.6a5d5"
       ]
     ]
   },
   {
-    "id": "4db44e39.57056",
+    "id": "8ce5c005.55e608",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5163.116470336914,
-    "y": 6156.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5165.116470336914,
+    "y": 6107.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2dd9a1ca.3380de"
+        "ceea008c.a129b"
       ]
     ]
   },
   {
-    "id": "e62c2a04.834ba8",
+    "id": "590e11da.6a5d5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5323.116470336914,
-    "y": 6104.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5325.116470336914,
+    "y": 6055.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "59a4f603.629458",
-        "cf3067c2.3ee01",
-        "b81f8f7c.c8bbe"
+        "755f894f.dc414",
+        "2f6a3eee.3c813a",
+        "d68f19c9.00e6c"
       ]
     ]
   },
   {
-    "id": "2dd9a1ca.3380de",
+    "id": "ceea008c.a129b",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 5311.116470336914,
-    "y": 6151.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5313.116470336914,
+    "y": 6102.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4526cd48.9f1514",
+    "id": "692d5d8e.91da94",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5589.000259399414,
-    "y": 6204.452255249023,
-    "z": "2414cd0b.85dac2",
+    "x": 5591.000259399414,
+    "y": 6155.452255249023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b81f8f7c.c8bbe",
+    "id": "d68f19c9.00e6c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5586.783462524414,
-    "y": 6244.652450561523,
-    "z": "2414cd0b.85dac2",
+    "x": 5588.783462524414,
+    "y": 6195.652450561523,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "cf3067c2.3ee01",
+    "id": "2f6a3eee.3c813a",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5706.116470336914,
-    "y": 6156.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5708.116470336914,
+    "y": 6107.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "59a4f603.629458",
+    "id": "755f894f.dc414",
     "type": "set",
     "name": "set prop.connectivity-domainB-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.aai.ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5577.116470336914,
-    "y": 6104.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5579.116470336914,
+    "y": 6055.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "67b13c77.507314",
+    "id": "e084ba5b.54a44",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5018.116470336914,
-    "y": 6009.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5020.116470336914,
+    "y": 5960.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e11abdc.71e19c",
+    "id": "ac6c48.3b961bb8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4665.449478149414,
-    "y": 6096.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 4667.449478149414,
+    "y": 6047.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "abfdee17.12df08",
-        "1b1c3355.4ab2b5",
-        "b5179b.b5811868",
-        "8a0b9185.29b548"
+        "685061c3.01675",
+        "29335c50.b3bc5c",
+        "2fa7a2c0.97e2e6",
+        "ed4e275a.a600a"
       ]
     ]
   },
   {
-    "id": "6a0cb0e4.5bec78",
+    "id": "f3a1ad9d.6eb4a8",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5009.199966430664,
-    "y": 6565.568954467773,
-    "z": "2414cd0b.85dac2",
+    "x": 5011.199966430664,
+    "y": 6516.568954467773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "4b79bf18.1b12f8",
+    "id": "d3bca3b6.20d5e8",
     "type": "comment",
     "name": "TODO: BUG -- DONE",
     "info": "momkene connectivity haye vasati ke dummy hastand ham\nvpn-binding dashte bashand ke too in path involve hast pas\nbayad bw aan niz update shavad.",
     "comments": "",
-    "x": 3714.567123413086,
-    "y": 3842.2857208251953,
-    "z": "2414cd0b.85dac2",
+    "x": 3716.567123413086,
+    "y": 3793.2857208251953,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "931a7a68.51c848",
+    "id": "cb5f4cbc.1262b8",
     "type": "save",
     "name": "get all-vpn-bindings from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-bindings\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4467.100326538086,
-    "y": 4116.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4469.100326538086,
+    "y": 4067.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "810ab4c1.abf7e",
-        "4e13a1b8.dde8c",
-        "e5e81f70.f40458"
+        "e967ddfe.3a6e28",
+        "90c367c2.c3898",
+        "a6021f01.4f12a"
       ]
     ]
   },
   {
-    "id": "c0e77edb.5b02c",
+    "id": "1401df85.96017",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4575.100570678711,
-    "y": 4072.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 4577.100570678711,
+    "y": 4023.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "810ab4c1.abf7e",
+    "id": "e967ddfe.3a6e28",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4672.100326538086,
-    "y": 4113.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4674.100326538086,
+    "y": 4064.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fa4e460e.6cd96"
+        "358ef01b.aa0e8"
       ]
     ]
   },
   {
-    "id": "4e13a1b8.dde8c",
+    "id": "90c367c2.c3898",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4655.591293334961,
-    "y": 4174.976455688477,
-    "z": "2414cd0b.85dac2",
+    "x": 4657.591293334961,
+    "y": 4125.976455688477,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4d1c0281.9a84bc"
+        "e4912ec.a7606d"
       ]
     ]
   },
   {
-    "id": "e5e81f70.f40458",
+    "id": "a6021f01.4f12a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4653.100326538086,
-    "y": 4218.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4655.100326538086,
+    "y": 4169.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5961321d.8806a4"
+        "ac2440d8.b536c"
       ]
     ]
   },
   {
-    "id": "fa4e460e.6cd96",
+    "id": "358ef01b.aa0e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4840.100570678711,
-    "y": 4108.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4842.100570678711,
+    "y": 4059.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4d09e7f7.7140b8"
+        "f658df6.9a7612"
       ]
     ]
   },
   {
-    "id": "4d1c0281.9a84bc",
+    "id": "e4912ec.a7606d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 4818.162704467773,
-    "y": 4175.262191772461,
-    "z": "2414cd0b.85dac2",
+    "x": 4820.162704467773,
+    "y": 4126.262191772461,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "5961321d.8806a4",
+    "id": "ac2440d8.b536c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4820.100326538086,
-    "y": 4217.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4822.100326538086,
+    "y": 4168.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4d09e7f7.7140b8",
+    "id": "f658df6.9a7612",
     "type": "for",
     "name": "for vpnidx in all-vpn-bindings",
     "xml": "<for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5078.100570678711,
-    "y": 4113.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 5080.100570678711,
+    "y": 4064.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "45b87759.5a906"
+        "d609729e.4f23e"
       ]
     ]
   },
   {
-    "id": "45b87759.5a906",
+    "id": "d609729e.4f23e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5312.100326538086,
-    "y": 4120.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 5314.100326538086,
+    "y": 4071.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c808b6be.91a2f"
+        "f1d3809d.7253c8"
       ]
     ]
   },
   {
-    "id": "f4ea682a.e63f08",
+    "id": "ca40fb3f.0ddd08",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4445.800033569336,
-    "y": 4042.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 4447.800033569336,
+    "y": 3993.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1d230bf5.a23cfc",
+    "id": "1e5e2cd.ecb6453",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5728.949935913086,
-    "y": 4130.985427856445,
-    "z": "2414cd0b.85dac2",
+    "x": 5730.949935913086,
+    "y": 4081.9854278564453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "516d68ca.7c7f6"
+        "960f8364.63d43"
       ]
     ]
   },
   {
-    "id": "516d68ca.7c7f6",
+    "id": "960f8364.63d43",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5920.949935913086,
-    "y": 4119.98567199707,
-    "z": "2414cd0b.85dac2",
+    "x": 5922.949935913086,
+    "y": 4070.9856719970703,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "39e7022f.c30a2e"
+        "f97c2bb4.e56a"
       ]
     ]
   },
   {
-    "id": "39e7022f.c30a2e",
+    "id": "f97c2bb4.e56a",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6102.949935913086,
-    "y": 4098.98567199707,
-    "z": "2414cd0b.85dac2",
+    "x": 6104.949935913086,
+    "y": 4049.9856719970703,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "455228ea.3ce16"
+        "b79d4999.d7cb98"
       ]
     ]
   },
   {
-    "id": "455228ea.3ce16",
+    "id": "b79d4999.d7cb98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 6264.949935913086,
-    "y": 4087.9856719970703,
-    "z": "2414cd0b.85dac2",
+    "x": 6266.949935913086,
+    "y": 4038.9856719970703,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "826e861c.8cb3f8",
-        "78a2c33b.328edc"
+        "722e24a9.0c2c14",
+        "e69b5880.065b08"
       ]
     ]
   },
   {
-    "id": "826e861c.8cb3f8",
+    "id": "722e24a9.0c2c14",
     "type": "set",
     "name": "unset tmp.the-connectivity",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
     "comments": "",
-    "x": 6461.949935913086,
-    "y": 4016.9856719970703,
-    "z": "2414cd0b.85dac2",
+    "x": 6463.949935913086,
+    "y": 3967.9856719970703,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d1bcb0d5.b833a",
+    "id": "ee3fdd91.33b3e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5635.900131225586,
-    "y": 4245.985427856445,
-    "z": "2414cd0b.85dac2",
+    "x": 5637.900131225586,
+    "y": 4196.985427856445,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c5f7e346.0cad5",
-        "1d230bf5.a23cfc",
-        "1966547c.c3884c",
-        "d31d83e1.8d9b98"
+        "33a4fd6a.f05cf2",
+        "1e5e2cd.ecb6453",
+        "126e49f8.4ace7e",
+        "fdd429d6.294198"
       ]
     ]
   },
   {
-    "id": "1966547c.c3884c",
+    "id": "126e49f8.4ace7e",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5767.466537475586,
-    "y": 4021.2024688720703,
-    "z": "2414cd0b.85dac2",
+    "x": 5769.466537475586,
+    "y": 3972.2024688720703,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d31d83e1.8d9b98",
+    "id": "fdd429d6.294198",
     "type": "set",
     "name": "set tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`\" />\n",
     "comments": "",
-    "x": 5759.466537475586,
-    "y": 4070.2024688720703,
-    "z": "2414cd0b.85dac2",
+    "x": 5761.466537475586,
+    "y": 4021.2024688720703,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "78a2c33b.328edc",
+    "id": "e69b5880.065b08",
     "type": "set",
     "name": "set tmp.the-connectivity.connectivity-id",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.connectivity-id' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",
     "comments": "",
-    "x": 6467.416732788086,
-    "y": 4126.20246887207,
-    "z": "2414cd0b.85dac2",
+    "x": 6469.416732788086,
+    "y": 4077.2024688720703,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b4318014.e1a038",
+    "id": "bca47127.d5cfd8",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 5760.683334350586,
-    "y": 3844.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 5762.683334350586,
+    "y": 3795.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "985ed7d4.ec17a",
+    "id": "16b26942.410c5f",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5914.683334350586,
-    "y": 3896.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 5916.683334350586,
+    "y": 3847.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "f77cd261.9bc248",
+    "id": "575e916.aaad5f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5505.683334350586,
-    "y": 3963.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 5507.683334350586,
+    "y": 3914.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "985ed7d4.ec17a",
-        "543e7c89.750024",
-        "b4318014.e1a038"
+        "16b26942.410c5f",
+        "4e79a048.28ceb8",
+        "bca47127.d5cfd8"
       ]
     ]
   },
   {
-    "id": "543e7c89.750024",
+    "id": "4e79a048.28ceb8",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5759.683334350586,
-    "y": 3951.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 5761.683334350586,
+    "y": 3902.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8bf41864.55ad6"
+        "d6032421.ea99d8"
       ]
     ]
   },
   {
-    "id": "8bf41864.55ad6",
+    "id": "d6032421.ea99d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5938.683334350586,
-    "y": 3950.4024200439453,
-    "z": "2414cd0b.85dac2",
+    "x": 5940.683334350586,
+    "y": 3901.4024200439453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "d1bcb0d5.b833a"
+        "ee3fdd91.33b3e8"
       ]
     ]
   },
   {
-    "id": "fc947668.8a9d8",
+    "id": "eb8749e3.22de7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4636.683334350586,
-    "y": 7468.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4638.683334350586,
+    "y": 7419.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9818a5dd.1c569",
-        "2b482f66.6e7e5",
-        "43c9acaa.ef761c"
+        "aa8c3669.88cdf8",
+        "fad2776b.9a9d28",
+        "2612fef6.812a92"
       ]
     ]
   },
   {
-    "id": "43c9acaa.ef761c",
+    "id": "2612fef6.812a92",
     "type": "set",
     "name": "set vpnNameToSearch",
     "xml": "<set>\n<parameter name='vpnNameToSearch' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`\" />\n",
     "comments": "",
-    "x": 4859.683334350586,
-    "y": 7412.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4861.683334350586,
+    "y": 7363.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9818a5dd.1c569",
+    "id": "aa8c3669.88cdf8",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-searchVpnName",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5038.683334350586,
-    "y": 7455.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 5040.683334350586,
+    "y": 7406.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "2b482f66.6e7e5",
+    "id": "fad2776b.9a9d28",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4883.683334350586,
-    "y": 7510.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4885.683334350586,
+    "y": 7461.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e0a7a605.9205d8"
+        "2437b1d5.2f95e6"
       ]
     ]
   },
   {
-    "id": "e0a7a605.9205d8",
+    "id": "2437b1d5.2f95e6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5062.683334350586,
-    "y": 7509.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 5064.683334350586,
+    "y": 7460.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "86241828.71762"
+        "268cfed4.3ed072"
       ]
     ]
   },
   {
-    "id": "811fcd41.48413",
+    "id": "f140933b.8acec",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4793.683334350586,
-    "y": 7148.402420043945,
-    "z": "2414cd0b.85dac2",
+    "x": 4795.683334350586,
+    "y": 7099.402420043945,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9cc0dadb.189ef",
+    "id": "c1a83ef0.efb158",
     "type": "set",
     "name": "unset secondary related variables",
     "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
     "comments": "",
-    "x": 3359.2999420166016,
-    "y": 542.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 3361.2999420166016,
+    "y": 493.85240173339844,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "79c99b01.4060a4",
+    "id": "30c464f6.21891c",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4134.399429321289,
-    "y": 603.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 4136.399429321289,
+    "y": 554.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4bbb66bd.93eca"
+        "92681273.ecf0b8"
       ]
     ]
   },
   {
-    "id": "4bbb66bd.93eca",
+    "id": "92681273.ecf0b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4303.399429321289,
-    "y": 600.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 4305.399429321289,
+    "y": 551.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "506bfd50.24ebdc",
-        "e2033e30.afcd1"
+        "c003a5ba.a5cd",
+        "f6645586.4c0b38"
       ]
     ]
   },
   {
-    "id": "506bfd50.24ebdc",
+    "id": "c003a5ba.a5cd",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4527.399429321289,
-    "y": 633.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 4529.399429321289,
+    "y": 584.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e2033e30.afcd1",
+    "id": "f6645586.4c0b38",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
     "comments": "",
-    "x": 4473.399429321289,
-    "y": 673.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 4475.399429321289,
+    "y": 624.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fb5e94da.526bd",
+    "id": "513e1ab4.43497c",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4099.399917602539,
-    "y": 803.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 4101.399917602539,
+    "y": 754.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2507bbe.52fb3c4"
+        "b7c1f5eb.1c0428"
       ]
     ]
   },
   {
-    "id": "2507bbe.52fb3c4",
+    "id": "b7c1f5eb.1c0428",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4264.399185180664,
-    "y": 808.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 4266.399185180664,
+    "y": 759.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "93fd5f76.e542d8",
-        "736d4375.48de7c"
+        "8d3bba48.eab118",
+        "ecf8bfe7.1b0ad8"
       ]
     ]
   },
   {
-    "id": "93fd5f76.e542d8",
+    "id": "8d3bba48.eab118",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4511.399429321289,
-    "y": 890.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 4513.399429321289,
+    "y": 841.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "736d4375.48de7c",
+    "id": "ecf8bfe7.1b0ad8",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4457.399429321289,
-    "y": 930.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 4459.399429321289,
+    "y": 881.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e9c6a99.90dcbd8",
+    "id": "8429e2be.11d098",
     "type": "save",
     "name": "get network-route-three from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
     "comments": "",
     "outputs": 1,
-    "x": 3342.399917602539,
-    "y": 942.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 3344.399917602539,
+    "y": 893.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "554ea6a8.9888f",
-        "3be7a41.d9c04dc",
-        "65e70654.5cdcc8"
+        "ad35aa48.056498",
+        "881c5027.ef1da8",
+        "c8b7bc97.b40ba"
       ]
     ]
   },
   {
-    "id": "554ea6a8.9888f",
+    "id": "ad35aa48.056498",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3584.399917602539,
-    "y": 935.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 3586.399917602539,
+    "y": 886.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3be7a41.d9c04dc",
+    "id": "881c5027.ef1da8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3579.908981323242,
-    "y": 977.4784698486328,
-    "z": "2414cd0b.85dac2",
+    "x": 3581.908981323242,
+    "y": 928.4784698486328,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "65e70654.5cdcc8",
+    "id": "c8b7bc97.b40ba",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3583.908950805664,
-    "y": 1025.4784393310547,
-    "z": "2414cd0b.85dac2",
+    "x": 3585.908950805664,
+    "y": 976.4784393310547,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "834a986c.4e7048"
+        "9ce363a2.dd0398"
       ]
     ]
   },
   {
-    "id": "834a986c.4e7048",
+    "id": "9ce363a2.dd0398",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3745.399917602539,
-    "y": 966.0524139404297,
-    "z": "2414cd0b.85dac2",
+    "x": 3747.399917602539,
+    "y": 917.0524139404297,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f5a8155b.186e1"
+        "411baca6.4afa04"
       ]
     ]
   },
   {
-    "id": "f5a8155b.186e1",
+    "id": "411baca6.4afa04",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3916.399917602539,
-    "y": 966.0525970458984,
-    "z": "2414cd0b.85dac2",
+    "x": 3918.399917602539,
+    "y": 917.0525970458984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "49a01940.91879",
-        "fb61a82e.a48e6",
-        "bf3bb014.cd44d"
+        "d6c02163.09f2f",
+        "26b7eb30.1a16a4",
+        "96d019f1.51b6c"
       ]
     ]
   },
   {
-    "id": "49a01940.91879",
+    "id": "d6c02163.09f2f",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4083.399673461914,
-    "y": 876.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4085.399673461914,
+    "y": 827.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "13796778.1bcaa1"
+        "a0fe031a.dea47"
       ]
     ]
   },
   {
-    "id": "fb61a82e.a48e6",
+    "id": "26b7eb30.1a16a4",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4085.399673461914,
-    "y": 930.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4087.399673461914,
+    "y": 881.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "dfa37602.2a592"
+        "229f8aa8.94f7fe"
       ]
     ]
   },
   {
-    "id": "13796778.1bcaa1",
+    "id": "a0fe031a.dea47",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4211.399673461914,
-    "y": 876.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4213.399673461914,
+    "y": 827.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c61c7290.5d0048",
-        "9330928e.78e4a8"
+        "4f78be1b.93fa4",
+        "f44f2336.c1f56"
       ]
     ]
   },
   {
-    "id": "dfa37602.2a592",
+    "id": "229f8aa8.94f7fe",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4214.399673461914,
-    "y": 929.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4216.399673461914,
+    "y": 880.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b3bef05d.261898",
-        "4885c383.a5f124"
+        "a67f23a8.85781",
+        "587a77f8.86931"
       ]
     ]
   },
   {
-    "id": "9330928e.78e4a8",
+    "id": "f44f2336.c1f56",
     "type": "set",
     "name": "set network-route-B",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4457.399429321289,
-    "y": 1015.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4459.399429321289,
+    "y": 966.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b3bef05d.261898",
+    "id": "a67f23a8.85781",
     "type": "set",
     "name": "set network-route-LEAF",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4474.399429321289,
-    "y": 1057.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4476.399429321289,
+    "y": 1008.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4885c383.a5f124",
+    "id": "587a77f8.86931",
     "type": "set",
     "name": "set network-route-A",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4459.399429321289,
-    "y": 1095.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4461.399429321289,
+    "y": 1046.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c61c7290.5d0048",
+    "id": "4f78be1b.93fa4",
     "type": "set",
     "name": "set network-route-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
     "comments": "",
-    "x": 4471.399429321289,
-    "y": 975.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4473.399429321289,
+    "y": 926.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3c2a776f.fcd778",
+    "id": "fcadc9d5.a748f8",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4636.399429321289,
-    "y": 991.0525360107422,
-    "z": "2414cd0b.85dac2",
+    "x": 4638.399429321289,
+    "y": 942.0525360107422,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bf3bb014.cd44d",
+    "id": "96d019f1.51b6c",
     "type": "outcome",
     "name": "SECONDARY-ROOT",
     "xml": "<outcome value='SECONDARY-ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4024.399917602539,
-    "y": 1021.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 4026.399917602539,
+    "y": 972.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4b490f7e.359388"
+        "af991ebb.5e627"
       ]
     ]
   },
   {
-    "id": "4b490f7e.359388",
+    "id": "af991ebb.5e627",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4198.399917602539,
-    "y": 1016.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 4200.399917602539,
+    "y": 967.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "14062c05.c0d224",
-        "a29138d9.9f86a8"
+        "f09b675e.f8da7",
+        "2dc559.0e4fdaa8"
       ]
     ]
   },
   {
-    "id": "a29138d9.9f86a8",
+    "id": "2dc559.0e4fdaa8",
     "type": "set",
     "name": "set network-route-C",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4431.399429321289,
-    "y": 1185.0522918701172,
-    "z": "2414cd0b.85dac2",
+    "x": 4433.399429321289,
+    "y": 1136.0522918701172,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "14062c05.c0d224",
+    "id": "f09b675e.f8da7",
     "type": "set",
     "name": "set network-route-SECONDARY-ROOT",
     "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
     "comments": "",
-    "x": 4485.399429321289,
-    "y": 1145.0522918701172,
-    "z": "2414cd0b.85dac2",
+    "x": 4487.399429321289,
+    "y": 1096.0522918701172,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "de8acab8.aa46c",
+    "id": "5c549048.27d988",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4599.399429321289,
-    "y": 1170.0522918701172,
-    "z": "2414cd0b.85dac2",
+    "x": 4601.399429321289,
+    "y": 1121.0522918701172,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "fd1dbeb5.643a7",
+    "id": "f87c2434.973ea",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3600.066665649414,
-    "y": 2250.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3602.066665649414,
+    "y": 2201.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c723b1c5.5db71",
-        "935dac93.06ba68"
+        "5b1e0335.2e861c",
+        "c761c99f.075528"
       ]
     ]
   },
   {
-    "id": "bc4d7dbf.afb29",
+    "id": "7e1476f1.6750f8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3427.400161743164,
-    "y": 2251.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3429.400161743164,
+    "y": 2202.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "fd1dbeb5.643a7"
+        "f87c2434.973ea"
       ]
     ]
   },
   {
-    "id": "e6ea02c1.c3c8b",
+    "id": "6c010aa3.624334",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3436.891128540039,
-    "y": 2293.8597869873047,
-    "z": "2414cd0b.85dac2",
+    "x": 3438.891128540039,
+    "y": 2244.8597869873047,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "4af5d292.f0e44c",
+    "id": "72d07b8a.849984",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3425.400161743164,
-    "y": 2340.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3427.400161743164,
+    "y": 2291.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c723b1c5.5db71",
+    "id": "5b1e0335.2e861c",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3886.400161743164,
-    "y": 2254.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3888.400161743164,
+    "y": 2205.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e1f3a987.bed2a8",
-        "cd75a949.bbc878"
+        "279a9ed1.bf6a32",
+        "e13b8d61.77167"
       ]
     ]
   },
   {
-    "id": "cd75a949.bbc878",
+    "id": "e13b8d61.77167",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4109.400161743164,
-    "y": 2209.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4111.400161743164,
+    "y": 2160.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c2b43a53.588108"
+        "76113157.988ef"
       ]
     ]
   },
   {
-    "id": "e1f3a987.bed2a8",
+    "id": "279a9ed1.bf6a32",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4111.400161743164,
-    "y": 2273.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4113.400161743164,
+    "y": 2224.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "183afe84.247bf9"
+        "26da469d.16a06a"
       ]
     ]
   },
   {
-    "id": "25934f35.38edd",
+    "id": "d7f7c5fa.4c43d8",
     "type": "save",
     "name": "get p-interface-dst from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3199.400161743164,
-    "y": 2286.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3201.400161743164,
+    "y": 2237.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bc4d7dbf.afb29",
-        "e6ea02c1.c3c8b",
-        "4af5d292.f0e44c"
+        "7e1476f1.6750f8",
+        "6c010aa3.624334",
+        "72d07b8a.849984"
       ]
     ]
   },
   {
-    "id": "e6f36ca.9e7909",
+    "id": "1989a06e.d4f03",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3160.400161743164,
-    "y": 2230.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3162.400161743164,
+    "y": 2181.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4a92500a.dfe688",
+    "id": "334ad959.cb8dd6",
     "type": "execute",
     "name": "execute split tp-id to get pnf-name",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3219.400161743164,
-    "y": 2026.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3221.400161743164,
+    "y": 1977.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f38e9f0f.aeb28",
-        "c00bcf8d.007da8"
+        "52bf5f88.b043b",
+        "50b4842f.e69cbc"
       ]
     ]
   },
   {
-    "id": "c00bcf8d.007da8",
+    "id": "50b4842f.e69cbc",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3442.400161743164,
-    "y": 2012.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3444.400161743164,
+    "y": 1963.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8c221cd.f6641e"
+        "a9726b2d.fccd7"
       ]
     ]
   },
   {
-    "id": "f38e9f0f.aeb28",
+    "id": "52bf5f88.b043b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3444.400161743164,
-    "y": 2045.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3446.400161743164,
+    "y": 1996.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "8c221cd.f6641e",
+    "id": "a9726b2d.fccd7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3590.400161743164,
-    "y": 2005.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3592.400161743164,
+    "y": 1956.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7fdb72b7.69f4e4",
-        "70d5d0aa.d1559"
+        "5ee377e.4e34b08",
+        "eb05f6d8.e8b8d8"
       ]
     ]
   },
   {
-    "id": "7fdb72b7.69f4e4",
+    "id": "5ee377e.4e34b08",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
     "comments": "",
-    "x": 3784.400161743164,
-    "y": 2008.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3786.400161743164,
+    "y": 1959.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "935dac93.06ba68",
+    "id": "c761c99f.075528",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3837.400131225586,
-    "y": 2377.2857208251953,
-    "z": "2414cd0b.85dac2",
+    "x": 3839.400131225586,
+    "y": 2328.2857208251953,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bb098115.17482"
+        "82e8744d.2f169"
       ]
     ]
   },
   {
-    "id": "bb098115.17482",
+    "id": "82e8744d.2f169",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4043.400131225586,
-    "y": 2377.2857208251953,
-    "z": "2414cd0b.85dac2",
+    "x": 4045.400131225586,
+    "y": 2328.2857208251953,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "eb63cf64.6fcac8"
+        "fde94d7a.1c1f78"
       ]
     ]
   },
   {
-    "id": "70d5d0aa.d1559",
+    "id": "eb05f6d8.e8b8d8",
     "type": "get-resource",
     "name": "get-resource src pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
     "comments": "",
     "outputs": 1,
-    "x": 3806.400161743164,
-    "y": 2076.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3808.400161743164,
+    "y": 2027.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4772aa88.8815f4",
-        "2f88517d.a786fe",
-        "a51a10da.7f1bc8"
+        "4c08dffc.53f9b",
+        "367fe0d1.441908",
+        "e6dd27d7.84d748"
       ]
     ]
   },
   {
-    "id": "4772aa88.8815f4",
+    "id": "4c08dffc.53f9b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4001.9002838134766,
-    "y": 2028.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4003.9002838134766,
+    "y": 1979.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bea56767.e75718"
+        "335d38ec.2d1a38"
       ]
     ]
   },
   {
-    "id": "2f88517d.a786fe",
+    "id": "367fe0d1.441908",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3993.9002838134766,
-    "y": 2083.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 3995.9002838134766,
+    "y": 2034.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3775c8.545c2238"
+        "d6efed88.7d53"
       ]
     ]
   },
   {
-    "id": "a51a10da.7f1bc8",
+    "id": "e6dd27d7.84d748",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3998.9002838134766,
-    "y": 2140.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4000.9002838134766,
+    "y": 2091.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "afbc062e.468e"
+        "177f57a1.3eb1f8"
       ]
     ]
   },
   {
-    "id": "afbc062e.468e",
+    "id": "177f57a1.3eb1f8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4150.900283813477,
-    "y": 2141.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4152.900283813477,
+    "y": 2092.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "bea56767.e75718",
+    "id": "335d38ec.2d1a38",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4146.282608032227,
-    "y": 2025.9415435791016,
-    "z": "2414cd0b.85dac2",
+    "x": 4148.282608032227,
+    "y": 1976.9415435791016,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "80389683.dd0d1"
+        "6ad02bf1.79a934"
       ]
     ]
   },
   {
-    "id": "77f3463a.2b447",
+    "id": "4bfd3207.06ef5c",
     "type": "set",
     "name": "set SECONDARY-ROOT stuff",
     "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
     "comments": "",
-    "x": 3222.066665649414,
-    "y": 2365.2857513427734,
-    "z": "2414cd0b.85dac2",
+    "x": 3224.066665649414,
+    "y": 2316.2857513427734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "75f1943f.b94b8c",
+    "id": "7f049b99.392e44",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3897.066635131836,
-    "y": 2329.2857208251953,
-    "z": "2414cd0b.85dac2",
+    "x": 3899.066635131836,
+    "y": 2280.2857208251953,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "183afe84.247bf9",
+    "id": "26da469d.16a06a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
     "comments": "",
-    "x": 4270.400161743164,
-    "y": 2292.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4272.400161743164,
+    "y": 2243.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c2b43a53.588108",
+    "id": "76113157.988ef",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4274.400161743164,
-    "y": 2206.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4276.400161743164,
+    "y": 2157.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "62ce6308.22a894",
-        "3f411974.bc06ee"
+        "9aa2a686.be54a8",
+        "433203.bfdcb5fc"
       ]
     ]
   },
   {
-    "id": "eb63cf64.6fcac8",
+    "id": "fde94d7a.1c1f78",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4260.685775756836,
-    "y": 2376.1074981689453,
-    "z": "2414cd0b.85dac2",
+    "x": 4262.685775756836,
+    "y": 2327.1074981689453,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "68a23803.3ba65"
+        "2950d492.5666c4"
       ]
     ]
   },
   {
-    "id": "3775c8.545c2238",
+    "id": "d6efed88.7d53",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 4161.900283813477,
-    "y": 2086.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4163.900283813477,
+    "y": 2037.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "62ce6308.22a894",
+    "id": "9aa2a686.be54a8",
     "type": "set",
     "name": "set ltpId",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
     "comments": "",
-    "x": 4444.400161743164,
-    "y": 2167.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4446.400161743164,
+    "y": 2118.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3f411974.bc06ee",
+    "id": "433203.bfdcb5fc",
     "type": "set",
     "name": "set pnf-name",
     "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
     "comments": "",
-    "x": 4445.400161743164,
-    "y": 2272.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4447.400161743164,
+    "y": 2223.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6316b810.f1aee8",
+    "id": "279b9c4d.6439cc",
     "type": "comment",
     "name": "TODO: FIXME",
     "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
     "comments": "",
-    "x": 4440.400161743164,
-    "y": 2221.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4442.400161743164,
+    "y": 2172.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "68a23803.3ba65",
+    "id": "2950d492.5666c4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4467.517318725586,
-    "y": 2365.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 4469.517318725586,
+    "y": 2316.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "affb5b24.b6cca8",
-        "4a56bfa4.77eef",
-        "2836e90b.67e1be"
+        "27d287be.22449",
+        "54646993.252b48",
+        "ce1fcbcf.439b7"
       ]
     ]
   },
   {
-    "id": "affb5b24.b6cca8",
+    "id": "27d287be.22449",
     "type": "set",
     "name": "set destination ttp-id",
     "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4682.517318725586,
-    "y": 2327.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 4684.517318725586,
+    "y": 2278.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4a56bfa4.77eef",
+    "id": "54646993.252b48",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4679.517318725586,
-    "y": 2366.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 4681.517318725586,
+    "y": 2317.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "963f6cd5.b5f28"
+        "4c6f5d99.cc2504"
       ]
     ]
   },
   {
-    "id": "2836e90b.67e1be",
+    "id": "ce1fcbcf.439b7",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4635.017318725586,
-    "y": 2408.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 4637.017318725586,
+    "y": 2359.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2cd6b3b7.1e0b44",
+    "id": "20c12f13.f01e2",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4728.400161743164,
-    "y": 2044.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4730.400161743164,
+    "y": 1995.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "af33acb2.7cd3c"
+        "2b8eec9f.d7eabc"
       ]
     ]
   },
   {
-    "id": "80389683.dd0d1",
+    "id": "6ad02bf1.79a934",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 4330.400161743164,
-    "y": 2040.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4332.400161743164,
+    "y": 1991.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6ef2734a.a2ab44"
+        "656e6085.f2c5b8"
       ]
     ]
   },
   {
-    "id": "6ef2734a.a2ab44",
+    "id": "656e6085.f2c5b8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4525.400161743164,
-    "y": 2040.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4527.400161743164,
+    "y": 1991.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2cd6b3b7.1e0b44",
-        "a9acfdfb.534e9"
+        "20c12f13.f01e2",
+        "f43b8884.ec34f"
       ]
     ]
   },
   {
-    "id": "a9acfdfb.534e9",
+    "id": "f43b8884.ec34f",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4730.400161743164,
-    "y": 2117.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4732.400161743164,
+    "y": 2068.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3ae5ea54.6e54a6"
+        "16e499c4.79bb2e"
       ]
     ]
   },
   {
-    "id": "963f6cd5.b5f28",
+    "id": "4c6f5d99.cc2504",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4860.017318725586,
-    "y": 2365.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 4862.017318725586,
+    "y": 2316.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e92c023f.140be8"
+        "955e8579.618ad8"
       ]
     ]
   },
   {
-    "id": "e92c023f.140be8",
+    "id": "955e8579.618ad8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5018.017318725586,
-    "y": 2365.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 5020.017318725586,
+    "y": 2316.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b67ecfac.fb906"
+        "7f2dc653.30af1"
       ]
     ]
   },
   {
-    "id": "b67ecfac.fb906",
+    "id": "7f2dc653.30af1",
     "type": "set",
     "name": "set destination tunnel tp ip",
     "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5225.017318725586,
-    "y": 2365.626174926758,
-    "z": "2414cd0b.85dac2",
+    "x": 5227.017318725586,
+    "y": 2316.626174926758,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "af33acb2.7cd3c",
+    "id": "2b8eec9f.d7eabc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4905.400161743164,
-    "y": 2036.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4907.400161743164,
+    "y": 1987.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "21a9bcb5.4aa85c",
-        "c4167bd6.551f58"
+        "6743bfb3.fe491",
+        "f129d672.d83d38"
       ]
     ]
   },
   {
-    "id": "c4167bd6.551f58",
+    "id": "f129d672.d83d38",
     "type": "execute",
     "name": "get esr-thirdparty-sdnc",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
     "comments": "",
     "outputs": 1,
-    "x": 5113.400161743164,
-    "y": 2043.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5115.400161743164,
+    "y": 1994.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8ae061a9.0d8d7",
-        "7fc92de3.a78f3c",
-        "220302ba.be0f7e"
+        "2fcdf070.6eea68",
+        "1f831cdc.092a93",
+        "38d0f9ee.3ac5f6"
       ]
     ]
   },
   {
-    "id": "3ae5ea54.6e54a6",
+    "id": "16e499c4.79bb2e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4907.400161743164,
-    "y": 2109.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 4909.400161743164,
+    "y": 2060.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "256fff1.5dd26"
+        "7af0e2e8.47fa2c"
       ]
     ]
   },
   {
-    "id": "21a9bcb5.4aa85c",
+    "id": "6743bfb3.fe491",
     "type": "set",
     "name": "set esr-thirdparty-sdnc domainC id",
     "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5143.400161743164,
-    "y": 1991.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5145.400161743164,
+    "y": 1942.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "256fff1.5dd26",
+    "id": "7af0e2e8.47fa2c",
     "type": "set",
     "name": "set domainC ethernet layer network-id",
     "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 5142.400161743164,
-    "y": 2233.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5144.400161743164,
+    "y": 2184.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "8ae061a9.0d8d7",
+    "id": "2fcdf070.6eea68",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5323.400161743164,
-    "y": 2034.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5325.400161743164,
+    "y": 1985.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "9c166c79.f96aa8"
+        "c8f2d024.71cdc8"
       ]
     ]
   },
   {
-    "id": "7fc92de3.a78f3c",
+    "id": "1f831cdc.092a93",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5315.400161743164,
-    "y": 2089.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5317.400161743164,
+    "y": 2040.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f289682c.7a8f28"
+        "67195fbd.2c818"
       ]
     ]
   },
   {
-    "id": "220302ba.be0f7e",
+    "id": "38d0f9ee.3ac5f6",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5320.400161743164,
-    "y": 2146.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5322.400161743164,
+    "y": 2097.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "700667b1.628978"
+        "a92d2828.f616b8"
       ]
     ]
   },
   {
-    "id": "700667b1.628978",
+    "id": "a92d2828.f616b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5472.400161743164,
-    "y": 2147.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5474.400161743164,
+    "y": 2098.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "f289682c.7a8f28",
+    "id": "67195fbd.2c818",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
     "comments": "",
-    "x": 5483.400161743164,
-    "y": 2092.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5485.400161743164,
+    "y": 2043.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "9c166c79.f96aa8",
+    "id": "c8f2d024.71cdc8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5467.782485961914,
-    "y": 2031.9415435791016,
-    "z": "2414cd0b.85dac2",
+    "x": 5469.782485961914,
+    "y": 1982.9415435791016,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "cc2fb272.8011c"
+        "2e63be54.b089ca"
       ]
     ]
   },
   {
-    "id": "cc2fb272.8011c",
+    "id": "2e63be54.b089ca",
     "type": "set",
     "name": "set controller domainC data",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
     "comments": "",
-    "x": 5682.400161743164,
-    "y": 2028.285873413086,
-    "z": "2414cd0b.85dac2",
+    "x": 5684.400161743164,
+    "y": 1979.285873413086,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "6be3a1db.a02ba8",
+    "id": "7237f1d4.deff98",
     "type": "comment",
     "name": "Create SECONDARY-ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 5711.900161743164,
-    "y": 2151.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 5713.900161743164,
+    "y": 2102.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "c91e3a5e.c6511",
+    "id": "f8b29c6c.19b2e8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5684.016860961914,
-    "y": 2200.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5686.016860961914,
+    "y": 2151.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8269b8aa.68a3b"
+        "6fed43d1.51eac4"
       ]
     ]
   },
   {
-    "id": "8269b8aa.68a3b",
+    "id": "6fed43d1.51eac4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5875.016860961914,
-    "y": 2204.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5877.016860961914,
+    "y": 2155.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8a849c85.456228"
+        "419e36dc.a0f56"
       ]
     ]
   },
   {
-    "id": "8a849c85.456228",
+    "id": "419e36dc.a0f56",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6002.016860961914,
-    "y": 2203.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 6004.016860961914,
+    "y": 2154.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5d5d757b.d8e52c",
-        "a560a2f0.7f8828"
+        "38e4a1b4.0b7b5e",
+        "e98accf8.e7a08"
       ]
     ]
   },
   {
-    "id": "a560a2f0.7f8828",
+    "id": "e98accf8.e7a08",
     "type": "save",
     "name": "save SECONDARY-ROOT UNI in AAI",
     "xml": "<save 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='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6224.016860961914,
-    "y": 2092.1690521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 6226.016860961914,
+    "y": 2043.1690521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5d5d757b.d8e52c",
+    "id": "38e4a1b4.0b7b5e",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6219.900161743164,
-    "y": 2151.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6221.900161743164,
+    "y": 2102.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "51d8510d.dcc058",
-        "79e7df30.7f8138"
+        "d45ed8c9.67af08",
+        "a74deeb1.a26ec"
       ]
     ]
   },
   {
-    "id": "51d8510d.dcc058",
+    "id": "d45ed8c9.67af08",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6429.900161743164,
-    "y": 2128.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6431.900161743164,
+    "y": 2079.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b3aa8483.9bdec"
+        "c2c70bd5.e2175"
       ]
     ]
   },
   {
-    "id": "b3aa8483.9bdec",
+    "id": "c2c70bd5.e2175",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6555.900161743164,
-    "y": 2128.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6557.900161743164,
+    "y": 2079.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "50564c45.182124"
+        "b21cfff5.d8a4c8"
       ]
     ]
   },
   {
-    "id": "eaeffe9b.6e1578",
+    "id": "92db42c4.6a4d78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6560.900161743164,
-    "y": 2177.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6562.900161743164,
+    "y": 2128.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5ed2f363.68208c",
-        "ad95a077.a4baa8",
-        "283ec58.ad1d4ba",
-        "ccdfc934.795ad8"
+        "a32c1047.9c5c8",
+        "eadb0235.467f7",
+        "5b398d7f.65258c",
+        "7c47a5bb.9c9814"
       ]
     ]
   },
   {
-    "id": "79e7df30.7f8138",
+    "id": "a74deeb1.a26ec",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6434.900161743164,
-    "y": 2177.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6436.900161743164,
+    "y": 2128.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "eaeffe9b.6e1578"
+        "92db42c4.6a4d78"
       ]
     ]
   },
   {
-    "id": "50564c45.182124",
+    "id": "b21cfff5.d8a4c8",
     "type": "save",
     "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6883.900161743164,
-    "y": 2125.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6885.900161743164,
+    "y": 2076.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5ed2f363.68208c",
+    "id": "a32c1047.9c5c8",
     "type": "execute",
     "name": "execute UUID generator for connectivity domainC",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6836.900161743164,
-    "y": 2216.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6838.900161743164,
+    "y": 2167.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "ad95a077.a4baa8",
+    "id": "eadb0235.467f7",
     "type": "save",
     "name": "save connectivity resource in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->\n<!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->\n<!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6784.900161743164,
-    "y": 2258.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6786.900161743164,
+    "y": 2209.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "283ec58.ad1d4ba",
+    "id": "5b398d7f.65258c",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 6913.900161743164,
-    "y": 2300.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6915.900161743164,
+    "y": 2251.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "192e2e3d.32bda2",
+    "id": "9878fd26.fb04",
     "type": "comment",
     "name": "Create SECONDARY-ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6799.900161743164,
-    "y": 2173.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6801.900161743164,
+    "y": 2124.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "ccdfc934.795ad8",
+    "id": "7c47a5bb.9c9814",
     "type": "save",
     "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 6891.900161743164,
-    "y": 2348.0523529052734,
-    "z": "2414cd0b.85dac2",
+    "x": 6893.900161743164,
+    "y": 2299.0523529052734,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "162cf27b.802c36",
+    "id": "374c089f.fa2538",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6455.900161743164,
-    "y": 2844.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6457.900161743164,
+    "y": 2795.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "b694c10f.97993"
+        "e0f14a64.4f8738"
       ]
     ]
   },
   {
-    "id": "b694c10f.97993",
+    "id": "e0f14a64.4f8738",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6647.900161743164,
-    "y": 2839.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6649.900161743164,
+    "y": 2790.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5f9a1d2b.927d2c"
+        "db26ab33.fe7e58"
       ]
     ]
   },
   {
-    "id": "5f9a1d2b.927d2c",
+    "id": "db26ab33.fe7e58",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6776.900161743164,
-    "y": 2839.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6778.900161743164,
+    "y": 2790.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2368c13a.48b366"
+        "26e82d17.b3e8e2"
       ]
     ]
   },
   {
-    "id": "2368c13a.48b366",
+    "id": "26e82d17.b3e8e2",
     "type": "save",
     "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 7108.900161743164,
-    "y": 2837.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 7110.900161743164,
+    "y": 2788.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "5a5c80f6.6318b8",
+    "id": "c9cb4066.4924",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6040.900161743164,
-    "y": 3056.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6042.900161743164,
+    "y": 3007.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c941a0b5.409658"
+        "2a720623.f2b5c2"
       ]
     ]
   },
   {
-    "id": "c941a0b5.409658",
+    "id": "2a720623.f2b5c2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6220.900161743164,
-    "y": 3055.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6222.900161743164,
+    "y": 3006.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e3672c28.52e2c"
+        "af745266.aa6"
       ]
     ]
   },
   {
-    "id": "e3672c28.52e2c",
+    "id": "af745266.aa6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6349.900161743164,
-    "y": 3055.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 6351.900161743164,
+    "y": 3006.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "78510894.01d168"
+        "981d0119.b686c"
       ]
     ]
   },
   {
-    "id": "78510894.01d168",
+    "id": "981d0119.b686c",
     "type": "switchNode",
     "name": "switch 2-ROOTS in same domain?",
     "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6567.783462524414,
-    "y": 3054.7357025146484,
-    "z": "2414cd0b.85dac2",
+    "x": 6569.783462524414,
+    "y": 3005.7357025146484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7f59bec0.83cea8"
+        "365c0f8e.cfd0e"
       ]
     ]
   },
   {
-    "id": "7f59bec0.83cea8",
+    "id": "365c0f8e.cfd0e",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6782.783462524414,
-    "y": 3054.7357025146484,
-    "z": "2414cd0b.85dac2",
+    "x": 6784.783462524414,
+    "y": 3005.7357025146484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bd133df9.897ce8"
+        "5255edd.4efb714"
       ]
     ]
   },
   {
-    "id": "bd133df9.897ce8",
+    "id": "5255edd.4efb714",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 6914.783462524414,
-    "y": 3054.7357025146484,
-    "z": "2414cd0b.85dac2",
+    "x": 6916.783462524414,
+    "y": 3005.7357025146484,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "5e2761fa.54e448"
+        "d5b5d130.3528a"
       ]
     ]
   },
   {
-    "id": "5e2761fa.54e448",
+    "id": "d5b5d130.3528a",
     "type": "save",
     "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 7278.900161743164,
-    "y": 3053.8524017333984,
-    "z": "2414cd0b.85dac2",
+    "x": 7280.900161743164,
+    "y": 3004.8524017333984,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "9f73e0e4.5bd9a8",
+    "id": "615783e8.7114bc",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5011.399185180664,
-    "y": 2704.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5013.399185180664,
+    "y": 2655.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3e0d324f.39029e"
+        "b5a2c9a9.2d0b1"
       ]
     ]
   },
   {
-    "id": "3e0d324f.39029e",
+    "id": "b5a2c9a9.2d0b1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5191.399185180664,
-    "y": 2703.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5193.399185180664,
+    "y": 2654.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "2acf977a.ab8578"
+        "38f8112d.6307b6"
       ]
     ]
   },
   {
-    "id": "2acf977a.ab8578",
+    "id": "38f8112d.6307b6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5320.399185180664,
-    "y": 2703.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5322.399185180664,
+    "y": 2654.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "94be4455.78db28"
+        "73260aa7.cfafe4"
       ]
     ]
   },
   {
-    "id": "83e5c66f.42223",
+    "id": "3fb31c3b.d5983c",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5056.399185180664,
-    "y": 2762.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5058.399185180664,
+    "y": 2713.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "94be4455.78db28",
+    "id": "73260aa7.cfafe4",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5086.399185180664,
-    "y": 2795.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5088.399185180664,
+    "y": 2746.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e215df2d.d0af58",
-        "4a2bacef.6efd64",
-        "5a609856.e771c"
+        "4f61494b.d04d88",
+        "50778a9c.0e895c",
+        "979ddcd.34a972"
       ]
     ]
   },
   {
-    "id": "4a2bacef.6efd64",
+    "id": "50778a9c.0e895c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5267.890151977539,
-    "y": 2772.9932708740234,
-    "z": "2414cd0b.85dac2",
+    "x": 5269.890151977539,
+    "y": 2723.9932708740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "8ad6e6e5.397628"
+        "67ea0823.c7b72"
       ]
     ]
   },
   {
-    "id": "5a609856.e771c",
+    "id": "979ddcd.34a972",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5256.399185180664,
-    "y": 2812.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5258.399185180664,
+    "y": 2763.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e676f166.0b9d7"
+        "c80cb8af.ac2d48"
       ]
     ]
   },
   {
-    "id": "8ad6e6e5.397628",
+    "id": "67ea0823.c7b72",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5427.461685180664,
-    "y": 2771.2789154052734,
-    "z": "2414cd0b.85dac2",
+    "x": 5429.461685180664,
+    "y": 2722.2789154052734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e676f166.0b9d7",
+    "id": "c80cb8af.ac2d48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5417.399185180664,
-    "y": 2813.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5419.399185180664,
+    "y": 2764.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "e215df2d.d0af58",
+    "id": "4f61494b.d04d88",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5261.399185180664,
-    "y": 2849.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5263.399185180664,
+    "y": 2800.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c842a7cf.827af"
+        "ef6cfd54.d63cb8"
       ]
     ]
   },
   {
-    "id": "c842a7cf.827af",
+    "id": "ef6cfd54.d63cb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5419.399185180664,
-    "y": 2857.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5421.399185180664,
+    "y": 2808.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "c480afef.6388b8",
-        "1261035b.27b08d"
+        "d727e5a5.b31118",
+        "c17b79a.0f49c88"
       ]
     ]
   },
   {
-    "id": "c480afef.6388b8",
+    "id": "d727e5a5.b31118",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5580.399185180664,
-    "y": 2789.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5582.399185180664,
+    "y": 2740.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1261035b.27b08d",
+    "id": "c17b79a.0f49c88",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5622.399185180664,
-    "y": 2861.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5624.399185180664,
+    "y": 2812.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "37f3e792.01b98",
+    "id": "9c79a60.2e838d8",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5098.399185180664,
-    "y": 3062.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5100.399185180664,
+    "y": 3013.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f8a6bae7.e43428"
+        "c138ef39.513f8"
       ]
     ]
   },
   {
-    "id": "f8a6bae7.e43428",
+    "id": "c138ef39.513f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5278.399185180664,
-    "y": 3061.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5280.399185180664,
+    "y": 3012.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "ebf9b17f.54212"
+        "8ad866ac.595d58"
       ]
     ]
   },
   {
-    "id": "ebf9b17f.54212",
+    "id": "8ad866ac.595d58",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5407.399185180664,
-    "y": 3061.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5409.399185180664,
+    "y": 3012.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7632b9a7.046188"
+        "17191cff.7c3d3b"
       ]
     ]
   },
   {
-    "id": "a3e62ac2.613cb8",
+    "id": "2bf187fb.3634e8",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5143.399185180664,
-    "y": 3120.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5145.399185180664,
+    "y": 3071.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "7632b9a7.046188",
+    "id": "17191cff.7c3d3b",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 5173.399185180664,
-    "y": 3153.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5175.399185180664,
+    "y": 3104.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "aa9ebc0c.15b74",
-        "34556fac.9550b8",
-        "8f78cb97.869598"
+        "e2951a5a.6753c8",
+        "f24616d3.430fb8",
+        "57d651f0.348b08"
       ]
     ]
   },
   {
-    "id": "34556fac.9550b8",
+    "id": "f24616d3.430fb8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5354.890151977539,
-    "y": 3130.9932708740234,
-    "z": "2414cd0b.85dac2",
+    "x": 5356.890151977539,
+    "y": 3081.9932708740234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "81becde2.b2238"
+        "c95458c9.25b988"
       ]
     ]
   },
   {
-    "id": "8f78cb97.869598",
+    "id": "57d651f0.348b08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5343.399185180664,
-    "y": 3170.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5345.399185180664,
+    "y": 3121.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "1e2ed61a.69a74a"
+        "59776330.9b2ecc"
       ]
     ]
   },
   {
-    "id": "81becde2.b2238",
+    "id": "c95458c9.25b988",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 5514.461685180664,
-    "y": 3129.2789154052734,
-    "z": "2414cd0b.85dac2",
+    "x": 5516.461685180664,
+    "y": 3080.2789154052734,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "1e2ed61a.69a74a",
+    "id": "59776330.9b2ecc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5504.399185180664,
-    "y": 3171.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5506.399185180664,
+    "y": 3122.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "aa9ebc0c.15b74",
+    "id": "e2951a5a.6753c8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5348.399185180664,
-    "y": 3207.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5350.399185180664,
+    "y": 3158.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a5e9d80e.798b58"
+        "1f0787c1.98ffc"
       ]
     ]
   },
   {
-    "id": "a5e9d80e.798b58",
+    "id": "1f0787c1.98ffc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5506.399185180664,
-    "y": 3215.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5508.399185180664,
+    "y": 3166.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f6d35763.a75968",
-        "4c3e3376.aec354"
+        "4ff50da8.51bbec",
+        "fc471e6.a2d406"
       ]
     ]
   },
   {
-    "id": "f6d35763.a75968",
+    "id": "4ff50da8.51bbec",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 5667.399185180664,
-    "y": 3147.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5669.399185180664,
+    "y": 3098.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4c3e3376.aec354",
+    "id": "fc471e6.a2d406",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5709.399185180664,
-    "y": 3219.4190521240234,
-    "z": "2414cd0b.85dac2",
+    "x": 5711.399185180664,
+    "y": 3170.4190521240234,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "54f08fa.71777f",
+    "id": "2987a87c.d9af38",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.066665649414,
-    "y": 4644.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3582.066665649414,
+    "y": 4595.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "f59f8a4e.ee5228"
+        "101679fa.cd8636"
       ]
     ]
   },
   {
-    "id": "f59f8a4e.ee5228",
+    "id": "101679fa.cd8636",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3760.066665649414,
-    "y": 4643.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3762.066665649414,
+    "y": 4594.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6dfc836d.44e47c"
+        "a4d69355.b5e7f8"
       ]
     ]
   },
   {
-    "id": "6dfc836d.44e47c",
+    "id": "a4d69355.b5e7f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3889.066665649414,
-    "y": 4643.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3891.066665649414,
+    "y": 4594.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "84addd88.4602"
+        "42187454.b3e72c"
       ]
     ]
   },
   {
-    "id": "8e14b0c3.7931e8",
+    "id": "8dc12596.0dad2",
     "type": "comment",
     "name": "Update SECONDARY-ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3625.066665649414,
-    "y": 4702.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3627.066665649414,
+    "y": 4653.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "84addd88.4602",
+    "id": "42187454.b3e72c",
     "type": "save",
     "name": "get S-root uni from aai",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3655.066665649414,
-    "y": 4735.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3657.066665649414,
+    "y": 4686.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "15dd9d01.198e13",
-        "99598358.2ea178",
-        "d0193baa.0b0ba8"
+        "53201291.0789d4",
+        "6de03a2b.1543fc",
+        "13099433.0c6bc4"
       ]
     ]
   },
   {
-    "id": "99598358.2ea178",
+    "id": "6de03a2b.1543fc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3836.557632446289,
-    "y": 4712.993270874023,
-    "z": "2414cd0b.85dac2",
+    "x": 3838.557632446289,
+    "y": 4663.993270874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4987dd19.729c2c"
+        "328b19c8.a304fe"
       ]
     ]
   },
   {
-    "id": "d0193baa.0b0ba8",
+    "id": "13099433.0c6bc4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3825.066665649414,
-    "y": 4752.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3827.066665649414,
+    "y": 4703.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "4de60967.145d88"
+        "693d642a.e0385c"
       ]
     ]
   },
   {
-    "id": "4987dd19.729c2c",
+    "id": "328b19c8.a304fe",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
     "comments": "",
-    "x": 3996.129165649414,
-    "y": 4711.278915405273,
-    "z": "2414cd0b.85dac2",
+    "x": 3998.129165649414,
+    "y": 4662.278915405273,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "4de60967.145d88",
+    "id": "693d642a.e0385c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3986.066665649414,
-    "y": 4753.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3988.066665649414,
+    "y": 4704.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "15dd9d01.198e13",
+    "id": "53201291.0789d4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3830.066665649414,
-    "y": 4789.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3832.066665649414,
+    "y": 4740.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "7135b7da.689598"
+        "def4b54e.65d1b"
       ]
     ]
   },
   {
-    "id": "7135b7da.689598",
+    "id": "def4b54e.65d1b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3988.066665649414,
-    "y": 4797.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 3990.066665649414,
+    "y": 4748.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "db75607b.34ec4",
-        "368002b6.6c78de"
+        "c5033189.07a6e8",
+        "bea5279c.558ed8"
       ]
     ]
   },
   {
-    "id": "db75607b.34ec4",
+    "id": "c5033189.07a6e8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4149.066665649414,
-    "y": 4729.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4151.066665649414,
+    "y": 4680.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "368002b6.6c78de",
+    "id": "bea5279c.558ed8",
     "type": "save",
     "name": "update S-ROOT UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4191.066665649414,
-    "y": 4801.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4193.066665649414,
+    "y": 4752.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "9630090a.96156",
+    "id": "be749200.95b238",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4271.733657836914,
-    "y": 5599.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4273.733657836914,
+    "y": 5550.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b727caf7.37ccd",
+    "id": "b311bb82.023748",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4426.733657836914,
-    "y": 5640.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4428.733657836914,
+    "y": 5591.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d76b5ce.608a08",
+    "id": "f2f4b1c2.9aee8",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4242.733657836914,
-    "y": 5698.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4244.733657836914,
+    "y": 5649.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "6c688e63.a06ce",
-        "a407cbc4.6c0c8"
+        "7d42099c.1673f8",
+        "afcc0a1f.ae4ca8"
       ]
     ]
   },
   {
-    "id": "6c688e63.a06ce",
+    "id": "7d42099c.1673f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4478.733657836914,
-    "y": 5682.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4480.733657836914,
+    "y": 5633.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "65c46de7.6d4354"
+        "1db6f77.6e57a09"
       ]
     ]
   },
   {
-    "id": "a407cbc4.6c0c8",
+    "id": "afcc0a1f.ae4ca8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4477.733657836914,
-    "y": 5730.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4479.733657836914,
+    "y": 5681.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "65c46de7.6d4354",
+    "id": "1db6f77.6e57a09",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4622.733657836914,
-    "y": 5684.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4624.733657836914,
+    "y": 5635.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a13d8ec4.2f4c18",
-        "3e4d3365.1256fc",
-        "d2dac5fa.54c798"
+        "435458de.d8d258",
+        "fe506663.263e38",
+        "7c36c2be.89228c"
       ]
     ]
   },
   {
-    "id": "a13d8ec4.2f4c18",
+    "id": "435458de.d8d258",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5034.733901977539,
-    "y": 5819.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5036.733901977539,
+    "y": 5770.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "3e4d3365.1256fc",
+    "id": "fe506663.263e38",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5155.733901977539,
-    "y": 5866.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5157.733901977539,
+    "y": 5817.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "37767c8a.d0935c",
+    "id": "4a2e81b2.7cd548",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5038.617691040039,
-    "y": 5910.302352905273,
-    "z": "2414cd0b.85dac2",
+    "x": 5040.617691040039,
+    "y": 5861.302352905273,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "d2dac5fa.54c798",
+    "id": "7c36c2be.89228c",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5037.400894165039,
-    "y": 5951.502548217773,
-    "z": "2414cd0b.85dac2",
+    "x": 5039.400894165039,
+    "y": 5902.502548217773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "d0ed0f43.9ac178",
+    "id": "4c09fba5.801644",
     "type": "comment",
     "name": "populate connectivity-C variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4898.066665649414,
-    "y": 6205.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4900.066665649414,
+    "y": 6156.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "b5179b.b5811868",
+    "id": "2fa7a2c0.97e2e6",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5064.066665649414,
-    "y": 6244.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5066.066665649414,
+    "y": 6195.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "8a0b9185.29b548",
+    "id": "ed4e275a.a600a",
     "type": "switchNode",
     "name": "switch found-secondary-root-connectivity",
     "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4903.066665649414,
-    "y": 6294.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 4905.066665649414,
+    "y": 6245.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "bb485e07.c51f48",
-        "f5c035ca.78263"
+        "5ed92a8d.935c6c",
+        "3b32d9b.10ad726"
       ]
     ]
   },
   {
-    "id": "bb485e07.c51f48",
+    "id": "5ed92a8d.935c6c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5136.066665649414,
-    "y": 6288.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5138.066665649414,
+    "y": 6239.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "3bbd1b25.f0fda4"
+        "4b8f3c41.8b089c"
       ]
     ]
   },
   {
-    "id": "f5c035ca.78263",
+    "id": "3b32d9b.10ad726",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5137.066665649414,
-    "y": 6338.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5139.066665649414,
+    "y": 6289.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "3bbd1b25.f0fda4",
+    "id": "4b8f3c41.8b089c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5283.066665649414,
-    "y": 6296.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5285.066665649414,
+    "y": 6247.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "e99c4f39.622098",
-        "424cf9d2.7701e8",
-        "2a6230e2.ffd498"
+        "980344cd.e7e958",
+        "6a19d23d.0e42e4",
+        "b0adad9f.731368"
       ]
     ]
   },
   {
-    "id": "e99c4f39.622098",
+    "id": "980344cd.e7e958",
     "type": "set",
     "name": "set prop.connectivity-domainC-uuid",
     "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
     "comments": "",
-    "x": 5530.066665649414,
-    "y": 6284.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5532.066665649414,
+    "y": 6235.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "424cf9d2.7701e8",
+    "id": "6a19d23d.0e42e4",
     "type": "save",
     "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='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      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
     "comments": "",
     "outputs": 1,
-    "x": 5651.066665649414,
-    "y": 6331.419052124023,
-    "z": "2414cd0b.85dac2",
+    "x": 5653.066665649414,
+    "y": 6282.419052124023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "b810129e.2691f8",
+    "id": "351a146f.cf6ee4",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5533.950454711914,
-    "y": 6375.302352905273,
-    "z": "2414cd0b.85dac2",
+    "x": 5535.950454711914,
+    "y": 6326.302352905273,
+    "z": "3edf77d7.add3c",
     "wires": []
   },
   {
-    "id": "2a6230e2.ffd498",
+    "id": "b0adad9f.731368",
     "type": "save",
     "name": "update connectivity resource in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5532.733657836914,
-    "y": 6416.502548217773,
-    "z": "2414cd0b.85dac2",
+    "x": 5534.733657836914,
+    "y": 6367.502548217773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "a198d826.7242b",
+    "id": "62fdede4.849824",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3660.066665649414,
-    "y": 6189.852645874023,
-    "z": "2414cd0b.85dac2",
+    "x": 3662.066665649414,
+    "y": 6140.852645874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "c717d5f4.4fddc8",
+    "id": "dfc7a62b.53e19",
     "type": "switchNode",
     "name": "switch $hasSecondary",
     "xml": "<switch test='`$hasSecondary`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2997.316665649414,
-    "y": 6188.102645874023,
-    "z": "2414cd0b.85dac2",
+    "x": 2999.316665649414,
+    "y": 6139.102645874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "420e4506.143cfc",
-        "beb3687c.2f0758"
+        "4e06d40d.0d98f4",
+        "2df2f3f0.950c74"
       ]
     ]
   },
   {
-    "id": "420e4506.143cfc",
+    "id": "4e06d40d.0d98f4",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3188.316665649414,
-    "y": 6192.102645874023,
-    "z": "2414cd0b.85dac2",
+    "x": 3190.316665649414,
+    "y": 6143.102645874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "75f23708.93f968"
+        "7ac2dc81.94449c"
       ]
     ]
   },
   {
-    "id": "75f23708.93f968",
+    "id": "7ac2dc81.94449c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3315.316665649414,
-    "y": 6191.102645874023,
-    "z": "2414cd0b.85dac2",
+    "x": 3317.316665649414,
+    "y": 6142.102645874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "a198d826.7242b"
+        "62fdede4.849824"
       ]
     ]
   },
   {
-    "id": "beb3687c.2f0758",
+    "id": "2df2f3f0.950c74",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3184.316665649414,
-    "y": 6262.102645874023,
-    "z": "2414cd0b.85dac2",
+    "x": 3186.316665649414,
+    "y": 6213.102645874023,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "befff12f.84551"
+        "4a8e4e30.44e1e8"
       ]
     ]
   },
   {
-    "id": "41f38680.b5ae6",
+    "id": "717a4778.c8606",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3733.816665649414,
-    "y": 6261.186141967773,
-    "z": "2414cd0b.85dac2",
+    "x": 3735.816665649414,
+    "y": 6212.186141967773,
+    "z": "3edf77d7.add3c",
     "wires": [
       []
     ]
   },
   {
-    "id": "befff12f.84551",
+    "id": "4a8e4e30.44e1e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3317.816665649414,
-    "y": 6264.186141967773,
-    "z": "2414cd0b.85dac2",
+    "x": 3319.816665649414,
+    "y": 6215.186141967773,
+    "z": "3edf77d7.add3c",
     "wires": [
       [
-        "41f38680.b5ae6"
+        "717a4778.c8606"
       ]
     ]
   }
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 12bb2602..20061645 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -302,4 +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
+GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-callbackdg-notification 777 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.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml
index 32db942f..9cb132d1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml
@@ -186,9 +186,9 @@
                                     <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                     <parameter name='route-distinguisher' value='`$gfp`' />
                                     <parameter name='operational-status' value='Created' />
-                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                    <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                    <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                    <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                     <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                     <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                     <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
@@ -225,9 +225,9 @@
                                     <!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->
                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                    <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                    <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                    <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                 </save>
                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
@@ -290,9 +290,9 @@
                                     <parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                     <parameter name='route-distinguisher' value='`$gfp`' />
                                     <parameter name='operational-status' value='Created' />
-                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                    <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                    <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                    <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                     <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                     <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                     <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
@@ -515,9 +515,9 @@
                                                 <parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                                 <parameter name='route-distinguisher' value='`$gfp`' />
                                                 <parameter name='operational-status' value='Created' />
-                                                <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                 <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                                 <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                                 <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
@@ -554,9 +554,9 @@
                                                 <!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->
                                                 <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                 <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                 <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                             </save>
                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
@@ -619,9 +619,9 @@
                                                 <parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />
                                                 <parameter name='route-distinguisher' value='`$gfp`' />
                                                 <parameter name='operational-status' value='Created' />
-                                                <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                 <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
                                                 <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
                                                 <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
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
index ea5afbad..ff1ce989 100644
--- 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
@@ -2,7 +2,7 @@
         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='777'>
     <method rpc='cll-vnf-topology-operation-cll-callbackdg-notification' mode='sync'>
-        <block atomic="true">
+        <block>
             <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                 <parameter name="logger" value="message-log" />
                 <parameter name="level" value="info" />
@@ -13,59 +13,56 @@
                 <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 plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:metadata"
-                  key="service-instance.service-instance-id =  $rcvd-service-instance-id
- AND customer.global-customer-id = '5GCustomer'
- AND service-subscription.service-type = '5G'"  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="restapiUrl" value="https://dcae-ves-collector:8443/eventListener/v7" />
-                <parameter name="restapiUser" value="sample1" />
-                <parameter name="restapiPassword" value="sample1" />
-                <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"/>-->
-                <parameter name="disableHostVerification" value="true"/>
-                <parameter name="ssl" value="false"/>
-            </execute>
+            <switch test="`$push-change-update.datastore-changes.type == 'update' `">
+                <outcome value='true'>
+                    <block atomic="true">
+                        <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>
+                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource="service-instance:metadata"
+                                key="service-instance.service-instance-id =  $rcvd-service-instance-id
+ AND customer.global-customer-id = 'IBNCustomer'
+ AND service-subscription.service-type = 'IBN'"  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`" />
+                        </update>
+                        <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="restapiUrl" value="https://dcae-ves-collector:8443/eventListener/v7" />
+                            <parameter name="restapiUser" value="sample1" />
+                            <parameter name="restapiPassword" value="sample1" />
+                            <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"/>-->
+                            <parameter name="disableHostVerification" value="true"/>
+                            <parameter name="ssl" value="false"/>
+                        </execute>
+                    </block>
+                </outcome>
+            </switch>
         </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-create-clean.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
index 85b0fca0..cb7e715f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
@@ -993,9 +993,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                    <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1060,9 +1060,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                    <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1154,9 +1154,9 @@
                                                                                                                                             <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                             <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                             <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                            <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                            <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                            <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                                            <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                            <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                            <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                                                                                                             <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                         </save>
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1217,9 +1217,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                    <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1470,9 +1470,9 @@
                                                                                                                                             <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                             <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                             <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                            <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                            <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                            <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                                            <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                            <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                            <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                                                                                                             <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                         </save>
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
index acae25e5..d2cbb936 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
@@ -35,7 +35,7 @@
                             <block>
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                               resource="pnfs"
-                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'"
+                                              key="selflink = 'https://aai.onap:8443/aai/v25/network/pnfs?depth=0' depth = 0"
                                               local-only="false"
                                               pfx="ccsdkTopopnfs" ></get-resource>
                                 <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
@@ -978,9 +978,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                    <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1044,9 +1044,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                    <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1137,9 +1137,9 @@
                                                                                                                                             <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                             <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                             <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                            <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                            <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                            <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                                            <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                            <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                            <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                                                                                                             <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                         </save>
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1200,9 +1200,9 @@
                                                                                                                     <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                     <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                     <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                    <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                    <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                    <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                    <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                    <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                                                                                     <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
@@ -1819,9 +1819,9 @@
                                                                                                                                                         <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
                                                                                                                                                         <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
                                                                                                                                                         <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
-                                                                                                                                                        <parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />
-                                                                                                                                                        <parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />
-                                                                                                                                                        <parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />
+                                                                                                                                                        <!--<parameter name='model-customization-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-customization-uuid`' />-->
+                                                                                                                                                        <!--<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-invariant-uuid`' />-->
+                                                                                                                                                        <!--<parameter name='model-version-id' value='`$vnf-topology-operation-input.service-information.onap-model-information.model-uuid`' />-->
                                                                                                                                                         <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
                                                                                                                                                     </save>
                                                                                                                                                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
-- 
cgit 1.2.3-korg