From 22d596935f2edeefbe3f0d5acc72cf39e27e17aa Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Thu, 4 Nov 2021 11:44:51 -0400
Subject: Adding support for connecting a single ONU port to multiple clouds
 with different vlan-id's. Also fixing a few bugs in cll creation and
 deletion.

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

Former-commit-id: af17de2185bc8e0d1a7f0cb6f965df157c893412
---
 ...cll-vnf-topology-operation-cll-F1-Activate.json | 2546 ++++-----
 ...ll-vnf-topology-operation-cll-create-clean.json | 3898 +++++++-------
 ...-API_cll-vnf-topology-operation-cll-delete.json |  102 +-
 ...pology-operation-cll-helper-find-ROOT-conn.json |  250 +-
 ...ogy-operation-cll-helper-find-connectivity.json |  519 +-
 ...E-API_cll-vnf-topology-operation-cll-logic.json |  976 ++--
 ...-API_cll-vnf-topology-operation-cll-modify.json | 5514 ++++++++++----------
 ...l-vnf-topology-operation-cll-searchVpnName.json |  678 +++
 .../src/main/resources/graph.versions              |    1 +
 ..._cll-vnf-topology-operation-cll-F1-Activate.xml |    4 +-
 ...cll-vnf-topology-operation-cll-create-clean.xml |   38 +-
 ...E-API_cll-vnf-topology-operation-cll-delete.xml |   38 +-
 ...opology-operation-cll-helper-find-ROOT-conn.xml |    3 +
 ...logy-operation-cll-helper-find-connectivity.xml |   57 +-
 ...CE-API_cll-vnf-topology-operation-cll-logic.xml |    2 +
 ...E-API_cll-vnf-topology-operation-cll-modify.xml |  161 +-
 ...ll-vnf-topology-operation-cll-searchVpnName.xml |   85 +
 17 files changed, 8176 insertions(+), 6696 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.json
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.xml

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

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 4ba32b46..1828f879 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": "6467c9b6.3ea7b",
+        "id": "4a53e986.e1345",
         "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": 415.8833312988281,
-        "y": 377,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 401.8833312988281,
+        "y": 341,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1c0c6fa0.017178",
-                "ec984d7b.605098",
-                "25450eba.0fd99a"
+                "bee28b81.87faf8",
+                "2e0d3206.b3958e",
+                "2caa6605.779652"
             ]
         ]
     },
     {
-        "id": "1c0c6fa0.017178",
+        "id": "bee28b81.87faf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 603.8833312988281,
-        "y": 390,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 589.8833312988281,
+        "y": 354,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "fcdf737f.3ba08"
+                "db2a2eb9.c4729"
             ]
         ]
     },
     {
-        "id": "ec984d7b.605098",
+        "id": "2e0d3206.b3958e",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 611.374267578125,
-        "y": 432.57403564453125,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 597.374267578125,
+        "y": 396.57403564453125,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "25450eba.0fd99a",
+        "id": "2caa6605.779652",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 601.8833312988281,
-        "y": 479,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 587.8833312988281,
+        "y": 443,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "f645589d.ed3d98"
+                "9a0e1ef7.428b9"
             ]
         ]
     },
     {
-        "id": "fcdf737f.3ba08",
+        "id": "db2a2eb9.c4729",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 776.8833312988281,
-        "y": 388,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 762.8833312988281,
+        "y": 352,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6641b1bb.011df8"
+                "b1233538.ceab4"
             ]
         ]
     },
     {
-        "id": "6641b1bb.011df8",
+        "id": "b1233538.ceab4",
         "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": 1005.8833312988281,
-        "y": 389,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 991.8833312988281,
+        "y": 353,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "42fd94e4.9f459c"
+                "f68da0c8.dc2638"
             ]
         ]
     },
     {
-        "id": "42fd94e4.9f459c",
+        "id": "f68da0c8.dc2638",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1220.8833312988281,
-        "y": 390,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1206.8833312988281,
+        "y": 354,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "341f3db4.7e268a"
+                "947d4965.a799f8"
             ]
         ]
     },
     {
-        "id": "802e937a.3ac",
+        "id": "ab775a4c.a509d",
         "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": 1474.8833312988281,
-        "y": 312,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1460.8833312988281,
+        "y": 276,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ccfe4ade.41ae98",
-                "912c0faa.e5e1c8"
+                "1ae0d7f3.280b18",
+                "b7c135fb.7fc808"
             ]
         ]
     },
     {
-        "id": "ccfe4ade.41ae98",
+        "id": "1ae0d7f3.280b18",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1691.8833312988281,
-        "y": 291,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1677.8833312988281,
+        "y": 255,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "341f3db4.7e268a"
+                "947d4965.a799f8"
             ]
         ]
     },
     {
-        "id": "912c0faa.e5e1c8",
+        "id": "b7c135fb.7fc808",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1691.8833312988281,
-        "y": 340,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1677.8833312988281,
+        "y": 304,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "341f3db4.7e268a",
+        "id": "947d4965.a799f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1875.8833312988281,
-        "y": 377,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1861.8833312988281,
+        "y": 341,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b1ca96f9.f78f38",
-                "2c3b3231.83c2be",
-                "4660bf61.473a18"
+                "7307d136.f98668",
+                "d6d93ab.df041c8",
+                "ed4d0298.cdb578"
             ]
         ]
     },
     {
-        "id": "377c3031.0fc7c",
+        "id": "d12da893.5808e",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 234.88333129882812,
-        "y": 118,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 220.88333129882812,
+        "y": 82,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "8b8ba227.5e7638"
+                "ba22940.68974f"
             ]
         ]
     },
     {
-        "id": "8b8ba227.5e7638",
+        "id": "ba22940.68974f",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3545 +201,3545 @@
         "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": 519.1690216064453,
-        "y": 179.23810863494873,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 505.1690216064453,
+        "y": 143.23810863494873,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6c55ded0.30c498"
+                "f0aeb23e.8f1f7"
             ]
         ]
     },
     {
-        "id": "6c55ded0.30c498",
+        "id": "f0aeb23e.8f1f7",
         "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": 525.3119354248047,
-        "y": 264.0000305175781,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 511.3119354248047,
+        "y": 228.00003051757812,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b63c19cf.5911b8"
+                "849eab75.e48858"
             ]
         ]
     },
     {
-        "id": "b63c19cf.5911b8",
+        "id": "849eab75.e48858",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 835.1213684082031,
-        "y": 255.66668701171875,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 821.1213684082031,
+        "y": 219.66668701171875,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6467c9b6.3ea7b",
-                "7714415.bcb45c",
-                "2cf2ff05.5ecb98",
-                "ff64d6f0.1d24e",
-                "c19ef147.be92d8"
+                "4a53e986.e1345",
+                "9dad0003.283738",
+                "47e937a3.3ee608",
+                "fa83bc41.1d8b08",
+                "39b1b2.d055464e"
             ]
         ]
     },
     {
-        "id": "b1ca96f9.f78f38",
+        "id": "7307d136.f98668",
         "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": 2092.883331298828,
-        "y": 315,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2078.883331298828,
+        "y": 279,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "f11c1dac.45c748",
+        "id": "5be24b21.11ebc4",
         "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": 4261.883331298828,
-        "y": 201,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4247.883331298828,
+        "y": 165,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c95c33ef.381fa8",
+        "id": "66c2f1fa.df4e",
         "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": 4342.883331298828,
-        "y": 516,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4328.883331298828,
+        "y": 480,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "89c7efd5.cb6558",
-                "d5cfec9d.5347f8"
+                "78ae8a16.bcde6c",
+                "163e60b5.f624ef"
             ]
         ]
     },
     {
-        "id": "89c7efd5.cb6558",
+        "id": "78ae8a16.bcde6c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4652.383331298828,
-        "y": 485,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4638.383331298828,
+        "y": 449,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "beffe966.8b1b08"
+                "a86780cc.869ba"
             ]
         ]
     },
     {
-        "id": "d5cfec9d.5347f8",
+        "id": "163e60b5.f624ef",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4657.383331298828,
-        "y": 550,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4643.383331298828,
+        "y": 514,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "18fce568.1c292b"
+                "496a02d9.361154"
             ]
         ]
     },
     {
-        "id": "beffe966.8b1b08",
+        "id": "a86780cc.869ba",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4828.383331298828,
-        "y": 485,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4814.383331298828,
+        "y": 449,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "18fce568.1c292b",
+        "id": "496a02d9.361154",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4823.883331298828,
-        "y": 550,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4809.883331298828,
+        "y": 514,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "64fdffc9.427678",
+        "id": "4c8b1659.abc1b",
         "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": 4207.383331298828,
-        "y": 770,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4193.383331298828,
+        "y": 734,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c0e95206.343c2",
+        "id": "902cb9fb.0d496",
         "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": 4361.383331298828,
-        "y": 818,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4347.383331298828,
+        "y": 782,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "7a1edf39.b6a0f8",
-                "b605ddae.9f2b2"
+                "f961065e.0e576",
+                "6ca1f611.56dee"
             ]
         ]
     },
     {
-        "id": "7a1edf39.b6a0f8",
+        "id": "f961065e.0e576",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4706.883331298828,
-        "y": 799,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4692.883331298828,
+        "y": 763,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "db29824f.2b664"
+                "6296fab8.967dac"
             ]
         ]
     },
     {
-        "id": "b605ddae.9f2b2",
+        "id": "6ca1f611.56dee",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4710.883331298828,
-        "y": 839,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4696.883331298828,
+        "y": 803,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "10ebb808.22b9d8"
+                "ef7067c4.7ea328"
             ]
         ]
     },
     {
-        "id": "db29824f.2b664",
+        "id": "6296fab8.967dac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4864.883331298828,
-        "y": 799,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4850.883331298828,
+        "y": 763,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "10ebb808.22b9d8",
+        "id": "ef7067c4.7ea328",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4868.383331298828,
-        "y": 839,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4854.383331298828,
+        "y": 803,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6d35eb39.2fe42c",
-                "b62c3c22.2cb09"
+                "ee477ca2.a65568",
+                "5e527e99.1f4728"
             ]
         ]
     },
     {
-        "id": "6d35eb39.2fe42c",
+        "id": "ee477ca2.a65568",
         "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": 5198.883331298828,
-        "y": 804,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5184.883331298828,
+        "y": 768,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "3f34bcf0.b30eb4",
+        "id": "f9d5afb7.0291b",
         "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": 5062.883331298828,
-        "y": 763,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5048.883331298828,
+        "y": 727,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "b62c3c22.2cb09",
+        "id": "5e527e99.1f4728",
         "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": 5125.883331298828,
-        "y": 850,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5111.883331298828,
+        "y": 814,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc51dde.504a12",
+        "id": "48c30a65.f0f584",
         "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": 4199.883331298828,
-        "y": 249,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4185.883331298828,
+        "y": 213,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "25f0cbb9.ff400c",
+        "id": "bc523ecb.f956a8",
         "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": 4225.883331298828,
-        "y": 366,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4211.883331298828,
+        "y": 330,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "26af6a64.84f75e",
-                "dfaad5e6.3e7388",
-                "d4f19086.9e394"
+                "a72840b5.dc70e",
+                "54e4a8de.9445f8",
+                "4012660e.b55b2"
             ]
         ]
     },
     {
-        "id": "26af6a64.84f75e",
+        "id": "a72840b5.dc70e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4421.383453369141,
-        "y": 318,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4407.383453369141,
+        "y": 282,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "825f4729.b63ee8"
+                "9d071aa.9c29c68"
             ]
         ]
     },
     {
-        "id": "dfaad5e6.3e7388",
+        "id": "54e4a8de.9445f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4413.383453369141,
-        "y": 373,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4399.383453369141,
+        "y": 337,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "92b1984a.bc8b"
+                "3662c50c.d754d2"
             ]
         ]
     },
     {
-        "id": "825f4729.b63ee8",
+        "id": "9d071aa.9c29c68",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4565.765777587891,
-        "y": 317.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4551.765777587891,
+        "y": 281.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "415768e6.6651f8"
+                "c1155c42.4dc2e8"
             ]
         ]
     },
     {
-        "id": "a6a2d3e2.2e526",
+        "id": "a3b68f87.0c3248",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5147.883331298828,
-        "y": 320,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5133.883331298828,
+        "y": 284,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e243a570.71b51"
+                "e6d1f56a.1147f8"
             ]
         ]
     },
     {
-        "id": "415768e6.6651f8",
+        "id": "c1155c42.4dc2e8",
         "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": 4749.883331298828,
-        "y": 316,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4735.883331298828,
+        "y": 280,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ab4dd1f4.04e1f"
+                "e3565ab9.0a825"
             ]
         ]
     },
     {
-        "id": "ab4dd1f4.04e1f",
+        "id": "e3565ab9.0a825",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4944.883331298828,
-        "y": 316,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4930.883331298828,
+        "y": 280,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a6a2d3e2.2e526"
+                "a3b68f87.0c3248"
             ]
         ]
     },
     {
-        "id": "d4f19086.9e394",
+        "id": "4012660e.b55b2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4418.383453369141,
-        "y": 430,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4404.383453369141,
+        "y": 394,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "28f88c03.cb5e5c"
+                "7e9c03d8.c41c7c"
             ]
         ]
     },
     {
-        "id": "28f88c03.cb5e5c",
+        "id": "7e9c03d8.c41c7c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4570.383453369141,
-        "y": 431,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4556.383453369141,
+        "y": 395,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "92b1984a.bc8b",
+        "id": "3662c50c.d754d2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4581.383453369141,
-        "y": 374,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4567.383453369141,
+        "y": 338,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "677439f1.5f7ed",
+        "id": "99fa8e6f.e803d8",
         "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": 5532.883331298828,
-        "y": 333,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5518.883331298828,
+        "y": 297,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e7fd97d3.bbcd08",
-                "38bba5b7.de41b2",
-                "6bf961e8.c56a58"
+                "a38e0436.5aedc",
+                "80f6747e.265c78",
+                "c370b7ba.84a26"
             ]
         ]
     },
     {
-        "id": "e243a570.71b51",
+        "id": "e6d1f56a.1147f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5326.883331298828,
-        "y": 320,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5312.883331298828,
+        "y": 284,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "857cacb0.81444",
-                "677439f1.5f7ed"
+                "4599703a.c42f3",
+                "99fa8e6f.e803d8"
             ]
         ]
     },
     {
-        "id": "857cacb0.81444",
+        "id": "4599703a.c42f3",
         "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": 5562.883331298828,
-        "y": 281,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5548.883331298828,
+        "y": 245,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e7fd97d3.bbcd08",
+        "id": "a38e0436.5aedc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5742.883331298828,
-        "y": 324,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5728.883331298828,
+        "y": 288,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "60a50433.d26434"
+                "8c88cbf0.e09b1"
             ]
         ]
     },
     {
-        "id": "38bba5b7.de41b2",
+        "id": "80f6747e.265c78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5734.883331298828,
-        "y": 379,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5720.883331298828,
+        "y": 343,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "d9350787.861f1"
+                "e2be9acb.77d62"
             ]
         ]
     },
     {
-        "id": "6bf961e8.c56a58",
+        "id": "c370b7ba.84a26",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5739.883331298828,
-        "y": 436,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5725.883331298828,
+        "y": 400,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1afc54ba.8ed313"
+                "856ee89c.2898"
             ]
         ]
     },
     {
-        "id": "1afc54ba.8ed313",
+        "id": "856ee89c.2898",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5891.883331298828,
-        "y": 437,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5877.883331298828,
+        "y": 401,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "d9350787.861f1",
+        "id": "e2be9acb.77d62",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5902.883331298828,
-        "y": 382,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5888.883331298828,
+        "y": 346,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "60a50433.d26434",
+        "id": "8c88cbf0.e09b1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5887.265655517578,
-        "y": 321.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5873.265655517578,
+        "y": 285.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "8367dac2.ac8b98"
+                "a4a57efc.888ff8"
             ]
         ]
     },
     {
-        "id": "8367dac2.ac8b98",
+        "id": "a4a57efc.888ff8",
         "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": 6101.883331298828,
-        "y": 318,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 6087.883331298828,
+        "y": 282,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "aa2473a.12d4d9",
+        "id": "172d91c5.a78676",
         "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": 3668.883331298828,
-        "y": 1658,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3654.883331298828,
+        "y": 1622,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "28a663c6.7433b4",
+        "id": "f13d198f.d5c79",
         "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": 3731.883331298828,
-        "y": 1987,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3717.883331298828,
+        "y": 1951,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "422a3196.0fb7d",
-                "371e9e8f.f6f942"
+                "3640aede.8913a2",
+                "f1b1c8d.9945bb8"
             ]
         ]
     },
     {
-        "id": "422a3196.0fb7d",
+        "id": "3640aede.8913a2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4027.383331298828,
-        "y": 1954,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4013.383331298828,
+        "y": 1918,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c3084137.121c7"
+                "4b0d0deb.6577e4"
             ]
         ]
     },
     {
-        "id": "371e9e8f.f6f942",
+        "id": "f1b1c8d.9945bb8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4032.383331298828,
-        "y": 2019,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4018.383331298828,
+        "y": 1983,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c6676165.ac5c"
+                "5da14040.cb50b8"
             ]
         ]
     },
     {
-        "id": "c3084137.121c7",
+        "id": "4b0d0deb.6577e4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4195.383331298828,
-        "y": 1954,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4181.383331298828,
+        "y": 1918,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c6676165.ac5c",
+        "id": "5da14040.cb50b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4205.883331298828,
-        "y": 2019,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4191.883331298828,
+        "y": 1983,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "dfee532c.a1419",
+        "id": "1e50105a.a8b96",
         "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": 3607.883331298828,
-        "y": 1715,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3593.883331298828,
+        "y": 1679,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e52702af.314718",
+        "id": "dfe45c65.d48f6",
         "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": 3627.883331298828,
-        "y": 1812,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3613.883331298828,
+        "y": 1776,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "9ca1c561.5c796",
-                "9cf5cab4.99d6e",
-                "5d5762eb.724c64"
+                "56d2f84a.b524e8",
+                "43f5b436.ace8b4",
+                "a9c884c3.3b2c18"
             ]
         ]
     },
     {
-        "id": "9ca1c561.5c796",
+        "id": "56d2f84a.b524e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3830.3834533691406,
-        "y": 1765,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3816.3834533691406,
+        "y": 1729,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "502f683e.00cf7"
+                "10cf7345.17615d"
             ]
         ]
     },
     {
-        "id": "9cf5cab4.99d6e",
+        "id": "43f5b436.ace8b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3822.3834533691406,
-        "y": 1820,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3808.3834533691406,
+        "y": 1784,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "9587c00d.994eb"
+                "40e41e98.b2ab3"
             ]
         ]
     },
     {
-        "id": "502f683e.00cf7",
+        "id": "10cf7345.17615d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3974.7657775878906,
-        "y": 1762.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3960.7657775878906,
+        "y": 1726.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "39b96666.82062a"
+                "69889215.886b4c"
             ]
         ]
     },
     {
-        "id": "39b96666.82062a",
+        "id": "69889215.886b4c",
         "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": 4158.883331298828,
-        "y": 1777,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4144.883331298828,
+        "y": 1741,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "94ae9a5d.e5d56"
+                "3c1ff953.79a23e"
             ]
         ]
     },
     {
-        "id": "5d5762eb.724c64",
+        "id": "a9c884c3.3b2c18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3827.3834533691406,
-        "y": 1877,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3813.3834533691406,
+        "y": 1841,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "7a00ac4a.8d918c"
+                "8ab7ecfb.f03ee"
             ]
         ]
     },
     {
-        "id": "7a00ac4a.8d918c",
+        "id": "8ab7ecfb.f03ee",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3979.3834533691406,
-        "y": 1878,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3965.3834533691406,
+        "y": 1842,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "9587c00d.994eb",
+        "id": "40e41e98.b2ab3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3990.3834533691406,
-        "y": 1823,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3976.3834533691406,
+        "y": 1787,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "f1540d0.014217",
+        "id": "37ef2104.1e9d5e",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4556.883331298828,
-        "y": 1781,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4542.883331298828,
+        "y": 1745,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c932c6af.938f38"
+                "901dac81.52118"
             ]
         ]
     },
     {
-        "id": "94ae9a5d.e5d56",
+        "id": "3c1ff953.79a23e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4353.883331298828,
-        "y": 1777,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4339.883331298828,
+        "y": 1741,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "f1540d0.014217"
+                "37ef2104.1e9d5e"
             ]
         ]
     },
     {
-        "id": "2ff151e7.182fee",
+        "id": "86b8c4cb.c3747",
         "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": 4941.883331298828,
-        "y": 1780,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4927.883331298828,
+        "y": 1744,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "40d3a7a.4400bd8",
-                "353377f9.20c718",
-                "f8f22501.0020d8"
+                "b5f45931.a1805",
+                "34bcb3b6.e69b1c",
+                "d4cc1381.862c48"
             ]
         ]
     },
     {
-        "id": "c932c6af.938f38",
+        "id": "901dac81.52118",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4733.883331298828,
-        "y": 1773,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4719.883331298828,
+        "y": 1737,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "53fc3a7e.05d404",
-                "2ff151e7.182fee"
+                "81cd4229.29ba8",
+                "86b8c4cb.c3747"
             ]
         ]
     },
     {
-        "id": "53fc3a7e.05d404",
+        "id": "81cd4229.29ba8",
         "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": 4971.883331298828,
-        "y": 1728,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4957.883331298828,
+        "y": 1692,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "d551b07b.11f68",
+        "id": "a6f965e8.0bb248",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5300.883331298828,
-        "y": 1884,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5286.883331298828,
+        "y": 1848,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c19bb319.e0e2b8",
+        "id": "3b503e2a.8c5dd2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5311.883331298828,
-        "y": 1829,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5297.883331298828,
+        "y": 1793,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2dbaf595.6cfed2",
+        "id": "a84f2510.1ebf08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5296.265655517578,
-        "y": 1768.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5282.265655517578,
+        "y": 1732.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "eaeaf1b8.196fc"
+                "f83738f1.e5e14"
             ]
         ]
     },
     {
-        "id": "eaeaf1b8.196fc",
+        "id": "f83738f1.e5e14",
         "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": 5510.883331298828,
-        "y": 1765,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5496.883331298828,
+        "y": 1729,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "40d3a7a.4400bd8",
+        "id": "b5f45931.a1805",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5151.883331298828,
-        "y": 1771,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5137.883331298828,
+        "y": 1735,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2dbaf595.6cfed2"
+                "a84f2510.1ebf08"
             ]
         ]
     },
     {
-        "id": "353377f9.20c718",
+        "id": "34bcb3b6.e69b1c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5143.883331298828,
-        "y": 1826,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5129.883331298828,
+        "y": 1790,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c19bb319.e0e2b8"
+                "3b503e2a.8c5dd2"
             ]
         ]
     },
     {
-        "id": "f8f22501.0020d8",
+        "id": "d4cc1381.862c48",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5148.883331298828,
-        "y": 1883,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5134.883331298828,
+        "y": 1847,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "d551b07b.11f68"
+                "a6f965e8.0bb248"
             ]
         ]
     },
     {
-        "id": "c7d66e95.fb47e",
+        "id": "4a95df1.67c3fa",
         "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": 3182.883331298828,
-        "y": 729,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3168.883331298828,
+        "y": 693,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "4d8bbec2.c0db6",
-                "507d82bd.8807cc"
+                "60b8b463.e4925c",
+                "5e23be29.1eb6a"
             ]
         ]
     },
     {
-        "id": "4d8bbec2.c0db6",
+        "id": "60b8b463.e4925c",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3396.883331298828,
-        "y": 766,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3382.883331298828,
+        "y": 730,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6524452d.4a2f94"
+                "4d4203c4.4fd81c"
             ]
         ]
     },
     {
-        "id": "507d82bd.8807cc",
+        "id": "5e23be29.1eb6a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3398.883331298828,
-        "y": 704,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3384.883331298828,
+        "y": 668,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "4b590d33.c81684"
+                "402d5674.bb5698"
             ]
         ]
     },
     {
-        "id": "6524452d.4a2f94",
+        "id": "4d4203c4.4fd81c",
         "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": 2976.883331298828,
-        "y": 2009,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2962.883331298828,
+        "y": 1973,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "75800cfe.e64b04",
-                "28895848.af5c18"
+                "4155de88.54a1f",
+                "11e38b5d.85c715"
             ]
         ]
     },
     {
-        "id": "75800cfe.e64b04",
+        "id": "4155de88.54a1f",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3229.883331298828,
-        "y": 2043,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3215.883331298828,
+        "y": 2007,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "34389e65.7f3f0a"
+                "97b4f973.8f85a8"
             ]
         ]
     },
     {
-        "id": "28895848.af5c18",
+        "id": "11e38b5d.85c715",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3229.883331298828,
-        "y": 1987,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3215.883331298828,
+        "y": 1951,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "4c94a377.c6d4e4"
+                "4bdf7725.9cef3"
             ]
         ]
     },
     {
-        "id": "34389e65.7f3f0a",
+        "id": "97b4f973.8f85a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3380.883331298828,
-        "y": 2043,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3366.883331298828,
+        "y": 2007,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "ff717106.1f6f7",
+        "id": "15e2350c.3f989b",
         "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": 4256.883331298828,
-        "y": 141,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4242.883331298828,
+        "y": 105,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "98bc8f5e.55646",
+        "id": "22f55219.d9af6e",
         "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": 3664.883331298828,
-        "y": 1600,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3650.883331298828,
+        "y": 1564,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "1901ad68.6869bb",
+        "id": "9157e39e.50973",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3947.883331298828,
-        "y": 398,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3933.883331298828,
+        "y": 362,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ff717106.1f6f7",
-                "f11c1dac.45c748",
-                "dc51dde.504a12",
-                "25f0cbb9.ff400c",
-                "c95c33ef.381fa8",
-                "7a0ef184.deb28",
-                "dd4c3392.e1b02",
-                "2a6ffb7c.8797f4"
+                "15e2350c.3f989b",
+                "5be24b21.11ebc4",
+                "48c30a65.f0f584",
+                "bc523ecb.f956a8",
+                "66c2f1fa.df4e",
+                "738a4fa7.5a68d",
+                "9521e4ca.a61af",
+                "224f4283.917d26"
             ]
         ]
     },
     {
-        "id": "4c94a377.c6d4e4",
+        "id": "4bdf7725.9cef3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3380.883331298828,
-        "y": 1986,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3366.883331298828,
+        "y": 1950,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "98bc8f5e.55646",
-                "aa2473a.12d4d9",
-                "dfee532c.a1419",
-                "e52702af.314718",
-                "28a663c6.7433b4",
-                "c984548c.2e537",
-                "88e8f378.a2b808",
-                "1fda4b4a.2131e5"
+                "22f55219.d9af6e",
+                "172d91c5.a78676",
+                "1e50105a.a8b96",
+                "dfe45c65.d48f6",
+                "f13d198f.d5c79",
+                "78f084cb.41e754",
+                "e35a6c95.6b3d6",
+                "1ced8517.ce35e3"
             ]
         ]
     },
     {
-        "id": "d79079df.baf578",
+        "id": "e7e7eca7.931088",
         "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": 3618.883331298828,
-        "y": 2285,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3604.883331298828,
+        "y": 2249,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "45ccc628.f5551",
+        "id": "5544b67f.df3238",
         "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": 3772.883331298828,
-        "y": 2333,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3758.883331298828,
+        "y": 2297,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6173b4db.203ce4",
-                "7f21396.e7ee248"
+                "b36c5e4.a4b982",
+                "75e03418.7b0a3c"
             ]
         ]
     },
     {
-        "id": "6173b4db.203ce4",
+        "id": "b36c5e4.a4b982",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4118.383331298828,
-        "y": 2314,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4104.383331298828,
+        "y": 2278,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2b5ddf83.e8a168"
+                "996a2de3.86ff68"
             ]
         ]
     },
     {
-        "id": "7f21396.e7ee248",
+        "id": "75e03418.7b0a3c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4122.383331298828,
-        "y": 2354,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4108.383331298828,
+        "y": 2318,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "9fc151.f9cc46b"
+                "1787d971.8d0d67"
             ]
         ]
     },
     {
-        "id": "2b5ddf83.e8a168",
+        "id": "996a2de3.86ff68",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4276.383331298828,
-        "y": 2314,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4262.383331298828,
+        "y": 2278,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "9fc151.f9cc46b",
+        "id": "1787d971.8d0d67",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4279.883331298828,
-        "y": 2354,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4265.883331298828,
+        "y": 2318,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ec406c4.a093b1",
-                "ba32c60f.0ec53"
+                "79bbcc28.d4fd3c",
+                "137b8fb9.4aaa78"
             ]
         ]
     },
     {
-        "id": "ec406c4.a093b1",
+        "id": "79bbcc28.d4fd3c",
         "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": 4619.883331298828,
-        "y": 2353,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4605.883331298828,
+        "y": 2317,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "650aeaf3.da502c",
+        "id": "9aab71de.3f671",
         "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": 4477.883331298828,
-        "y": 2311,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4463.883331298828,
+        "y": 2275,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "ba32c60f.0ec53",
+        "id": "137b8fb9.4aaa78",
         "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": 4548.883331298828,
-        "y": 2402,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4534.883331298828,
+        "y": 2366,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c8295377.ff6158",
+        "id": "e7a16254.b52678",
         "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": 3173.883331298828,
-        "y": 669,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3159.883331298828,
+        "y": 633,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "17d3b71c.0a74f9",
+        "id": "b98d7c04.aadb6",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3768.883331298828,
-        "y": 355,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3754.883331298828,
+        "y": 319,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "12dd212a.e5931f",
+        "id": "f9466402.70d608",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3325.883331298828,
-        "y": 1933,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3311.883331298828,
+        "y": 1897,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "4b590d33.c81684",
+        "id": "402d5674.bb5698",
         "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": 3504.883331298828,
-        "y": 517,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3490.883331298828,
+        "y": 481,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e68f7957.57ea98",
-                "90c8120e.55a8c8"
+                "40174504.12275c",
+                "483f6800.997ef8"
             ]
         ]
     },
     {
-        "id": "90c8120e.55a8c8",
+        "id": "483f6800.997ef8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3746.883331298828,
-        "y": 1106,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3732.883331298828,
+        "y": 1070,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "5f92c041.e2a22"
+                "f91cd9b2.b4ebc8"
             ]
         ]
     },
     {
-        "id": "e68f7957.57ea98",
+        "id": "40174504.12275c",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3740.883331298828,
-        "y": 397,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3726.883331298828,
+        "y": 361,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1901ad68.6869bb"
+                "9157e39e.50973"
             ]
         ]
     },
     {
-        "id": "5f92c041.e2a22",
+        "id": "f91cd9b2.b4ebc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3904.883331298828,
-        "y": 1105,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3890.883331298828,
+        "y": 1069,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "eb5cd95b.b46698",
-                "bcb9498.a9205b8",
-                "24e13fd8.afe2d8",
-                "57e5431f.63be4c",
-                "8b688219.8ed198",
-                "9c0b0957.1e6c48"
+                "e0a89dfb.b97bd8",
+                "356efc92.1be0c4",
+                "b98c51bd.b1df7",
+                "c9386596.fb5188",
+                "99a335d9.47dc9",
+                "1d1e23b2.17cb04"
             ]
         ]
     },
     {
-        "id": "bcb9498.a9205b8",
+        "id": "356efc92.1be0c4",
         "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": 4168.883331298828,
-        "y": 988,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4154.883331298828,
+        "y": 952,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "8b688219.8ed198",
+        "id": "99a335d9.47dc9",
         "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": 4249.883331298828,
-        "y": 1303,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4235.883331298828,
+        "y": 1267,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "4ea88210.ceec44",
-                "cd5b1128.4dbb9"
+                "2ae3d84f.15cb3",
+                "a0cd8374.ae65d8"
             ]
         ]
     },
     {
-        "id": "4ea88210.ceec44",
+        "id": "2ae3d84f.15cb3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4559.383331298828,
-        "y": 1272,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4545.383331298828,
+        "y": 1236,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "9646de5b.fe3c7"
+                "d03fdf1c.3b45d"
             ]
         ]
     },
     {
-        "id": "cd5b1128.4dbb9",
+        "id": "a0cd8374.ae65d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4564.383331298828,
-        "y": 1337,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4550.383331298828,
+        "y": 1301,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "55735b11.27f424"
+                "f8c3fa12.5c834"
             ]
         ]
     },
     {
-        "id": "9646de5b.fe3c7",
+        "id": "d03fdf1c.3b45d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4735.383331298828,
-        "y": 1272,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4721.383331298828,
+        "y": 1236,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "55735b11.27f424",
+        "id": "f8c3fa12.5c834",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4730.883331298828,
-        "y": 1337,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4716.883331298828,
+        "y": 1301,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "24e13fd8.afe2d8",
+        "id": "b98c51bd.b1df7",
         "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": 4106.883331298828,
-        "y": 1036,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4092.883331298828,
+        "y": 1000,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "57e5431f.63be4c",
+        "id": "c9386596.fb5188",
         "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": 4132.883331298828,
-        "y": 1153,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4118.883331298828,
+        "y": 1117,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1d187a80.e65b15",
-                "370c15e3.9b5fca",
-                "703dc49a.960884"
+                "312e9154.f9dbd6",
+                "38e6d39b.3fc964",
+                "d52b1c1f.8a6ca8"
             ]
         ]
     },
     {
-        "id": "1d187a80.e65b15",
+        "id": "312e9154.f9dbd6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4328.383453369141,
-        "y": 1105,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4314.383453369141,
+        "y": 1069,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "5c6509dd.e3a81"
+                "6d3eafaf.02fb48"
             ]
         ]
     },
     {
-        "id": "370c15e3.9b5fca",
+        "id": "38e6d39b.3fc964",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4320.383453369141,
-        "y": 1160,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4306.383453369141,
+        "y": 1124,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ccfe239.f2e7de"
+                "3519bfd5.fa4b3"
             ]
         ]
     },
     {
-        "id": "5c6509dd.e3a81",
+        "id": "6d3eafaf.02fb48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4472.765777587891,
-        "y": 1104.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4458.765777587891,
+        "y": 1068.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "35d4ca24.cf236e"
+                "6a66b1f9.955598"
             ]
         ]
     },
     {
-        "id": "35d4ca24.cf236e",
+        "id": "6a66b1f9.955598",
         "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": 4656.883331298828,
-        "y": 1103,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4642.883331298828,
+        "y": 1067,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c8705d75.001f7"
+                "43b05855.517cf"
             ]
         ]
     },
     {
-        "id": "c8705d75.001f7",
+        "id": "43b05855.517cf",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4851.883331298828,
-        "y": 1103,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4837.883331298828,
+        "y": 1067,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b9376422.2a71"
+                "c21a24cd.dd2528"
             ]
         ]
     },
     {
-        "id": "703dc49a.960884",
+        "id": "d52b1c1f.8a6ca8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4325.383453369141,
-        "y": 1217,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4311.383453369141,
+        "y": 1181,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ece92d94.dd0ac"
+                "db81dd24.8006b"
             ]
         ]
     },
     {
-        "id": "ece92d94.dd0ac",
+        "id": "db81dd24.8006b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4477.383453369141,
-        "y": 1218,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4463.383453369141,
+        "y": 1182,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "ccfe239.f2e7de",
+        "id": "3519bfd5.fa4b3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4488.383453369141,
-        "y": 1161,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4474.383453369141,
+        "y": 1125,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "eb5cd95b.b46698",
+        "id": "e0a89dfb.b97bd8",
         "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": 4163.883331298828,
-        "y": 928,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4149.883331298828,
+        "y": 892,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "b9376422.2a71",
+        "id": "c21a24cd.dd2528",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5054.883331298828,
-        "y": 1107,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5040.883331298828,
+        "y": 1071,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "d2480516.2fc378"
+                "f7c609f5.0c2d28"
             ]
         ]
     },
     {
-        "id": "9cb817ae.cef538",
+        "id": "dff3e5ec.9273",
         "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": 5439.883331298828,
-        "y": 1120,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5425.883331298828,
+        "y": 1084,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a79825bb.dff1f8",
-                "1395d5f.298062a",
-                "7903ca2c.aa5cc4"
+                "2769bc77.6b9fa4",
+                "7925966f.3df658",
+                "161a4207.178c96"
             ]
         ]
     },
     {
-        "id": "d2480516.2fc378",
+        "id": "f7c609f5.0c2d28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5233.883331298828,
-        "y": 1107,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5219.883331298828,
+        "y": 1071,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "fbf9e6b6.15b5c",
-                "9cb817ae.cef538"
+                "3634d6f2.f94292",
+                "dff3e5ec.9273"
             ]
         ]
     },
     {
-        "id": "fbf9e6b6.15b5c",
+        "id": "3634d6f2.f94292",
         "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": 5469.883331298828,
-        "y": 1068,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5455.883331298828,
+        "y": 1032,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "a79825bb.dff1f8",
+        "id": "2769bc77.6b9fa4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5649.883331298828,
-        "y": 1111,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5635.883331298828,
+        "y": 1075,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c7dce557.6dded"
+                "8b0e2b2b.7a21d"
             ]
         ]
     },
     {
-        "id": "1395d5f.298062a",
+        "id": "7925966f.3df658",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5641.883331298828,
-        "y": 1166,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5627.883331298828,
+        "y": 1130,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "598e647b.5837b4"
+                "b9107d6e.7c0358"
             ]
         ]
     },
     {
-        "id": "7903ca2c.aa5cc4",
+        "id": "161a4207.178c96",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5646.883331298828,
-        "y": 1223,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5632.883331298828,
+        "y": 1187,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e6c7a6e7.b2f038"
+                "d5598bab.3dfb58"
             ]
         ]
     },
     {
-        "id": "e6c7a6e7.b2f038",
+        "id": "d5598bab.3dfb58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5798.883331298828,
-        "y": 1224,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5784.883331298828,
+        "y": 1188,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "598e647b.5837b4",
+        "id": "b9107d6e.7c0358",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5809.883331298828,
-        "y": 1169,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5795.883331298828,
+        "y": 1133,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c7dce557.6dded",
+        "id": "8b0e2b2b.7a21d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5794.265655517578,
-        "y": 1108.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5780.265655517578,
+        "y": 1072.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2cfbc0b6.6ae748"
+                "f80d31a9.31f3d"
             ]
         ]
     },
     {
-        "id": "2cfbc0b6.6ae748",
+        "id": "f80d31a9.31f3d",
         "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": 6008.883331298828,
-        "y": 1105,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 5994.883331298828,
+        "y": 1069,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "fca9cd7.3028eb",
+        "id": "d718b282.287ca",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3782.883331298828,
-        "y": 1046,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3768.883331298828,
+        "y": 1010,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2c3b3231.83c2be",
+        "id": "d6d93ab.df041c8",
         "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": 2344.883331298828,
-        "y": 773,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2330.883331298828,
+        "y": 737,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "81a947d8.a13a68",
-                "b480f4ae.d59fb8"
+                "7d753f63.af1d7",
+                "7719dbd9.957fc4"
             ]
         ]
     },
     {
-        "id": "b480f4ae.d59fb8",
+        "id": "7719dbd9.957fc4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2751.883331298828,
-        "y": 791,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2737.883331298828,
+        "y": 755,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "23d2aee5.d5b2fa"
+                "2b5dce30.392f92"
             ]
         ]
     },
     {
-        "id": "81a947d8.a13a68",
+        "id": "7d753f63.af1d7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2751.883331298828,
-        "y": 736,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2737.883331298828,
+        "y": 700,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "773948cf.a686e8"
+                "155f7f13.57fce1"
             ]
         ]
     },
     {
-        "id": "773948cf.a686e8",
+        "id": "155f7f13.57fce1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2907.883331298828,
-        "y": 734,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2893.883331298828,
+        "y": 698,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c8295377.ff6158",
-                "c7d66e95.fb47e"
+                "e7a16254.b52678",
+                "4a95df1.67c3fa"
             ]
         ]
     },
     {
-        "id": "23d2aee5.d5b2fa",
+        "id": "2b5dce30.392f92",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2884.883331298828,
-        "y": 792,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2870.883331298828,
+        "y": 756,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7714415.bcb45c",
+        "id": "9dad0003.283738",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 1061.8833312988281,
-        "y": 208,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1047.8833312988281,
+        "y": 172,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "79981366.647454",
+        "id": "a6d3cb9.27687b8",
         "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": 4178.883331298828,
-        "y": 626,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4164.883331298828,
+        "y": 590,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "7a0ef184.deb28",
+        "id": "738a4fa7.5a68d",
         "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": 4238.883331298828,
-        "y": 665,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4224.883331298828,
+        "y": 629,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2cf2ff05.5ecb98",
+        "id": "47e937a3.3ee608",
         "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": 1054.8833312988281,
-        "y": 116,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1040.8833312988281,
+        "y": 80,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "7871357e.92d2f4",
+        "id": "6f67cdff.5c5554",
         "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": 3590.883331298828,
-        "y": 2142,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3576.883331298828,
+        "y": 2106,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c984548c.2e537",
+        "id": "78f084cb.41e754",
         "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": 3646.883331298828,
-        "y": 2191,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3632.883331298828,
+        "y": 2155,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "efee660.b5b7f18",
+        "id": "912dde6.9b60fa",
         "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": 1054.8833312988281,
-        "y": 155,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1040.8833312988281,
+        "y": 119,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "ff64d6f0.1d24e",
+        "id": "fa83bc41.1d8b08",
         "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": 1085.8833312988281,
-        "y": 256,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1071.8833312988281,
+        "y": 220,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c19ef147.be92d8",
+        "id": "39b1b2.d055464e",
         "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": 295.8833312988281,
-        "y": 731,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 281.8833312988281,
+        "y": 695,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "4acbe821.0c1ff8",
-                "63a107d4.a006c8",
-                "4bb92513.9b1ebc"
+                "e70c3582.89ad08",
+                "3aeaa08a.574a",
+                "1322af3c.bc6319"
             ]
         ]
     },
     {
-        "id": "4acbe821.0c1ff8",
+        "id": "e70c3582.89ad08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 514.8833312988281,
-        "y": 669,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 500.8833312988281,
+        "y": 633,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "d6a121aa.ecf888"
+                "9c476365.2b909"
             ]
         ]
     },
     {
-        "id": "63a107d4.a006c8",
+        "id": "3aeaa08a.574a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 524.3742980957031,
-        "y": 711.5740356445312,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 510.3742980957031,
+        "y": 675.5740356445312,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "4bb92513.9b1ebc",
+        "id": "1322af3c.bc6319",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 512.8833312988281,
-        "y": 758,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 498.8833312988281,
+        "y": 722,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "f58f94a6.d7fb9"
+                "23db95da.1941e2"
             ]
         ]
     },
     {
-        "id": "d6a121aa.ecf888",
+        "id": "9c476365.2b909",
         "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": 711.8833312988281,
-        "y": 665,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 697.8833312988281,
+        "y": 629,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "46606d75.f5af5c"
+                "1a5a20de.60b4cf"
             ]
         ]
     },
     {
-        "id": "f58f94a6.d7fb9",
+        "id": "23db95da.1941e2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 681.8833312988281,
-        "y": 759,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 667.8833312988281,
+        "y": 723,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "46606d75.f5af5c",
+        "id": "1a5a20de.60b4cf",
         "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": 935.2168273925781,
-        "y": 664.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 921.2168273925781,
+        "y": 628.9999389648438,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1dffeedd.2e39d1"
+                "59a859e2.c48ca8"
             ]
         ]
     },
     {
-        "id": "1dffeedd.2e39d1",
+        "id": "59a859e2.c48ca8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1135.8834648132324,
-        "y": 666.000020980835,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1121.8834648132324,
+        "y": 630.000020980835,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "5eeac4ab.784bec"
+                "ae28be96.a81b18"
             ]
         ]
     },
     {
-        "id": "5eeac4ab.784bec",
+        "id": "ae28be96.a81b18",
         "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": 265.8833312988281,
-        "y": 928,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 251.88333129882812,
+        "y": 892,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "93ffca07.c36c6",
-                "a6155e5c.4a2e4",
-                "edf3ae2.0898ad"
+                "4595d435.587aa4",
+                "60a8c3ff.237aec",
+                "18e77ed.3460901"
             ]
         ]
     },
     {
-        "id": "93ffca07.c36c6",
+        "id": "4595d435.587aa4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 473.8833312988281,
-        "y": 892,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 459.8833312988281,
+        "y": 856,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "41f16b19.4ea28c"
+                "9c5806bb.83c05"
             ]
         ]
     },
     {
-        "id": "a6155e5c.4a2e4",
+        "id": "60a8c3ff.237aec",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 474.3742980957031,
-        "y": 937.5740356445312,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 460.3742980957031,
+        "y": 901.5740356445312,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "edf3ae2.0898ad",
+        "id": "18e77ed.3460901",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 471.8833312988281,
-        "y": 981,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 457.8833312988281,
+        "y": 945,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "77488207.b4a2f4"
+                "a170b783.101ed"
             ]
         ]
     },
     {
-        "id": "77488207.b4a2f4",
+        "id": "a170b783.101ed",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 640.8833312988281,
-        "y": 982,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 626.8833312988281,
+        "y": 946,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "1853bc71.11bc54",
+        "id": "aaf101ae.84a298",
         "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": 612.8833312988281,
-        "y": 1476,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 598.8833312988281,
+        "y": 1440,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "aa99b60e.a0ae8"
+                "48f75925.f13078"
             ]
         ]
     },
     {
-        "id": "aa99b60e.a0ae8",
+        "id": "48f75925.f13078",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 815.8833312988281,
-        "y": 1488,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 801.8833312988281,
+        "y": 1452,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6b5b67d6.d9cff8"
+                "dc596581.8a224"
             ]
         ]
     },
     {
-        "id": "6b5b67d6.d9cff8",
+        "id": "dc596581.8a224",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 981.8833312988281,
-        "y": 1485,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 967.8833312988281,
+        "y": 1449,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c9be5883.2f43"
+                "63611a55.44e3fc"
             ]
         ]
     },
     {
-        "id": "c9be5883.2f43",
+        "id": "63611a55.44e3fc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1142.8833312988281,
-        "y": 1482,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1128.8833312988281,
+        "y": 1446,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "8328946b.83ccf",
-                "70436354.fbd2a4",
-                "71db6bb7.f92dd4",
-                "a3af61e2.8efbd8",
-                "1dbcecbe.b5c9a3"
+                "155181d9.def56e",
+                "450c0202.9562fc",
+                "e522d7e8.f0b6d",
+                "b85bac18.623698",
+                "d97c4e37.51bad8"
             ]
         ]
     },
     {
-        "id": "70436354.fbd2a4",
+        "id": "450c0202.9562fc",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1346.8833312988281,
-        "y": 1440,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1332.8833312988281,
+        "y": 1404,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "8328946b.83ccf",
+        "id": "155181d9.def56e",
         "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": 1343.8833312988281,
-        "y": 1485,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1329.8833312988281,
+        "y": 1449,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "95cc35e2.dbd57",
-                "6243e8b2.6e7d68",
-                "ea238384.cd0de8"
+                "c73d859f.d40f2",
+                "cdecbb41.644898",
+                "ca040aae.e9fa08"
             ]
         ]
     },
     {
-        "id": "6243e8b2.6e7d68",
+        "id": "cdecbb41.644898",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1539.3742980957031,
-        "y": 1458.573974609375,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1525.3742980957031,
+        "y": 1422.573974609375,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "60cc7ad4.175214"
+                "dcd0fdd9.1c84f"
             ]
         ]
     },
     {
-        "id": "ea238384.cd0de8",
+        "id": "ca040aae.e9fa08",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1534.8833312988281,
-        "y": 1502.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1520.8833312988281,
+        "y": 1466.9999389648438,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "33a586e8.574ea2"
+                "7c23dd25.00653c"
             ]
         ]
     },
     {
-        "id": "60cc7ad4.175214",
+        "id": "dcd0fdd9.1c84f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1701.9458312988281,
-        "y": 1457.8596801757812,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1687.9458312988281,
+        "y": 1421.8596801757812,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "33a586e8.574ea2",
+        "id": "7c23dd25.00653c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1702.8833312988281,
-        "y": 1502.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1688.8833312988281,
+        "y": 1466.9999389648438,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "3ed2826e.143bbe",
+        "id": "c84187cf.6e6008",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1704.8833312988281,
-        "y": 1549.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1690.8833312988281,
+        "y": 1513.9999389648438,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "95cc35e2.dbd57",
+        "id": "c73d859f.d40f2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1535.8833312988281,
-        "y": 1549.9999389648438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1521.8833312988281,
+        "y": 1513.9999389648438,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "3ed2826e.143bbe"
+                "c84187cf.6e6008"
             ]
         ]
     },
     {
-        "id": "a3b35ff6.7d4a88",
+        "id": "a7f36b9f.f75b88",
         "type": "switchNode",
         "name": "switch conn type",
         "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 225.38333129882812,
-        "y": 1147,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 211.38333129882812,
+        "y": 1111,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "53e42336.cf6874",
-                "64e5ac9.b8c59d4",
-                "29d673d9.3ef8bc"
+                "b58d5b5e.9a197",
+                "5c723a86.22c16c",
+                "fb40210e.8c5be8"
             ]
         ]
     },
     {
-        "id": "fdb5b362.28d2e8",
+        "id": "ce504b34.d68ac8",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 336.3833312988281,
-        "y": 1503,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 322.3833312988281,
+        "y": 1467,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "53e42336.cf6874",
+        "id": "b58d5b5e.9a197",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 211.38333129882812,
-        "y": 1393,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 197.38333129882812,
+        "y": 1357,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2d911faf.b625f"
+                "67ff853e.386644"
             ]
         ]
     },
     {
-        "id": "64e5ac9.b8c59d4",
+        "id": "5c723a86.22c16c",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 212.38333129882812,
-        "y": 1451,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 198.38333129882812,
+        "y": 1415,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c8a49fba.48732"
+                "402699af.4c591"
             ]
         ]
     },
     {
-        "id": "29d673d9.3ef8bc",
+        "id": "fb40210e.8c5be8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 214.38333129882812,
-        "y": 1505,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 200.38333129882812,
+        "y": 1469,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "fdb5b362.28d2e8"
+                "ce504b34.d68ac8"
             ]
         ]
     },
     {
-        "id": "893647bf.8d35f8",
+        "id": "5d006f15.710a08",
         "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": 1319.8833312988281,
-        "y": 1713,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1305.8833312988281,
+        "y": 1677,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "71db6bb7.f92dd4",
+        "id": "e522d7e8.f0b6d",
         "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": 1410.8833312988281,
-        "y": 1767,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1396.8833312988281,
+        "y": 1731,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c8a49fba.48732",
+        "id": "402699af.4c591",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 328.3833312988281,
-        "y": 1447,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 314.3833312988281,
+        "y": 1411,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c9ed31d4.2a59a",
-                "1853bc71.11bc54",
-                "e2c4a442.f42cf",
-                "7b94a56a.0cc0c4",
-                "14d69ea3.c37079",
-                "e39ba7bd.aed5d8",
-                "9e9fd2d9.fce4a8",
-                "3e44ba6b.3875e6",
-                "de368aef.16cb",
-                "61a182f0.95ec2c",
-                "fae7aeca.a940b8",
-                "f92bafd0.7c69c8"
+                "784b1e5c.92c77",
+                "aaf101ae.84a298",
+                "dfffb0d0.b2d2d",
+                "3502903c.982ab",
+                "5524ecac.5cf47c",
+                "a12bd239.f8368",
+                "f8f2651c.3a035",
+                "f84d6f72.692148",
+                "5d1396ed.19b6f8",
+                "1b4871a6.1cd8a6",
+                "48083140.e99758",
+                "d94511cd.5d63f"
             ]
         ]
     },
     {
-        "id": "2d911faf.b625f",
+        "id": "67ff853e.386644",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 341.3833312988281,
-        "y": 1389,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 326.3833312988281,
+        "y": 1348,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "1853bc71.11bc54",
-                "30a75a3e.13e116",
-                "878444f9.a47b7",
-                "7b94a56a.0cc0c4",
-                "14d69ea3.c37079",
-                "e39ba7bd.aed5d8",
-                "9e9fd2d9.fce4a8",
-                "3e44ba6b.3875e6",
-                "de368aef.16cb",
-                "61a182f0.95ec2c",
-                "fae7aeca.a940b8",
-                "f92bafd0.7c69c8"
+                "aaf101ae.84a298",
+                "80e8f9a6.45b808",
+                "70ed09af.22122",
+                "3502903c.982ab",
+                "5524ecac.5cf47c",
+                "a12bd239.f8368",
+                "f8f2651c.3a035",
+                "f84d6f72.692148",
+                "5d1396ed.19b6f8",
+                "1b4871a6.1cd8a6",
+                "48083140.e99758",
+                "d94511cd.5d63f"
             ]
         ]
     },
     {
-        "id": "30a75a3e.13e116",
+        "id": "80e8f9a6.45b808",
         "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": 632.3833312988281,
-        "y": 1269,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 618.3833312988281,
+        "y": 1233,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "c9ed31d4.2a59a",
+        "id": "784b1e5c.92c77",
         "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": 649.3833312988281,
-        "y": 1363,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 635.3833312988281,
+        "y": 1327,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "7b94a56a.0cc0c4",
+        "id": "3502903c.982ab",
         "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": 575.8833312988281,
-        "y": 1732,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 561.8833312988281,
+        "y": 1696,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "bd67d795.2e839"
+                "2dc7d020.0f01c8"
             ]
         ]
     },
     {
-        "id": "bd67d795.2e839",
+        "id": "2dc7d020.0f01c8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 807.8833312988281,
-        "y": 1731,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 793.8833312988281,
+        "y": 1695,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "148b77ab.48b7a"
+                "9a9b2fc1.cfc378"
             ]
         ]
     },
     {
-        "id": "148b77ab.48b7a",
+        "id": "9a9b2fc1.cfc378",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1019.8833312988281,
-        "y": 1732,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1005.8833312988281,
+        "y": 1696,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "90ccd6ae.a26198"
+                "3ee84e3e.71c9c2"
             ]
         ]
     },
     {
-        "id": "90ccd6ae.a26198",
+        "id": "3ee84e3e.71c9c2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 275.8833312988281,
-        "y": 1888,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 261.8833312988281,
+        "y": 1852,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "8f4c1c14.35a72",
-                "c6a7aee9.6724"
+                "a6f3ac42.8fbf28",
+                "c5253df7.0ed11"
             ]
         ]
     },
     {
-        "id": "c6a7aee9.6724",
+        "id": "c5253df7.0ed11",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 510.8833312988281,
-        "y": 1875,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 496.8833312988281,
+        "y": 1839,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "8f4c1c14.35a72",
+        "id": "a6f3ac42.8fbf28",
         "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": 500.8833312988281,
-        "y": 1936,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 486.8833312988281,
+        "y": 1900,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2e648939.1db066",
-                "6fc34533.3f02e4",
-                "f4ca0a98.2172d"
+                "b27c66fe.f461f8",
+                "d86a808d.b5d38",
+                "51be47ba.06369"
             ]
         ]
     },
     {
-        "id": "6fc34533.3f02e4",
+        "id": "d86a808d.b5d38",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 714.3742980957031,
-        "y": 1920.5740356445312,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 700.3742980957031,
+        "y": 1884.5740356445312,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "24a8c225.12e4ae"
+                "40ccd27e.7bf8ec"
             ]
         ]
     },
     {
-        "id": "f4ca0a98.2172d",
+        "id": "51be47ba.06369",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 709.8833312988281,
-        "y": 1965,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 695.8833312988281,
+        "y": 1929,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a2a9b29c.7bdb18"
+                "10ad75eb.cd3092"
             ]
         ]
     },
     {
-        "id": "2e648939.1db066",
+        "id": "b27c66fe.f461f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 711.8833312988281,
-        "y": 2025,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 697.8833312988281,
+        "y": 1989,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "6e035263.0ab9c4"
+                "f72f31f7.42e17"
             ]
         ]
     },
     {
-        "id": "24a8c225.12e4ae",
+        "id": "40ccd27e.7bf8ec",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 876.9458312988281,
-        "y": 1919.8597412109375,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 862.9458312988281,
+        "y": 1883.8597412109375,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "a2a9b29c.7bdb18",
+        "id": "10ad75eb.cd3092",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 877.8833312988281,
-        "y": 1965,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 863.8833312988281,
+        "y": 1929,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "6e035263.0ab9c4",
+        "id": "f72f31f7.42e17",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 880.8833312988281,
-        "y": 2024,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 866.8833312988281,
+        "y": 1988,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "fc704734.f5a92",
-                "534cefd0.094168"
+                "c01095c8.c5a848",
+                "1e0b480.37d7ab8"
             ]
         ]
     },
     {
-        "id": "9e9fd2d9.fce4a8",
+        "id": "f8f2651c.3a035",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />\n<!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->\n<!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<!--<parameter name='index-number' value='0' />-->\n<!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->\n<!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->\n<!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->\n<!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->\n",
         "comments": "",
-        "x": 279.8833312988281,
-        "y": 2523,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 265.8833312988281,
+        "y": 2487,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "3e44ba6b.3875e6",
+        "id": "f84d6f72.692148",
         "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": 422.8833312988281,
-        "y": 2583,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 408.8833312988281,
+        "y": 2547,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b4c4bd8d.d5bdc",
-                "c813638c.89d0f"
+                "7174c4fb.4236d4",
+                "3df090d7.e28cf"
             ]
         ]
     },
     {
-        "id": "b4c4bd8d.d5bdc",
+        "id": "7174c4fb.4236d4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 735.3833312988281,
-        "y": 2560,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 721.3833312988281,
+        "y": 2524,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c813638c.89d0f",
+        "id": "3df090d7.e28cf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 739.3833312988281,
-        "y": 2600,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 725.3833312988281,
+        "y": 2564,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "3e668730.81c5e8"
+                "bbef1ecc.7916"
             ]
         ]
     },
     {
-        "id": "1c6aee6c.a3a53a",
+        "id": "4d6cfe8e.59e2a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 915.3833312988281,
-        "y": 2564,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 901.3833312988281,
+        "y": 2528,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "3e668730.81c5e8",
+        "id": "bbef1ecc.7916",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 930.8833312988281,
-        "y": 2618,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 916.8833312988281,
+        "y": 2582,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e6168d7c.f871d"
+                "b94bbfec.158258"
             ]
         ]
     },
     {
-        "id": "59cef6d7.b8a21",
+        "id": "b2dda6de.cb3b28",
         "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": 1226.3833312988281,
-        "y": 2587,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1212.3833312988281,
+        "y": 2551,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5303ab1.d78928",
+        "id": "1cb10652.ba5e0a",
         "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": 2693.383331298828,
-        "y": 1938,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2679.383331298828,
+        "y": 1902,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e6168d7c.f871d",
+        "id": "b94bbfec.158258",
         "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": 1188.3833312988281,
-        "y": 2629,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1174.3833312988281,
+        "y": 2593,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "878444f9.a47b7",
+        "id": "70ed09af.22122",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 598.3833312988281,
-        "y": 1307,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 584.3833312988281,
+        "y": 1271,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e2c4a442.f42cf",
+        "id": "dfffb0d0.b2d2d",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 611.3833312988281,
-        "y": 1403,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 597.3833312988281,
+        "y": 1367,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "dd4c3392.e1b02",
+        "id": "9521e4ca.a61af",
         "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": 4347.883331298828,
-        "y": 579,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4333.883331298828,
+        "y": 543,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c0b0957.1e6c48",
+        "id": "1d1e23b2.17cb04",
         "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": 4250.883331298828,
-        "y": 1398,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4236.883331298828,
+        "y": 1362,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "88e8f378.a2b808",
+        "id": "e35a6c95.6b3d6",
         "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": 3744.883331298828,
-        "y": 2070,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3730.883331298828,
+        "y": 2034,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "41f16b19.4ea28c",
+        "id": "9c5806bb.83c05",
         "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": 845.8833312988281,
-        "y": 878,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 831.8833312988281,
+        "y": 842,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "7bf4aa70.c75d74",
-                "a798281b.2c68d8"
+                "24382f34.66808",
+                "ea56d949.8ce4b"
             ]
         ]
     },
     {
-        "id": "7bf4aa70.c75d74",
+        "id": "24382f34.66808",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1208.8833312988281,
-        "y": 901,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1194.8833312988281,
+        "y": 865,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e5a55559.f1ecf"
+                "d7ed30c6.74c9b"
             ]
         ]
     },
     {
-        "id": "a798281b.2c68d8",
+        "id": "ea56d949.8ce4b",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1208.8833312988281,
-        "y": 850,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1194.8833312988281,
+        "y": 814,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "486913c4.08fb54"
+                "3707e8cf.65827"
             ]
         ]
     },
     {
-        "id": "e5a55559.f1ecf",
+        "id": "d7ed30c6.74c9b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1364.8833312988281,
-        "y": 899,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1350.8833312988281,
+        "y": 863,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a3b35ff6.7d4a88"
+                "a7f36b9f.f75b88"
             ]
         ]
     },
     {
-        "id": "486913c4.08fb54",
+        "id": "3707e8cf.65827",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1341.8833312988281,
-        "y": 851,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1327.8833312988281,
+        "y": 815,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "4660bf61.473a18",
+        "id": "ed4d0298.cdb578",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2101.883331298828,
-        "y": 249,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2087.883331298828,
+        "y": 213,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "1fda4b4a.2131e5",
+        "id": "1ced8517.ce35e3",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3643.883331298828,
-        "y": 2230,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 3629.883331298828,
+        "y": 2194,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2a6ffb7c.8797f4",
+        "id": "224f4283.917d26",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4233.883331298828,
-        "y": 703,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 4219.883331298828,
+        "y": 667,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "a3af61e2.8efbd8",
+        "id": "b85bac18.623698",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1407.8833312988281,
-        "y": 1809,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1393.8833312988281,
+        "y": 1773,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "14d69ea3.c37079",
+        "id": "5524ecac.5cf47c",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 586.8833312988281,
-        "y": 1543,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 572.8833312988281,
+        "y": 1507,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e39ba7bd.aed5d8",
+        "id": "a12bd239.f8368",
         "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": 617.8833312988281,
-        "y": 1583,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 603.8833312988281,
+        "y": 1547,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "fc704734.f5a92",
+        "id": "c01095c8.c5a848",
         "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": 1165.8833312988281,
-        "y": 1991,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1151.8833312988281,
+        "y": 1955,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "534cefd0.094168",
+        "id": "1e0b480.37d7ab8",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1168.8833312988281,
-        "y": 2033,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1154.8833312988281,
+        "y": 1997,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "de368aef.16cb",
+        "id": "5d1396ed.19b6f8",
         "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": 611.8833312988281,
-        "y": 1673,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 597.8833312988281,
+        "y": 1637,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "61a182f0.95ec2c",
+        "id": "1b4871a6.1cd8a6",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 366.8833312988281,
-        "y": 2052,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 352.8833312988281,
+        "y": 2016,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "fae7aeca.a940b8",
+        "id": "48083140.e99758",
         "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": 374.8833312988281,
-        "y": 2109,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 360.8833312988281,
+        "y": 2073,
+        "z": "db287b1f.2984a8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1dbcecbe.b5c9a3",
+        "id": "d97c4e37.51bad8",
         "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": 1385.8833312988281,
-        "y": 1658,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1371.8833312988281,
+        "y": 1622,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2facd73.aebb428",
-                "7c34f1f3.22e088"
+                "3df77641.8d727a",
+                "f024d61d.5a31c"
             ]
         ]
     },
     {
-        "id": "7c34f1f3.22e088",
+        "id": "f024d61d.5a31c",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1608.8833312988281,
-        "y": 1613,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1594.8833312988281,
+        "y": 1577,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "7e28ac3f.b53f7c"
+                "3c67000e.e921c"
             ]
         ]
     },
     {
-        "id": "2facd73.aebb428",
+        "id": "3df77641.8d727a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1610.8833312988281,
-        "y": 1677,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1596.8833312988281,
+        "y": 1641,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "c1661a7d.0e642"
+                "de64177a.8916f"
             ]
         ]
     },
     {
-        "id": "7e28ac3f.b53f7c",
+        "id": "3c67000e.e921c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1773.8833312988281,
-        "y": 1610,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1759.8833312988281,
+        "y": 1574,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a55c6cbe.f3cef"
+                "9bea7c66.5f62c8"
             ]
         ]
     },
     {
-        "id": "c1661a7d.0e642",
+        "id": "de64177a.8916f",
         "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": 1772.8833312988281,
-        "y": 1673,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1758.8833312988281,
+        "y": 1637,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "a55c6cbe.f3cef",
+        "id": "9bea7c66.5f62c8",
         "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 -3]`' />\n",
+        "xml": "<set>\n<parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />\n",
         "comments": "",
-        "x": 1993.8833312988281,
-        "y": 1624,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1979.8833312988281,
+        "y": 1588,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "a3eb9377.85c18",
+        "id": "7a38583b.020a88",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1538.8833312988281,
-        "y": 2349,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1524.8833312988281,
+        "y": 2313,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "fcb0361d.62eb48"
+                "c388a6bf.f87f3"
             ]
         ]
     },
     {
-        "id": "dcd8db20.d12b7",
+        "id": "a2f5b878.ad169",
         "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": 1923.8833312988281,
-        "y": 2362,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1909.8833312988281,
+        "y": 2326,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "62f93408.d79154",
-                "c38cc9d8.7f1bc",
-                "576ffe09.c4abd8"
+                "7866488b.2039a8",
+                "bdc692ef.1c0858",
+                "823a852f.40d29"
             ]
         ]
     },
     {
-        "id": "fcb0361d.62eb48",
+        "id": "c388a6bf.f87f3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1717.8833312988281,
-        "y": 2349,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1703.8833312988281,
+        "y": 2313,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "90857791.e16908",
-                "dcd8db20.d12b7"
+                "5c79d6d8.a6a8e",
+                "a2f5b878.ad169"
             ]
         ]
     },
     {
-        "id": "90857791.e16908",
+        "id": "5c79d6d8.a6a8e",
         "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": 1953.8833312988281,
-        "y": 2310,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1939.8833312988281,
+        "y": 2274,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "62f93408.d79154",
+        "id": "7866488b.2039a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2133.883331298828,
-        "y": 2353,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2119.883331298828,
+        "y": 2317,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2c548a06.655d4e"
+                "4da79570.cd80cc"
             ]
         ]
     },
     {
-        "id": "c38cc9d8.7f1bc",
+        "id": "bdc692ef.1c0858",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2125.883331298828,
-        "y": 2408,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2111.883331298828,
+        "y": 2372,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "99196e80.99674"
+                "5ef7fec5.5efb98"
             ]
         ]
     },
     {
-        "id": "576ffe09.c4abd8",
+        "id": "823a852f.40d29",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2130.883331298828,
-        "y": 2465,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2116.883331298828,
+        "y": 2429,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "ea704904.f61c3"
+                "57488074.1d65e"
             ]
         ]
     },
     {
-        "id": "ea704904.f61c3",
+        "id": "57488074.1d65e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2282.883331298828,
-        "y": 2466,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2268.883331298828,
+        "y": 2430,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "99196e80.99674",
+        "id": "5ef7fec5.5efb98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2293.883331298828,
-        "y": 2411,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2279.883331298828,
+        "y": 2375,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2c548a06.655d4e",
+        "id": "4da79570.cd80cc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2278.265655517578,
-        "y": 2350.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2264.265655517578,
+        "y": 2314.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "55de506e.ab2138"
+                "69f8caaf.bba51c"
             ]
         ]
     },
     {
-        "id": "55de506e.ab2138",
+        "id": "69f8caaf.bba51c",
         "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": 2492.883331298828,
-        "y": 2347,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 2478.883331298828,
+        "y": 2311,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "2eeb0084.f61b88",
+        "id": "53cc84ce.e1faf4",
         "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": 616.8833312988281,
-        "y": 2395,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 602.8833312988281,
+        "y": 2359,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "21d8f2c9.3cd2be",
-                "32ff82a0.3bb24e",
-                "21eb3441.66cbb4"
+                "bb343bdc.881868",
+                "8bc84f5e.0473d8",
+                "78444b47.33ec34"
             ]
         ]
     },
     {
-        "id": "21d8f2c9.3cd2be",
+        "id": "bb343bdc.881868",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 812.3834533691406,
-        "y": 2347,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 798.3834533691406,
+        "y": 2311,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "2571d7b1.c4fb5"
+                "bf3ecbb9.4dd008"
             ]
         ]
     },
     {
-        "id": "32ff82a0.3bb24e",
+        "id": "8bc84f5e.0473d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 804.3834533691406,
-        "y": 2402,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 790.3834533691406,
+        "y": 2366,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b0a2917a.ecde4"
+                "ef40b092.bc09e"
             ]
         ]
     },
     {
-        "id": "2571d7b1.c4fb5",
+        "id": "bf3ecbb9.4dd008",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 956.7657775878906,
-        "y": 2346.6556701660156,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 942.7657775878906,
+        "y": 2310.6556701660156,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a50320.52c78ce"
+                "1285266.d4ce8da"
             ]
         ]
     },
     {
-        "id": "a50320.52c78ce",
+        "id": "1285266.d4ce8da",
         "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": 1140.8833312988281,
-        "y": 2345,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1126.8833312988281,
+        "y": 2309,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "b3deb273.cebb88"
+                "640d04c1.8428dc"
             ]
         ]
     },
     {
-        "id": "b3deb273.cebb88",
+        "id": "640d04c1.8428dc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1335.8833312988281,
-        "y": 2345,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1321.8833312988281,
+        "y": 2309,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "a3eb9377.85c18"
+                "7a38583b.020a88"
             ]
         ]
     },
     {
-        "id": "21eb3441.66cbb4",
+        "id": "78444b47.33ec34",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 809.3834533691406,
-        "y": 2459,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 795.3834533691406,
+        "y": 2423,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "f2a9e7b0.6a4ff8"
+                "b417de17.8b3a6"
             ]
         ]
     },
     {
-        "id": "f2a9e7b0.6a4ff8",
+        "id": "b417de17.8b3a6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 961.3834533691406,
-        "y": 2460,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 947.3834533691406,
+        "y": 2424,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "b0a2917a.ecde4",
+        "id": "ef40b092.bc09e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 972.3834533691406,
-        "y": 2403,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 958.3834533691406,
+        "y": 2367,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "e821cf32.5b22f",
+        "id": "fc4eafc.4810e5",
         "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": 606.8833312988281,
-        "y": 2307,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 592.8833312988281,
+        "y": 2271,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "f92bafd0.7c69c8",
+        "id": "d94511cd.5d63f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 351.8833312988281,
-        "y": 2438,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 337.8833312988281,
+        "y": 2402,
+        "z": "db287b1f.2984a8",
         "wires": [
             [
-                "e821cf32.5b22f",
-                "2eeb0084.f61b88"
+                "fc4eafc.4810e5",
+                "53cc84ce.e1faf4"
             ]
         ]
     },
     {
-        "id": "a832f3b6.8874e",
+        "id": "1a955b8d.047dd4",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1566.8500061035156,
-        "y": 255.88333129882812,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 1552.8500061035156,
+        "y": 219.88333129882812,
+        "z": "db287b1f.2984a8",
         "wires": []
     },
     {
-        "id": "f645589d.ed3d98",
+        "id": "9a0e1ef7.428b9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 768.8833312988281,
-        "y": 478,
-        "z": "3f6a2e0f.b66c8a",
+        "x": 754.8833312988281,
+        "y": 442,
+        "z": "db287b1f.2984a8",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-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 d0f35f91..c1b37ce6 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": "401457dc.d91b78",
+    "id": "458f4ac.c4718b4",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 112,
-    "y": 81,
-    "z": "211aaefb.d906ea",
+    "x": 134.88333129882812,
+    "y": 96.88333129882812,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "a013fef2.6f2958"
+        "2b796419.174294"
       ]
     ]
   },
   {
-    "id": "a013fef2.6f2958",
+    "id": "2b796419.174294",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,5633 +22,5709 @@
     "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": 396.2856903076172,
-    "y": 142.23810863494873,
-    "z": "211aaefb.d906ea",
+    "x": 419.1690216064453,
+    "y": 158.12143993377686,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "6ff7b54f.12fd9c"
+        "81638429.4a926"
       ]
     ]
   },
   {
-    "id": "6ff7b54f.12fd9c",
+    "id": "81638429.4a926",
     "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": 402.42860412597656,
-    "y": 227.00003051757812,
-    "z": "211aaefb.d906ea",
+    "x": 425.3119354248047,
+    "y": 242.88336181640625,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "515432f3.743c34"
+        "49ee9c33.493f7c"
       ]
     ]
   },
   {
-    "id": "515432f3.743c34",
+    "id": "49ee9c33.493f7c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 752,
-    "y": 286,
-    "z": "211aaefb.d906ea",
+    "x": 774.8833312988281,
+    "y": 301.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "dd15978c.a7e49",
-        "818743.6c6790c",
-        "ecb6f865.396d18"
+        "a4831915.5eaaa",
+        "7639e853.9511c8",
+        "a54eb7d5.3629"
       ]
     ]
   },
   {
-    "id": "dd15978c.a7e49",
+    "id": "a4831915.5eaaa",
     "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": 1053.33349609375,
-    "y": 556.9302978515625,
-    "z": "211aaefb.d906ea",
+    "x": 1076.2168273925781,
+    "y": 572.8136291503906,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "818743.6c6790c",
+    "id": "7639e853.9511c8",
     "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": 1074.761962890625,
-    "y": 259.33331298828125,
-    "z": "211aaefb.d906ea",
+    "x": 1097.6452941894531,
+    "y": 275.2166442871094,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "5ecdc66f.f6a9f8",
-        "a5115d.53bf7ea",
-        "6a040cf4.34a5f4"
+        "46a7c921.f80be8",
+        "fa1c1252.bcac98",
+        "22347b09.105eec"
       ]
     ]
   },
   {
-    "id": "5ecdc66f.f6a9f8",
+    "id": "46a7c921.f80be8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1299.761962890625,
-    "y": 117.33331298828125,
-    "z": "211aaefb.d906ea",
+    "x": 1322.6452941894531,
+    "y": 133.21664428710938,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "79d6f337.acb234"
+        "f818b9cf.ba44c"
       ]
     ]
   },
   {
-    "id": "a5115d.53bf7ea",
+    "id": "fa1c1252.bcac98",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1295.2529296875,
-    "y": 186.9073486328125,
-    "z": "211aaefb.d906ea",
+    "x": 1318.1362609863281,
+    "y": 202.79067993164062,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "5f1113a0.08e40c"
+        "7ac2bf1b.1c3bb8"
       ]
     ]
   },
   {
-    "id": "6a040cf4.34a5f4",
+    "id": "22347b09.105eec",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1283.761962890625,
-    "y": 233.33331298828125,
-    "z": "211aaefb.d906ea",
+    "x": 1306.6452941894531,
+    "y": 249.21664428710938,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "90f3a407.501d38"
+        "9932a9c7.205738"
       ]
     ]
   },
   {
-    "id": "de3b14d3.6ada2",
+    "id": "3db9725e.eccbce",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1053.761962890625,
-    "y": 147.33331298828125,
-    "z": "211aaefb.d906ea",
+    "x": 1076.6452941894531,
+    "y": 163.21664428710938,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "ecb6f865.396d18",
+    "id": "a54eb7d5.3629",
     "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": 1041.761962890625,
-    "y": 199.33331298828125,
-    "z": "211aaefb.d906ea",
+    "x": 1064.6452941894531,
+    "y": 215.21664428710938,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "79d6f337.acb234",
+    "id": "f818b9cf.ba44c",
     "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": 1540,
-    "y": 114,
-    "z": "211aaefb.d906ea",
+    "x": 1562.8833312988281,
+    "y": 129.88333129882812,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "43c20e21.f32cd8",
-        "28c5af7a.923d38"
+        "8e919d6f.673508",
+        "51e0925d.04913c"
       ]
     ]
   },
   {
-    "id": "5f1113a0.08e40c",
+    "id": "7ac2bf1b.1c3bb8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 1450.0623779296875,
-    "y": 189.85977172851562,
-    "z": "211aaefb.d906ea",
+    "x": 1472.9457092285156,
+    "y": 205.74310302734375,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "90f3a407.501d38",
+    "id": "9932a9c7.205738",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1454,
-    "y": 234,
-    "z": "211aaefb.d906ea",
+    "x": 1476.8833312988281,
+    "y": 249.88333129882812,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "43c20e21.f32cd8",
+    "id": "8e919d6f.673508",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1745,
-    "y": 151,
-    "z": "211aaefb.d906ea",
+    "x": 1767.8833312988281,
+    "y": 166.88333129882812,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "80d61dda.518fc"
+        "68453177.cb78b8"
       ]
     ]
   },
   {
-    "id": "28c5af7a.923d38",
+    "id": "51e0925d.04913c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1755,
-    "y": 78,
-    "z": "211aaefb.d906ea",
+    "x": 1777.8833312988281,
+    "y": 93.88333129882812,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "80d61dda.518fc",
+    "id": "68453177.cb78b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1738,
-    "y": 226,
-    "z": "211aaefb.d906ea",
+    "x": 1760.8833312988281,
+    "y": 241.88333129882812,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "28653cf0.44562c",
-        "75a68f8a.78ad9",
-        "3bc8660b.b8496a",
-        "1213b45b.844d1c",
-        "2c9dde75.d2cff2"
+        "a82eb2b4.74145",
+        "2f11fd49.33bf4a",
+        "3f7479d2.cf6ebe",
+        "9bc906e5.702fc8",
+        "a8e7354f.a1833"
       ]
     ]
   },
   {
-    "id": "98945bed.eff0a8",
+    "id": "c81e4e53.d33bf",
     "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": 2224,
-    "y": 277,
-    "z": "211aaefb.d906ea",
+    "x": 2246.883331298828,
+    "y": 292.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "2960f1eb.c720a6",
-        "872a9fc7.c0cff",
-        "8c06b22e.eee49"
+        "93e1f14a.5a9588",
+        "d05d8571.8f54d8",
+        "43bb6a89.efb504"
       ]
     ]
   },
   {
-    "id": "2960f1eb.c720a6",
+    "id": "93e1f14a.5a9588",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2440,
-    "y": 344,
-    "z": "211aaefb.d906ea",
+    "x": 2462.883331298828,
+    "y": 359.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "c7e960b7.dc23f"
+        "29fa3a31.28ab1e"
       ]
     ]
   },
   {
-    "id": "872a9fc7.c0cff",
+    "id": "d05d8571.8f54d8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2440.490966796875,
-    "y": 243.573974609375,
-    "z": "211aaefb.d906ea",
+    "x": 2463.374298095703,
+    "y": 259.4573059082031,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "6cf8dc3d.cca5ac"
+        "9a07cfe7.b03588"
       ]
     ]
   },
   {
-    "id": "8c06b22e.eee49",
+    "id": "43bb6a89.efb504",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2436,
-    "y": 293,
-    "z": "211aaefb.d906ea",
+    "x": 2458.883331298828,
+    "y": 308.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "9afdf1e0.0463b"
+        "b1a3ba46.e979e8"
       ]
     ]
   },
   {
-    "id": "28653cf0.44562c",
+    "id": "a82eb2b4.74145",
     "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": 1941,
-    "y": 258,
-    "z": "211aaefb.d906ea",
+    "x": 1963.8833312988281,
+    "y": 273.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "b0c3b925.5a198",
-        "98945bed.eff0a8",
-        "59db3330.69645c",
-        "4ebbcee7.69b52"
+        "9e7211a2.fa3648",
+        "c81e4e53.d33bf",
+        "d050303.0f4a3d",
+        "c2f95f80.985fc"
       ]
     ]
   },
   {
-    "id": "b0c3b925.5a198",
+    "id": "9e7211a2.fa3648",
     "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": 2221,
-    "y": 196,
-    "z": "211aaefb.d906ea",
+    "x": 2243.883331298828,
+    "y": 211.88333129882812,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "1213b45b.844d1c",
+    "id": "9bc906e5.702fc8",
     "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": 1915,
-    "y": 208,
-    "z": "211aaefb.d906ea",
+    "x": 1937.8833312988281,
+    "y": 223.88333129882812,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "75a68f8a.78ad9",
+    "id": "2f11fd49.33bf4a",
     "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": 1958,
-    "y": 67,
-    "z": "211aaefb.d906ea",
+    "x": 1980.8833312988281,
+    "y": 82.88333129882812,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "3bc8660b.b8496a",
+    "id": "3f7479d2.cf6ebe",
     "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": 1970,
-    "y": 108,
-    "z": "211aaefb.d906ea",
+    "x": 1992.8833312988281,
+    "y": 123.88333129882812,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "886bedb4.af1a3",
+    "id": "ea819687.b3e55",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 1995,
-    "y": 20,
-    "z": "211aaefb.d906ea",
+    "x": 2017.8833312988281,
+    "y": 35.883331298828125,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "1506b37b.81c545",
+    "id": "a0a17876.3d9168",
     "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": 1915,
-    "y": 154,
-    "z": "211aaefb.d906ea",
+    "x": 1937.8833312988281,
+    "y": 169.88333129882812,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "6cf8dc3d.cca5ac",
+    "id": "9a07cfe7.b03588",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 2619,
-    "y": 246,
-    "z": "211aaefb.d906ea",
+    "x": 2641.883331298828,
+    "y": 261.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "9afdf1e0.0463b",
+    "id": "b1a3ba46.e979e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2618.9375,
-    "y": 295.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 2641.820831298828,
+    "y": 311.0235900878906,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "c7e960b7.dc23f",
+    "id": "29fa3a31.28ab1e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2620.9375,
-    "y": 346.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 2643.820831298828,
+    "y": 362.0235900878906,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "39c57327.b8862c"
+        "ccdb352a.c0afb"
       ]
     ]
   },
   {
-    "id": "39c57327.b8862c",
+    "id": "ccdb352a.c0afb",
     "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": 2913.9375,
-    "y": 293.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 2936.820831298828,
+    "y": 309.0235900878906,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "3bec086a.17141",
-        "202b395f.8fc9be",
-        "205a58b1.00a5c"
+        "1d1c178.a002b69",
+        "a96469cb.c566d8",
+        "1d270f4d.7f92d9"
       ]
     ]
   },
   {
-    "id": "202b395f.8fc9be",
+    "id": "a96469cb.c566d8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3187.428466796875,
-    "y": 185.7142333984375,
-    "z": "211aaefb.d906ea",
+    "x": 3210.311798095703,
+    "y": 201.59756469726562,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "113df3fa.92a3d4"
+        "a9051800.9d7288"
       ]
     ]
   },
   {
-    "id": "113df3fa.92a3d4",
+    "id": "a9051800.9d7288",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3365,
-    "y": 186,
-    "z": "211aaefb.d906ea",
+    "x": 3387.883331298828,
+    "y": 201.88333129882812,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "205a58b1.00a5c",
+    "id": "1d270f4d.7f92d9",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3182.9375,
-    "y": 235.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 3205.820831298828,
+    "y": 251.02359008789062,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "158df1dd.6f3716"
+        "74b9715b.81c6"
       ]
     ]
   },
   {
-    "id": "158df1dd.6f3716",
+    "id": "74b9715b.81c6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3364.9375,
-    "y": 235.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 3387.820831298828,
+    "y": 251.02359008789062,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "3bec086a.17141",
+    "id": "1d1c178.a002b69",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3186.9375,
-    "y": 286.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 3209.820831298828,
+    "y": 302.0235900878906,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "b7f25fb9.397e68"
+        "dea72b0a.7f4d98"
       ]
     ]
   },
   {
-    "id": "b7f25fb9.397e68",
+    "id": "dea72b0a.7f4d98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3366.9375,
-    "y": 286.1402587890625,
-    "z": "211aaefb.d906ea",
+    "x": 3389.820831298828,
+    "y": 302.0235900878906,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "b5f441a1.12264"
+        "1a6bb71b.cc26c9"
       ]
     ]
   },
   {
-    "id": "b5f441a1.12264",
+    "id": "1a6bb71b.cc26c9",
     "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": 2933,
-    "y": 421,
-    "z": "211aaefb.d906ea",
+    "x": 2955.883331298828,
+    "y": 436.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "8b1d1a2b.bf0fd8",
-        "1b31225e.143a7e"
+        "24693fb2.e93b7",
+        "a9c05c16.6229b8"
       ]
     ]
   },
   {
-    "id": "1b31225e.143a7e",
+    "id": "a9c05c16.6229b8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3243,
-    "y": 428,
-    "z": "211aaefb.d906ea",
+    "x": 3265.883331298828,
+    "y": 443.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "8b1d1a2b.bf0fd8",
+    "id": "24693fb2.e93b7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3242,
-    "y": 482,
-    "z": "211aaefb.d906ea",
+    "x": 3264.883331298828,
+    "y": 497.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "f82eb181.80b6b8"
+        "54d9e040.3e5a2"
       ]
     ]
   },
   {
-    "id": "a23264d4.676238",
+    "id": "7514cb1e.22b7cc",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3987,
-    "y": 436,
-    "z": "211aaefb.d906ea",
+    "x": 4009.883331298828,
+    "y": 451.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "ff9fd818.342fc"
+        "1a1e9340.1cb465"
       ]
     ]
   },
   {
-    "id": "ff9fd818.342fc",
+    "id": "1a1e9340.1cb465",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4163.9998779296875,
-    "y": 428.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 4186.883209228516,
+    "y": 444.8832092285156,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "792ffad7.7e059c",
-        "f4f213f7.1f09b"
+        "1cd3fabc.2c7055",
+        "df5b418a.0dd23"
       ]
     ]
   },
   {
-    "id": "f82eb181.80b6b8",
+    "id": "54d9e040.3e5a2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3406,
-    "y": 408,
-    "z": "211aaefb.d906ea",
+    "x": 3428.883331298828,
+    "y": 423.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "ecdd8960.6c28f",
-        "89ab1181.5cfe68"
+        "dde05d5d.d568e8",
+        "89905857.784518"
       ]
     ]
   },
   {
-    "id": "ecdd8960.6c28f",
+    "id": "dde05d5d.d568e8",
     "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": 3687,
-    "y": 364,
-    "z": "211aaefb.d906ea",
+    "x": 3709.883331298828,
+    "y": 379.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "b496725b.6310f"
+        "abe51cd7.f8f208"
       ]
     ]
   },
   {
-    "id": "b496725b.6310f",
+    "id": "abe51cd7.f8f208",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3949,
-    "y": 364,
-    "z": "211aaefb.d906ea",
+    "x": 3971.883331298828,
+    "y": 379.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "a23264d4.676238"
+        "7514cb1e.22b7cc"
       ]
     ]
   },
   {
-    "id": "792ffad7.7e059c",
+    "id": "1cd3fabc.2c7055",
     "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": 4406.9998779296875,
-    "y": 385.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 4429.883209228516,
+    "y": 401.8832092285156,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "f4f213f7.1f09b",
+    "id": "df5b418a.0dd23",
     "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": 4395.9998779296875,
-    "y": 440.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 4418.883209228516,
+    "y": 456.8832092285156,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "738543a5.e85744",
-        "13a5e063.163af8",
-        "e90bc7b5.1f09c"
+        "b1c8bb90.0c2e78",
+        "2f32ddcf.c1426a",
+        "a81fdee7.10c348"
       ]
     ]
   },
   {
-    "id": "e90bc7b5.1f09c",
+    "id": "a81fdee7.10c348",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4649,
-    "y": 327,
-    "z": "211aaefb.d906ea",
+    "x": 4671.883331298828,
+    "y": 342.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "5d8fd93.58407a8"
+        "933dded8.905d48"
       ]
     ]
   },
   {
-    "id": "5d8fd93.58407a8",
+    "id": "933dded8.905d48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4797.571533203125,
-    "y": 327.2857666015625,
-    "z": "211aaefb.d906ea",
+    "x": 4820.454864501953,
+    "y": 343.1690979003906,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "53518ce7.6d697c",
+    "id": "4ff8891b.b27e6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4796.509033203125,
-    "y": 371.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 4819.392364501953,
+    "y": 387.3093566894531,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "13a5e063.163af8",
+    "id": "2f32ddcf.c1426a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4637.509033203125,
-    "y": 371.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 4660.392364501953,
+    "y": 387.3093566894531,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "53518ce7.6d697c"
+        "4ff8891b.b27e6"
       ]
     ]
   },
   {
-    "id": "738543a5.e85744",
+    "id": "b1c8bb90.0c2e78",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4644.509033203125,
-    "y": 450.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 4667.392364501953,
+    "y": 466.3093566894531,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "937d3d5d.26f97"
+        "9b0431ef.52336"
       ]
     ]
   },
   {
-    "id": "937d3d5d.26f97",
+    "id": "9b0431ef.52336",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4783.509033203125,
-    "y": 450.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 4806.392364501953,
+    "y": 466.3093566894531,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "72f3c760.2ca228",
-        "8ec14dfe.92b848"
+        "30420590.b9ff82",
+        "80a75b67.8413b8"
       ]
     ]
   },
   {
-    "id": "72f3c760.2ca228",
+    "id": "30420590.b9ff82",
     "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": 4989,
-    "y": 448,
-    "z": "211aaefb.d906ea",
+    "x": 5011.883331298828,
+    "y": 463.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "8ec14dfe.92b848",
+    "id": "80a75b67.8413b8",
     "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": 4988,
-    "y": 494,
-    "z": "211aaefb.d906ea",
+    "x": 5010.883331298828,
+    "y": 509.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "89ab1181.5cfe68",
+    "id": "89905857.784518",
     "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": 3504,
-    "y": 480,
-    "z": "211aaefb.d906ea",
+    "x": 3526.883331298828,
+    "y": 495.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "f7fb6622.9ee6a8"
+        "b46dcd3d.f4afe8"
       ]
     ]
   },
   {
-    "id": "f7fb6622.9ee6a8",
+    "id": "b46dcd3d.f4afe8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3784,
-    "y": 480,
-    "z": "211aaefb.d906ea",
+    "x": 3806.883331298828,
+    "y": 495.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "ae35e793.89faa8"
+        "f685aa80.8cfb4"
       ]
     ]
   },
   {
-    "id": "ae35e793.89faa8",
+    "id": "f685aa80.8cfb4",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2197.0001220703125,
-    "y": 733.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 2219.8834533691406,
+    "y": 748.8834533691406,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "c9798d0a.ecd3b"
+        "a18b2354.2da15"
       ]
     ]
   },
   {
-    "id": "c9798d0a.ecd3b",
+    "id": "a18b2354.2da15",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2374,
-    "y": 726,
-    "z": "211aaefb.d906ea",
+    "x": 2396.883331298828,
+    "y": 741.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "c196b024.7ddda8",
-        "7125c66b.59e98"
+        "ea2df6b1.4ac208",
+        "5238e333.611ed4"
       ]
     ]
   },
   {
-    "id": "c196b024.7ddda8",
+    "id": "ea2df6b1.4ac208",
     "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": 2617,
-    "y": 683,
-    "z": "211aaefb.d906ea",
+    "x": 2639.883331298828,
+    "y": 698.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "7125c66b.59e98",
+    "id": "5238e333.611ed4",
     "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": 2606,
-    "y": 738,
-    "z": "211aaefb.d906ea",
+    "x": 2628.883331298828,
+    "y": 753.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "9959c5db.04ddc8",
-        "5c37ab7d.23ef4c",
-        "360651b5.116166"
+        "d29bd2a6.f0278",
+        "aae66833.e493",
+        "51948363.691cec"
       ]
     ]
   },
   {
-    "id": "9959c5db.04ddc8",
+    "id": "d29bd2a6.f0278",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2897.490966796875,
-    "y": 716.573974609375,
-    "z": "211aaefb.d906ea",
+    "x": 2920.374298095703,
+    "y": 732.4573059082031,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "95b8ba37.0aee2"
+        "a5baff8.5c15f"
       ]
     ]
   },
   {
-    "id": "5c37ab7d.23ef4c",
+    "id": "aae66833.e493",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2886,
-    "y": 761,
-    "z": "211aaefb.d906ea",
+    "x": 2908.883331298828,
+    "y": 776.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "f8728a74.d6db68"
+        "590adc04.7c8c64"
       ]
     ]
   },
   {
-    "id": "95b8ba37.0aee2",
+    "id": "a5baff8.5c15f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3046.0625,
-    "y": 716.8597412109375,
-    "z": "211aaefb.d906ea",
+    "x": 3068.945831298828,
+    "y": 732.7430725097656,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "f8728a74.d6db68",
+    "id": "590adc04.7c8c64",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3045,
-    "y": 761,
-    "z": "211aaefb.d906ea",
+    "x": 3067.883331298828,
+    "y": 776.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "360651b5.116166",
+    "id": "51948363.691cec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2893,
-    "y": 840,
-    "z": "211aaefb.d906ea",
+    "x": 2915.883331298828,
+    "y": 855.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "7326b1f2.1f515"
+        "138db6d7.8d5031"
       ]
     ]
   },
   {
-    "id": "7326b1f2.1f515",
+    "id": "138db6d7.8d5031",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3032,
-    "y": 840,
-    "z": "211aaefb.d906ea",
+    "x": 3054.883331298828,
+    "y": 855.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "defc50da.4e3908",
-        "b7df8e67.09b008",
-        "8bf3b76.abce348",
-        "25a0f8e1.052e18",
-        "b381c251.6b96c",
-        "89e7916b.fb9e18",
-        "5511f093.c411d8",
-        "d2628754.9207b8",
-        "6481b806.b26798",
-        "20bb7eae.be3a32",
-        "9fcb0922.e08ed",
-        "3db2acf8.6fe83c",
-        "d8a34ec.a6346b",
-        "2783e99.3726216"
+        "7a4c5f2f.9027d8",
+        "f3e41369.61302",
+        "bb0c73ed.00d09",
+        "8e9b40a2.60b6c",
+        "bda9878c.43ffc8",
+        "746b18d4.be3d18",
+        "15698ad5.b40d3d",
+        "3d22a200.42e29e",
+        "ff1965cc.9c6318",
+        "a8011cb7.dd8288",
+        "60be6b60.c49e7c",
+        "77fe2bdc.eed0c4",
+        "c658e7ef.0b11d8",
+        "d48a24b6.db8ce8"
       ]
     ]
   },
   {
-    "id": "57e34af8.6ff4e4",
+    "id": "f45cdd5f.c90798",
     "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": 3346,
-    "y": 646,
-    "z": "211aaefb.d906ea",
+    "x": 3368.883331298828,
+    "y": 661.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "defc50da.4e3908",
+    "id": "7a4c5f2f.9027d8",
     "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": 3327,
-    "y": 696,
-    "z": "211aaefb.d906ea",
+    "x": 3349.883331298828,
+    "y": 711.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "2783e99.3726216",
+    "id": "d48a24b6.db8ce8",
     "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": 3284,
-    "y": 741,
-    "z": "211aaefb.d906ea",
+    "x": 3306.883331298828,
+    "y": 756.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "b7df8e67.09b008",
+    "id": "f3e41369.61302",
     "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": 3259,
-    "y": 804,
-    "z": "211aaefb.d906ea",
+    "x": 3281.883331298828,
+    "y": 819.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "8bf3b76.abce348",
+    "id": "bb0c73ed.00d09",
     "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": 3260,
-    "y": 859,
-    "z": "211aaefb.d906ea",
+    "x": 3282.883331298828,
+    "y": 874.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "25a0f8e1.052e18",
+    "id": "8e9b40a2.60b6c",
     "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": 3276,
-    "y": 907,
-    "z": "211aaefb.d906ea",
+    "x": 3298.883331298828,
+    "y": 922.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "bd8c7e03.e7323",
-        "d55fdbac.2e4bb8",
-        "1bd38601.f7d742"
+        "5e527f7c.215cc8",
+        "e57980fe.5f9758",
+        "d6304ea1.fb76e"
       ]
     ]
   },
   {
-    "id": "b381c251.6b96c",
+    "id": "bda9878c.43ffc8",
     "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": 3265,
-    "y": 993.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3287.883331298828,
+    "y": 1009.8832092285156,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "1da7e0f.b56889f",
-        "484d133e.c5022c",
-        "511cb1cb.4e0758"
+        "be8da30d.6c1bf8",
+        "59df3d01.4ec704",
+        "23f36ff9.6f46c"
       ]
     ]
   },
   {
-    "id": "bd8c7e03.e7323",
+    "id": "5e527f7c.215cc8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3477,
-    "y": 791,
-    "z": "211aaefb.d906ea",
+    "x": 3499.883331298828,
+    "y": 806.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "2e4151be.e64316"
+        "7280738b.1a48a4"
       ]
     ]
   },
   {
-    "id": "d55fdbac.2e4bb8",
+    "id": "e57980fe.5f9758",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3472.509033203125,
-    "y": 840.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 3495.392364501953,
+    "y": 856.3093566894531,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "13e83f49.acd859"
+        "74f46c1.d313d14"
       ]
     ]
   },
   {
-    "id": "1bd38601.f7d742",
+    "id": "d6304ea1.fb76e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3476.509033203125,
-    "y": 893.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 3499.392364501953,
+    "y": 909.3093566894531,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "bbf6b192.5183e"
+        "1f52b8ab.2e56cf"
       ]
     ]
   },
   {
-    "id": "2e4151be.e64316",
+    "id": "7280738b.1a48a4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3625.571533203125,
-    "y": 790.2857666015625,
-    "z": "211aaefb.d906ea",
+    "x": 3648.454864501953,
+    "y": 806.1690979003906,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "13e83f49.acd859",
+    "id": "74f46c1.d313d14",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3615.509033203125,
-    "y": 840.426025390625,
-    "z": "211aaefb.d906ea",
+    "x": 3638.392364501953,
+    "y": 856.3093566894531,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "1da7e0f.b56889f",
+    "id": "be8da30d.6c1bf8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3488,
-    "y": 963.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3510.883331298828,
+    "y": 979.8832092285156,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "27b6a672.93ff42"
+        "4c2e6e70.a93be8"
       ]
     ]
   },
   {
-    "id": "484d133e.c5022c",
+    "id": "59df3d01.4ec704",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3483.509033203125,
-    "y": 1013.4259033203125,
-    "z": "211aaefb.d906ea",
+    "x": 3506.392364501953,
+    "y": 1029.3092346191406,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "9dfa6094.6f7fc"
+        "25d04654.5e839a"
       ]
     ]
   },
   {
-    "id": "511cb1cb.4e0758",
+    "id": "23f36ff9.6f46c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3484.509033203125,
-    "y": 1066.4259033203125,
-    "z": "211aaefb.d906ea",
+    "x": 3507.392364501953,
+    "y": 1082.3092346191406,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "597eb63e.8508f8"
+        "e7e2a18.77a626"
       ]
     ]
   },
   {
-    "id": "27b6a672.93ff42",
+    "id": "4c2e6e70.a93be8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3636.571533203125,
-    "y": 963.28564453125,
-    "z": "211aaefb.d906ea",
+    "x": 3659.454864501953,
+    "y": 979.1689758300781,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "9dfa6094.6f7fc",
+    "id": "25d04654.5e839a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3626.509033203125,
-    "y": 1013.4259033203125,
-    "z": "211aaefb.d906ea",
+    "x": 3649.392364501953,
+    "y": 1029.3092346191406,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "bbf6b192.5183e",
+    "id": "1f52b8ab.2e56cf",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3638,
-    "y": 893,
-    "z": "211aaefb.d906ea",
+    "x": 3660.883331298828,
+    "y": 908.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "254a0cd4.86f82c"
+        "37185a88.04a7d6"
       ]
     ]
   },
   {
-    "id": "597eb63e.8508f8",
+    "id": "e7e2a18.77a626",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3638,
-    "y": 1065.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3660.883331298828,
+    "y": 1081.8832092285156,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e889443b.6afcf"
+        "2a90b49d.030114"
       ]
     ]
   },
   {
-    "id": "254a0cd4.86f82c",
+    "id": "37185a88.04a7d6",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3810,
-    "y": 893,
-    "z": "211aaefb.d906ea",
+    "x": 3832.883331298828,
+    "y": 908.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "6d2ef37a.d5fd0c",
-        "52c8f078.ee2cf"
+        "b7871daf.9b4e8",
+        "5be956df.30349"
       ]
     ]
   },
   {
-    "id": "e889443b.6afcf",
+    "id": "2a90b49d.030114",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3811,
-    "y": 1066,
-    "z": "211aaefb.d906ea",
+    "x": 3833.883331298828,
+    "y": 1081.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "a0b3468.4c1dbb8",
-        "ed4bd4a4.7c002"
+        "7b05f3d6.ed8c14",
+        "ed6ce3d.aa0b8a"
       ]
     ]
   },
   {
-    "id": "6d2ef37a.d5fd0c",
+    "id": "b7871daf.9b4e8",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3986,
-    "y": 872,
-    "z": "211aaefb.d906ea",
+    "x": 4008.883331298828,
+    "y": 887.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e77feac5.4ef39"
+        "52465f0e.0c996"
       ]
     ]
   },
   {
-    "id": "52c8f078.ee2cf",
+    "id": "5be956df.30349",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3988,
-    "y": 926,
-    "z": "211aaefb.d906ea",
+    "x": 4010.883331298828,
+    "y": 941.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "dc5de667.94277"
+        "98cbb890.5e8b88"
       ]
     ]
   },
   {
-    "id": "a0b3468.4c1dbb8",
+    "id": "7b05f3d6.ed8c14",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3987,
-    "y": 1036,
-    "z": "211aaefb.d906ea",
+    "x": 4009.883331298828,
+    "y": 1051.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "79d85b32.4dba8c"
+        "d0104e32.ac2ab8"
       ]
     ]
   },
   {
-    "id": "ed4bd4a4.7c002",
+    "id": "ed6ce3d.aa0b8a",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3989,
-    "y": 1090,
-    "z": "211aaefb.d906ea",
+    "x": 4011.883331298828,
+    "y": 1105.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "5799e4b6.bb5c84"
+        "8e259d5c.262c5"
       ]
     ]
   },
   {
-    "id": "985f8e8b.05bee8",
+    "id": "c68d1d99.71ec4",
     "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": 4296,
-    "y": 824,
-    "z": "211aaefb.d906ea",
+    "x": 4318.883331298828,
+    "y": 839.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "f70bc04c.4e53a8",
+    "id": "97074ecd.08e3c8",
     "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": 4289,
-    "y": 922,
-    "z": "211aaefb.d906ea",
+    "x": 4311.883331298828,
+    "y": 937.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "279fdf30.7efb5",
+    "id": "be8be686.f85c68",
     "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": 4289,
-    "y": 1009,
-    "z": "211aaefb.d906ea",
+    "x": 4311.883331298828,
+    "y": 1024.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "59ab7a89.d7cd04",
+    "id": "3fa3de22.b5b33a",
     "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": 4293,
-    "y": 1102,
-    "z": "211aaefb.d906ea",
+    "x": 4315.883331298828,
+    "y": 1117.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "88375125.392df",
+    "id": "bd818350.b1a8a8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3520,
-    "y": 1511,
-    "z": "211aaefb.d906ea",
+    "x": 3542.883331298828,
+    "y": 1526.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "70cb5f48.205d5"
+        "56ff5ea8.b777"
       ]
     ]
   },
   {
-    "id": "f9f9639f.39277",
+    "id": "ec755270.8f35e8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3529.490966796875,
-    "y": 1553.5740356445312,
-    "z": "211aaefb.d906ea",
+    "x": 3552.374298095703,
+    "y": 1569.4573669433594,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "3188784d.74df2"
+        "e382dfde.5b31d8"
       ]
     ]
   },
   {
-    "id": "5caadc0.419f8a4",
+    "id": "c9437d33.ef4e6",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3518,
-    "y": 1600,
-    "z": "211aaefb.d906ea",
+    "x": 3540.883331298828,
+    "y": 1615.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "150b9d67.7501b3"
+        "f857e1e2.07be58"
       ]
     ]
   },
   {
-    "id": "3a7a9a9d.f62dc6",
+    "id": "5760f0e8.25dba",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3220,
-    "y": 1473,
-    "z": "211aaefb.d906ea",
+    "x": 3242.883331298828,
+    "y": 1488.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "5511f093.c411d8",
+    "id": "15698ad5.b40d3d",
     "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": 3263,
-    "y": 1538,
-    "z": "211aaefb.d906ea",
+    "x": 3285.883331298828,
+    "y": 1553.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "88375125.392df",
-        "f9f9639f.39277",
-        "5caadc0.419f8a4"
+        "bd818350.b1a8a8",
+        "ec755270.8f35e8",
+        "c9437d33.ef4e6"
       ]
     ]
   },
   {
-    "id": "89e7916b.fb9e18",
+    "id": "746b18d4.be3d18",
     "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": 3264,
-    "y": 1208,
-    "z": "211aaefb.d906ea",
+    "x": 3286.883331298828,
+    "y": 1223.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e837ae68.fc604",
-        "bb41717d.607c08"
+        "16a316bf.36aa51",
+        "5dc43b13.af0e5c"
       ]
     ]
   },
   {
-    "id": "bb41717d.607c08",
+    "id": "5dc43b13.af0e5c",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3487,
-    "y": 1194,
-    "z": "211aaefb.d906ea",
+    "x": 3509.883331298828,
+    "y": 1209.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "d2362461.2f81"
+        "4015e76.5fd6098"
       ]
     ]
   },
   {
-    "id": "e837ae68.fc604",
+    "id": "16a316bf.36aa51",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3489,
-    "y": 1227,
-    "z": "211aaefb.d906ea",
+    "x": 3511.883331298828,
+    "y": 1242.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "3512d9a4.ea10d6"
+        "f3f89c52.21e5b8"
       ]
     ]
   },
   {
-    "id": "70cb5f48.205d5",
+    "id": "56ff5ea8.b777",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3692.66650390625,
-    "y": 1510,
-    "z": "211aaefb.d906ea",
+    "x": 3715.549835205078,
+    "y": 1525.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e94025a.e4524d8",
-        "c5dba695.8712a"
+        "286978b9.608f5",
+        "e1e71113.50d348"
       ]
     ]
   },
   {
-    "id": "3188784d.74df2",
+    "id": "e382dfde.5b31d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3683.0623779296875,
-    "y": 1556.8597717285156,
-    "z": "211aaefb.d906ea",
+    "x": 3705.9457092285156,
+    "y": 1572.7431030273438,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "150b9d67.7501b3",
+    "id": "f857e1e2.07be58",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3687,
-    "y": 1601,
-    "z": "211aaefb.d906ea",
+    "x": 3709.883331298828,
+    "y": 1616.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "e94025a.e4524d8",
+    "id": "286978b9.608f5",
     "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": 3957,
-    "y": 1494,
-    "z": "211aaefb.d906ea",
+    "x": 3979.883331298828,
+    "y": 1509.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e5529b75.8cebe8",
-        "23d40330.51306c"
+        "5b0e63ee.a3ecd4",
+        "22c0e5a9.26fd0a"
       ]
     ]
   },
   {
-    "id": "23d40330.51306c",
+    "id": "22c0e5a9.26fd0a",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4180,
-    "y": 1449,
-    "z": "211aaefb.d906ea",
+    "x": 4202.883331298828,
+    "y": 1464.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "3c287465.76fa9c"
+        "bad02ed0.d565e8"
       ]
     ]
   },
   {
-    "id": "e5529b75.8cebe8",
+    "id": "5b0e63ee.a3ecd4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4182,
-    "y": 1513,
-    "z": "211aaefb.d906ea",
+    "x": 4204.883331298828,
+    "y": 1528.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "68bbdd27.0bc724"
+        "cba8e08.e7cb12"
       ]
     ]
   },
   {
-    "id": "68bbdd27.0bc724",
+    "id": "cba8e08.e7cb12",
     "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,
-    "y": 1509,
-    "z": "211aaefb.d906ea",
+    "x": 4366.883331298828,
+    "y": 1524.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "3c287465.76fa9c",
+    "id": "bad02ed0.d565e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4345,
-    "y": 1446,
-    "z": "211aaefb.d906ea",
+    "x": 4367.883331298828,
+    "y": 1461.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "bdb7c671.344b18",
-        "c34e936c.c687c"
+        "14c7dbb3.7bb934",
+        "ad8d4f98.026b1"
       ]
     ]
   },
   {
-    "id": "c36404f4.836da8",
+    "id": "b0538c9f.9cd51",
     "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\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 3959,
-    "y": 1653,
-    "z": "211aaefb.d906ea",
+    "x": 3981.883331298828,
+    "y": 1668.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "b7b75306.125ca8",
+    "id": "4ca2f9ab.45ab7",
     "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": 4004,
-    "y": 1563,
-    "z": "211aaefb.d906ea",
+    "x": 4026.883331298828,
+    "y": 1578.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "6cc070b0.831948",
+    "id": "ecb8fc16.8423f8",
     "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": 4087,
-    "y": 1701,
-    "z": "211aaefb.d906ea",
+    "x": 4109.883331298828,
+    "y": 1716.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "3512d9a4.ea10d6",
+    "id": "f3f89c52.21e5b8",
     "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": 3632,
-    "y": 1224,
-    "z": "211aaefb.d906ea",
+    "x": 3654.883331298828,
+    "y": 1239.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "d2362461.2f81",
+    "id": "4015e76.5fd6098",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3635,
-    "y": 1187,
-    "z": "211aaefb.d906ea",
+    "x": 3657.883331298828,
+    "y": 1202.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e726be0e.35ac3",
-        "2627d74c.d6bd68"
+        "ebd7b0f3.96fde8",
+        "1cc07a61.1b7696"
       ]
     ]
   },
   {
-    "id": "e726be0e.35ac3",
+    "id": "ebd7b0f3.96fde8",
     "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": 3809,
-    "y": 1143,
-    "z": "211aaefb.d906ea",
+    "x": 3831.883331298828,
+    "y": 1158.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "c5dba695.8712a",
+    "id": "e1e71113.50d348",
     "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": 3911,
-    "y": 1778,
-    "z": "211aaefb.d906ea",
+    "x": 3933.883331298828,
+    "y": 1793.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e649e24c.a2956"
+        "bc68df19.413ab"
       ]
     ]
   },
   {
-    "id": "e649e24c.a2956",
+    "id": "bc68df19.413ab",
     "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": 4117,
-    "y": 1778,
-    "z": "211aaefb.d906ea",
+    "x": 4139.883331298828,
+    "y": 1793.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "b51c6327.c26b2"
+        "50ca2971.ea36d8"
       ]
     ]
   },
   {
-    "id": "b51c6327.c26b2",
+    "id": "50ca2971.ea36d8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4332.28564453125,
-    "y": 1777.82177734375,
-    "z": "211aaefb.d906ea",
+    "x": 4355.168975830078,
+    "y": 1793.7051086425781,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "4a081ef3.a11e7"
+        "9aafd9b7.eaf6"
       ]
     ]
   },
   {
-    "id": "2627d74c.d6bd68",
+    "id": "1cc07a61.1b7696",
     "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": 3824,
-    "y": 1254,
-    "z": "211aaefb.d906ea",
+    "x": 3846.883331298828,
+    "y": 1269.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e436419e.4fabd8",
-        "652a3cad.15b09c",
-        "70700ce3.d1704c"
+        "502e27f2.360128",
+        "613a0c37.ee93fc",
+        "15983fe1.c65378"
       ]
     ]
   },
   {
-    "id": "e436419e.4fabd8",
+    "id": "502e27f2.360128",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4019.5001220703125,
-    "y": 1206,
-    "z": "211aaefb.d906ea",
+    "x": 4042.3834533691406,
+    "y": 1221.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "cac46a50.7c9a2"
+        "ab759fb6.dae2a8"
       ]
     ]
   },
   {
-    "id": "652a3cad.15b09c",
+    "id": "613a0c37.ee93fc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4011.5001220703125,
-    "y": 1261,
-    "z": "211aaefb.d906ea",
+    "x": 4034.3834533691406,
+    "y": 1276.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "7a559df8.2fbb14"
+        "bc752416.e0cbc"
       ]
     ]
   },
   {
-    "id": "70700ce3.d1704c",
+    "id": "15983fe1.c65378",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4016.5001220703125,
-    "y": 1318,
-    "z": "211aaefb.d906ea",
+    "x": 4039.3834533691406,
+    "y": 1333.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "74d49b92.9fc25c"
+        "9670670b.649c48"
       ]
     ]
   },
   {
-    "id": "74d49b92.9fc25c",
+    "id": "9670670b.649c48",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4168.5001220703125,
-    "y": 1319,
-    "z": "211aaefb.d906ea",
+    "x": 4191.383453369141,
+    "y": 1334.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "7a559df8.2fbb14",
+    "id": "bc752416.e0cbc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4179.5001220703125,
-    "y": 1264,
-    "z": "211aaefb.d906ea",
+    "x": 4202.383453369141,
+    "y": 1279.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "cac46a50.7c9a2",
+    "id": "ab759fb6.dae2a8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4163.8824462890625,
-    "y": 1203.6556701660156,
-    "z": "211aaefb.d906ea",
+    "x": 4186.765777587891,
+    "y": 1219.5390014648438,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "66f1613b.919fb"
+        "fbc120c8.3124d8"
       ]
     ]
   },
   {
-    "id": "66f1613b.919fb",
+    "id": "fbc120c8.3124d8",
     "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": 4348,
-    "y": 1218,
-    "z": "211aaefb.d906ea",
+    "x": 4370.883331298828,
+    "y": 1233.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "c85b648c.95d8c8"
+        "df89787f.a5a578"
       ]
     ]
   },
   {
-    "id": "c34e936c.c687c",
+    "id": "ad8d4f98.026b1",
     "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": 4515,
-    "y": 1404,
-    "z": "211aaefb.d906ea",
+    "x": 4537.883331298828,
+    "y": 1419.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "bdb7c671.344b18",
+    "id": "14c7dbb3.7bb934",
     "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": 4516,
-    "y": 1512,
-    "z": "211aaefb.d906ea",
+    "x": 4538.883331298828,
+    "y": 1527.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "c2c86af0.87457",
+    "id": "832f55b4.d525f",
     "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": 4517,
-    "y": 1461,
-    "z": "211aaefb.d906ea",
+    "x": 4539.883331298828,
+    "y": 1476.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "4a081ef3.a11e7",
+    "id": "9aafd9b7.eaf6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4539.1171875,
-    "y": 1778.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 4562.000518798828,
+    "y": 1794.2236633300781,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "feabfc8a.6835d8",
-        "3ad150ae.9686d8",
-        "7f60aea1.758cf8"
+        "f4bf2a88.8e07c8",
+        "84226d1d.c53f58",
+        "5135c34e.c2878c"
       ]
     ]
   },
   {
-    "id": "feabfc8a.6835d8",
+    "id": "f4bf2a88.8e07c8",
     "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": 4754.1171875,
-    "y": 1740.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 4777.000518798828,
+    "y": 1756.2236633300781,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "3ad150ae.9686d8",
+    "id": "84226d1d.c53f58",
     "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": 4751.1171875,
-    "y": 1779.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 4774.000518798828,
+    "y": 1795.2236633300781,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "ee0e6ba7.1ab528"
+        "9d44e19c.6d7318"
       ]
     ]
   },
   {
-    "id": "7f60aea1.758cf8",
+    "id": "5135c34e.c2878c",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4706.6171875,
-    "y": 1821.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 4729.500518798828,
+    "y": 1837.2236633300781,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "ee0e6ba7.1ab528",
+    "id": "9d44e19c.6d7318",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4931.6171875,
-    "y": 1778.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 4954.500518798828,
+    "y": 1794.2236633300781,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "f1c6f75a.7a676"
+        "29687f0b.c77f5"
       ]
     ]
   },
   {
-    "id": "3cd8e203.e194b6",
+    "id": "a2ec001d.4a7fb8",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4746,
-    "y": 1222,
-    "z": "211aaefb.d906ea",
+    "x": 4768.883331298828,
+    "y": 1237.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "17b6f38.a7a3d8d"
+        "6f5c9a68.97563c"
       ]
     ]
   },
   {
-    "id": "17b6f38.a7a3d8d",
+    "id": "6f5c9a68.97563c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4923,
-    "y": 1214,
-    "z": "211aaefb.d906ea",
+    "x": 4945.883331298828,
+    "y": 1229.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "676933bd.3d8274",
-        "263106c3.f9fd42"
+        "7ae681af.873ac8",
+        "9549ff73.9a1cc8"
       ]
     ]
   },
   {
-    "id": "c85b648c.95d8c8",
+    "id": "df89787f.a5a578",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4543,
-    "y": 1218,
-    "z": "211aaefb.d906ea",
+    "x": 4565.883331298828,
+    "y": 1233.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "3cd8e203.e194b6",
-        "a370dab4.6f2d18"
+        "a2ec001d.4a7fb8",
+        "bc76afd9.40381"
       ]
     ]
   },
   {
-    "id": "a370dab4.6f2d18",
+    "id": "bc76afd9.40381",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4749,
-    "y": 1296,
-    "z": "211aaefb.d906ea",
+    "x": 4771.883331298828,
+    "y": 1311.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "9dd5a5f0.afd2"
+        "1ac8b93a.8f9647"
       ]
     ]
   },
   {
-    "id": "9dd5a5f0.afd2",
+    "id": "1ac8b93a.8f9647",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4926,
-    "y": 1288,
-    "z": "211aaefb.d906ea",
+    "x": 4948.883331298828,
+    "y": 1303.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "fbf0fc4a.17b5c8"
+        "12ac39b2.69f38e"
       ]
     ]
   },
   {
-    "id": "f1c6f75a.7a676",
+    "id": "29687f0b.c77f5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5089.6171875,
-    "y": 1778.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 5112.500518798828,
+    "y": 1794.2236633300781,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "3b33bb0c.f032cc"
+        "6aef1ca3.67a3dc"
       ]
     ]
   },
   {
-    "id": "3b33bb0c.f032cc",
+    "id": "6aef1ca3.67a3dc",
     "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": 5296.6171875,
-    "y": 1778.34033203125,
-    "z": "211aaefb.d906ea",
+    "x": 5319.500518798828,
+    "y": 1794.2236633300781,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "263106c3.f9fd42",
+    "id": "9549ff73.9a1cc8",
     "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": 5131,
-    "y": 1221,
-    "z": "211aaefb.d906ea",
+    "x": 5153.883331298828,
+    "y": 1236.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "ddcc8888.29b548",
-        "db7fdb45.821a78",
-        "ff56d5.bfda3928"
+        "1ca68d2c.42a1b3",
+        "79238f45.d528a",
+        "b580a25b.41384"
       ]
     ]
   },
   {
-    "id": "676933bd.3d8274",
+    "id": "7ae681af.873ac8",
     "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": 5161,
-    "y": 1169,
-    "z": "211aaefb.d906ea",
+    "x": 5183.883331298828,
+    "y": 1184.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "ddcc8888.29b548",
+    "id": "1ca68d2c.42a1b3",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5341,
-    "y": 1212,
-    "z": "211aaefb.d906ea",
+    "x": 5363.883331298828,
+    "y": 1227.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e7e5466f.7658a"
+        "1cf65ad.e3b2e25"
       ]
     ]
   },
   {
-    "id": "db7fdb45.821a78",
+    "id": "79238f45.d528a",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5333,
-    "y": 1267,
-    "z": "211aaefb.d906ea",
+    "x": 5355.883331298828,
+    "y": 1282.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "1793a855.2047c"
+        "55debd4.7dcf144"
       ]
     ]
   },
   {
-    "id": "ff56d5.bfda3928",
+    "id": "b580a25b.41384",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5338,
-    "y": 1324,
-    "z": "211aaefb.d906ea",
+    "x": 5360.883331298828,
+    "y": 1339.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "81dadd48.c741d8"
+        "277b43ae.d3d8bc"
       ]
     ]
   },
   {
-    "id": "81dadd48.c741d8",
+    "id": "277b43ae.d3d8bc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5490,
-    "y": 1325,
-    "z": "211aaefb.d906ea",
+    "x": 5512.883331298828,
+    "y": 1340.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "1793a855.2047c",
+    "id": "55debd4.7dcf144",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5501,
-    "y": 1270,
-    "z": "211aaefb.d906ea",
+    "x": 5523.883331298828,
+    "y": 1285.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "e7e5466f.7658a",
+    "id": "1cf65ad.e3b2e25",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5485.38232421875,
-    "y": 1209.6556701660156,
-    "z": "211aaefb.d906ea",
+    "x": 5508.265655517578,
+    "y": 1225.5390014648438,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "dde9f23c.0ef22"
+        "293b0137.5d1d8e"
       ]
     ]
   },
   {
-    "id": "fbf0fc4a.17b5c8",
+    "id": "12ac39b2.69f38e",
     "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": 5161,
-    "y": 1412,
-    "z": "211aaefb.d906ea",
+    "x": 5183.883331298828,
+    "y": 1427.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "dde9f23c.0ef22",
+    "id": "293b0137.5d1d8e",
     "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": 5700,
-    "y": 1206,
-    "z": "211aaefb.d906ea",
+    "x": 5722.883331298828,
+    "y": 1221.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "f4910610.e101b8",
+    "id": "f12c4ac3.acc2d",
     "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": 4284,
-    "y": 860,
-    "z": "211aaefb.d906ea",
+    "x": 4306.883331298828,
+    "y": 875.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "f3cd87cd.165138",
+    "id": "23d5a8e8.6a48d8",
     "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": 4275,
-    "y": 958,
-    "z": "211aaefb.d906ea",
+    "x": 4297.883331298828,
+    "y": 973.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "e77feac5.4ef39",
+    "id": "52465f0e.0c996",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4109,
-    "y": 866,
-    "z": "211aaefb.d906ea",
+    "x": 4131.883331298828,
+    "y": 881.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "985f8e8b.05bee8",
-        "f4910610.e101b8"
+        "c68d1d99.71ec4",
+        "f12c4ac3.acc2d"
       ]
     ]
   },
   {
-    "id": "dc5de667.94277",
+    "id": "98cbb890.5e8b88",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4115,
-    "y": 930,
-    "z": "211aaefb.d906ea",
+    "x": 4137.883331298828,
+    "y": 945.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "f70bc04c.4e53a8",
-        "f3cd87cd.165138"
+        "97074ecd.08e3c8",
+        "23d5a8e8.6a48d8"
       ]
     ]
   },
   {
-    "id": "79d85b32.4dba8c",
+    "id": "d0104e32.ac2ab8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4115,
-    "y": 1036,
-    "z": "211aaefb.d906ea",
+    "x": 4137.883331298828,
+    "y": 1051.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "279fdf30.7efb5",
-        "746b1d51.0e2bec"
+        "be8be686.f85c68",
+        "e50dfba7.f60328"
       ]
     ]
   },
   {
-    "id": "5799e4b6.bb5c84",
+    "id": "8e259d5c.262c5",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4118,
-    "y": 1089,
-    "z": "211aaefb.d906ea",
+    "x": 4140.883331298828,
+    "y": 1104.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "59ab7a89.d7cd04",
-        "b63e0082.68a46"
+        "3fa3de22.b5b33a",
+        "6c2da806.3569b"
       ]
     ]
   },
   {
-    "id": "746b1d51.0e2bec",
+    "id": "e50dfba7.f60328",
     "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": 4275,
-    "y": 1049,
-    "z": "211aaefb.d906ea",
+    "x": 4297.883331298828,
+    "y": 1064.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "b63e0082.68a46",
+    "id": "6c2da806.3569b",
     "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": 4278,
-    "y": 1140,
-    "z": "211aaefb.d906ea",
+    "x": 4300.883331298828,
+    "y": 1155.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "87a4f79d.f1b41",
+    "id": "b9324a20.74a63",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3650,
-    "y": 2350,
-    "z": "211aaefb.d906ea",
+    "x": 3672.883331298828,
+    "y": 2365.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "8613884a.623e8",
-        "df0137f0.20c7a8"
+        "f10be91.1b09d98",
+        "d09bd461.c7ba88"
       ]
     ]
   },
   {
-    "id": "af9ecc7.c2e763",
+    "id": "56bce95e.90bfe",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3477.33349609375,
-    "y": 2351,
-    "z": "211aaefb.d906ea",
+    "x": 3500.216827392578,
+    "y": 2366.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "87a4f79d.f1b41"
+        "b9324a20.74a63"
       ]
     ]
   },
   {
-    "id": "53f2a3cf.4dd8a4",
+    "id": "aea1bf99.8fdcc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3486.824462890625,
-    "y": 2393.5740356445312,
-    "z": "211aaefb.d906ea",
+    "x": 3509.707794189453,
+    "y": 2409.4573669433594,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "50bbbd16.7373fc"
+        "29a46b5c.88b5bc"
       ]
     ]
   },
   {
-    "id": "aba66972.a33e38",
+    "id": "87e0206.8796c6",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3475.33349609375,
-    "y": 2440,
-    "z": "211aaefb.d906ea",
+    "x": 3498.216827392578,
+    "y": 2455.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "6c045770.56d3d"
+        "1d955e57.2601ca"
       ]
     ]
   },
   {
-    "id": "50bbbd16.7373fc",
+    "id": "29a46b5c.88b5bc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3640.3958740234375,
-    "y": 2396.8597717285156,
-    "z": "211aaefb.d906ea",
+    "x": 3663.2792053222656,
+    "y": 2412.7431030273438,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "6c045770.56d3d",
+    "id": "1d955e57.2601ca",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3644.33349609375,
-    "y": 2441,
-    "z": "211aaefb.d906ea",
+    "x": 3667.216827392578,
+    "y": 2456.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "8613884a.623e8",
+    "id": "f10be91.1b09d98",
     "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": 3936.33349609375,
-    "y": 2354.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 3959.216827392578,
+    "y": 2369.8834533691406,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "d23083de.2cf1e",
-        "7516fca6.f7fc04"
+        "fda7c536.3acee",
+        "c79b96a2.97ef58"
       ]
     ]
   },
   {
-    "id": "7516fca6.f7fc04",
+    "id": "c79b96a2.97ef58",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4159.33349609375,
-    "y": 2309.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4182.216827392578,
+    "y": 2324.8834533691406,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "c66357b4.73185"
+        "81ad908f.6a16e"
       ]
     ]
   },
   {
-    "id": "d23083de.2cf1e",
+    "id": "fda7c536.3acee",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4161.33349609375,
-    "y": 2373.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4184.216827392578,
+    "y": 2388.8834533691406,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "a82df7d1.ae6a"
+        "e8b14d91.9e5c88"
       ]
     ]
   },
   {
-    "id": "a82df7d1.ae6a",
+    "id": "e8b14d91.9e5c88",
     "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.33349609375,
-    "y": 2392.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4343.216827392578,
+    "y": 2407.8834533691406,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "c66357b4.73185",
+    "id": "81ad908f.6a16e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4324.33349609375,
-    "y": 2306.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4347.216827392578,
+    "y": 2321.8834533691406,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "dffb0ed6.823ba",
-        "1dd3dd1b.7300fb"
+        "cad9326b.b2da",
+        "3eb5f127.732d1e"
       ]
     ]
   },
   {
-    "id": "634f24c.033d45c",
+    "id": "cf8b334d.12d69",
     "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<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\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 3938.33349609375,
-    "y": 2513.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 3961.216827392578,
+    "y": 2528.8834533691406,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "165310c1.3dcf57",
+    "id": "a51bfc6c.2ab4b",
     "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": 3983.33349609375,
-    "y": 2423.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4006.216827392578,
+    "y": 2438.8834533691406,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "1c4663ba.666f24",
+    "id": "5d70457e.e444e4",
     "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": 4065.33349609375,
-    "y": 2578.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4088.216827392578,
+    "y": 2593.8834533691406,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "6481b806.b26798",
+    "id": "ff1965cc.9c6318",
     "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": 3249.33349609375,
-    "y": 2386,
-    "z": "211aaefb.d906ea",
+    "x": 3272.216827392578,
+    "y": 2401.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "af9ecc7.c2e763",
-        "53f2a3cf.4dd8a4",
-        "aba66972.a33e38"
+        "56bce95e.90bfe",
+        "aea1bf99.8fdcc",
+        "87e0206.8796c6"
       ]
     ]
   },
   {
-    "id": "357b021d.ccef76",
+    "id": "e04ad761.fdc11",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3210.33349609375,
-    "y": 2330,
-    "z": "211aaefb.d906ea",
+    "x": 3233.216827392578,
+    "y": 2345.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "d2628754.9207b8",
+    "id": "3d22a200.42e29e",
     "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": 3267.33349609375,
-    "y": 2048.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3290.216827392578,
+    "y": 2064.8832092285156,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "f940533a.3599b",
-        "b0b7c077.9433c"
+        "f0778891.f400f",
+        "2be980fe.83d6b8"
       ]
     ]
   },
   {
-    "id": "b0b7c077.9433c",
+    "id": "2be980fe.83d6b8",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3490.33349609375,
-    "y": 2034.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3513.216827392578,
+    "y": 2050.8832092285156,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "c06f7f13.a06918"
+        "1ec9f8d.bab6807"
       ]
     ]
   },
   {
-    "id": "f940533a.3599b",
+    "id": "f0778891.f400f",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3492.33349609375,
-    "y": 2067.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3515.216827392578,
+    "y": 2083.8832092285156,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "1b16d50a.3ac5a3"
+        "45edb459.c45c8c"
       ]
     ]
   },
   {
-    "id": "1b16d50a.3ac5a3",
+    "id": "45edb459.c45c8c",
     "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": 3635.33349609375,
-    "y": 2064.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3658.216827392578,
+    "y": 2080.8832092285156,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "c06f7f13.a06918",
+    "id": "1ec9f8d.bab6807",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3638.33349609375,
-    "y": 2027.9998779296875,
-    "z": "211aaefb.d906ea",
+    "x": 3661.216827392578,
+    "y": 2043.8832092285156,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "f576457.60ef6b8",
-        "57336dca.385a1c"
+        "8bf99b8b.4af368",
+        "57c842ba.83379c"
       ]
     ]
   },
   {
-    "id": "f576457.60ef6b8",
+    "id": "8bf99b8b.4af368",
     "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": 3832.33349609375,
-    "y": 2031,
-    "z": "211aaefb.d906ea",
+    "x": 3855.216827392578,
+    "y": 2046.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "df0137f0.20c7a8",
+    "id": "d09bd461.c7ba88",
     "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": 3895.33349609375,
-    "y": 2663,
-    "z": "211aaefb.d906ea",
+    "x": 3918.216827392578,
+    "y": 2678.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e2836384.c2ccb8"
+        "adbd165.7c69a68"
       ]
     ]
   },
   {
-    "id": "e2836384.c2ccb8",
+    "id": "adbd165.7c69a68",
     "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": 4101.33349609375,
-    "y": 2663,
-    "z": "211aaefb.d906ea",
+    "x": 4124.216827392578,
+    "y": 2678.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "fca69a38.03a91"
+        "9b58a38.dc3806"
       ]
     ]
   },
   {
-    "id": "fca69a38.03a91",
+    "id": "9b58a38.dc3806",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4318.619140625,
-    "y": 2661.82177734375,
-    "z": "211aaefb.d906ea",
+    "x": 4341.502471923828,
+    "y": 2677.705108642578,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "7ea58eaa.2fe4c8"
+        "ec0e6199.3c529"
       ]
     ]
   },
   {
-    "id": "57336dca.385a1c",
+    "id": "57c842ba.83379c",
     "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": 3854.33349609375,
-    "y": 2099,
-    "z": "211aaefb.d906ea",
+    "x": 3877.216827392578,
+    "y": 2114.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "4f2611a4.8dfaa",
-        "d01e89f4.899b8",
-        "4dbe2024.2418c8"
+        "34626e8a.0bbe1a",
+        "390dcffe.f00898",
+        "4d1fe4fe.2890ec"
       ]
     ]
   },
   {
-    "id": "4f2611a4.8dfaa",
+    "id": "34626e8a.0bbe1a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4049.8336181640625,
-    "y": 2051,
-    "z": "211aaefb.d906ea",
+    "x": 4072.7169494628906,
+    "y": 2066.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "c7fe21e9.219fb"
+        "95be6ff8.bea0e"
       ]
     ]
   },
   {
-    "id": "d01e89f4.899b8",
+    "id": "390dcffe.f00898",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4041.8336181640625,
-    "y": 2106,
-    "z": "211aaefb.d906ea",
+    "x": 4064.7169494628906,
+    "y": 2121.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "711f5b9.04549a4"
+        "46312f08.59959"
       ]
     ]
   },
   {
-    "id": "4dbe2024.2418c8",
+    "id": "4d1fe4fe.2890ec",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4046.8336181640625,
-    "y": 2163,
-    "z": "211aaefb.d906ea",
+    "x": 4069.7169494628906,
+    "y": 2178.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "7a110b6a.211174"
+        "15450853.01aa88"
       ]
     ]
   },
   {
-    "id": "7a110b6a.211174",
+    "id": "15450853.01aa88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4198.8336181640625,
-    "y": 2164,
-    "z": "211aaefb.d906ea",
+    "x": 4221.716949462891,
+    "y": 2179.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "711f5b9.04549a4",
+    "id": "46312f08.59959",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4209.8336181640625,
-    "y": 2109,
-    "z": "211aaefb.d906ea",
+    "x": 4232.716949462891,
+    "y": 2124.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "c7fe21e9.219fb",
+    "id": "95be6ff8.bea0e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4194.2159423828125,
-    "y": 2048.6556701660156,
-    "z": "211aaefb.d906ea",
+    "x": 4217.099273681641,
+    "y": 2064.5390014648438,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "5f7a4387.8903dc"
+        "691678af.c2875"
       ]
     ]
   },
   {
-    "id": "dffb0ed6.823ba",
+    "id": "cad9326b.b2da",
     "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": 4494.33349609375,
-    "y": 2267.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4517.216827392578,
+    "y": 2282.8834533691406,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "1dd3dd1b.7300fb",
+    "id": "3eb5f127.732d1e",
     "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": 4495.33349609375,
-    "y": 2372.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4518.216827392578,
+    "y": 2387.8834533691406,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "132cb9b4.8d2256",
+    "id": "bf01d807.ca2a6",
     "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": 4490.33349609375,
-    "y": 2321.0001220703125,
-    "z": "211aaefb.d906ea",
+    "x": 4513.216827392578,
+    "y": 2336.8834533691406,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "7ea58eaa.2fe4c8",
+    "id": "ec0e6199.3c529",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4525.45068359375,
-    "y": 2651.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 4548.334014892578,
+    "y": 2667.2237854003906,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "9217eff0.7fa96",
-        "965ae906.eae45",
-        "1b19b6f0.8ece39"
+        "310c30a2.98cdd8",
+        "f852afcd.3e249",
+        "77117052.72541"
       ]
     ]
   },
   {
-    "id": "9217eff0.7fa96",
+    "id": "310c30a2.98cdd8",
     "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": 4740.45068359375,
-    "y": 2613.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 4763.334014892578,
+    "y": 2629.2237854003906,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "965ae906.eae45",
+    "id": "f852afcd.3e249",
     "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": 4737.45068359375,
-    "y": 2652.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 4760.334014892578,
+    "y": 2668.2237854003906,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "87f8942.95038e8"
+        "8dd58be1.de6918"
       ]
     ]
   },
   {
-    "id": "1b19b6f0.8ece39",
+    "id": "77117052.72541",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4692.95068359375,
-    "y": 2694.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 4715.834014892578,
+    "y": 2710.2237854003906,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "87f8942.95038e8",
+    "id": "8dd58be1.de6918",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4917.95068359375,
-    "y": 2651.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 4940.834014892578,
+    "y": 2667.2237854003906,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "65d1ff2e.3f2e18"
+        "bf6de4b9.07a8d8"
       ]
     ]
   },
   {
-    "id": "65d1ff2e.3f2e18",
+    "id": "bf6de4b9.07a8d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5075.95068359375,
-    "y": 2651.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 5098.834014892578,
+    "y": 2667.2237854003906,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "fedf1a96.f1456"
+        "4337b0b8.5fd258"
       ]
     ]
   },
   {
-    "id": "fedf1a96.f1456",
+    "id": "4337b0b8.5fd258",
     "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": 5282.95068359375,
-    "y": 2651.3404541015625,
-    "z": "211aaefb.d906ea",
+    "x": 5305.834014892578,
+    "y": 2667.2237854003906,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "115bab50.32a055",
+    "id": "290c1291.0be836",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4776.33349609375,
-    "y": 2067,
-    "z": "211aaefb.d906ea",
+    "x": 4799.216827392578,
+    "y": 2082.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e64c3553.0ae97"
+        "4a42d224.6e916c"
       ]
     ]
   },
   {
-    "id": "e64c3553.0ae97",
+    "id": "4a42d224.6e916c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4953.33349609375,
-    "y": 2059,
-    "z": "211aaefb.d906ea",
+    "x": 4976.216827392578,
+    "y": 2074.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "a2d6f837.6f757",
-        "eeac3b28.315368"
+        "44500a36.8314c4",
+        "edf4775.6feec88"
       ]
     ]
   },
   {
-    "id": "5f7a4387.8903dc",
+    "id": "691678af.c2875",
     "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": 4378.33349609375,
-    "y": 2063,
-    "z": "211aaefb.d906ea",
+    "x": 4401.216827392578,
+    "y": 2078.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "bd77f52.650d108"
+        "e26ac43.7b22838"
       ]
     ]
   },
   {
-    "id": "bd77f52.650d108",
+    "id": "e26ac43.7b22838",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4573.33349609375,
-    "y": 2063,
-    "z": "211aaefb.d906ea",
+    "x": 4596.216827392578,
+    "y": 2078.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "115bab50.32a055",
-        "c1dba387.605d3"
+        "290c1291.0be836",
+        "91efe90a.a989f"
       ]
     ]
   },
   {
-    "id": "eeac3b28.315368",
+    "id": "edf4775.6feec88",
     "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": 5161.33349609375,
-    "y": 2066,
-    "z": "211aaefb.d906ea",
+    "x": 5184.216827392578,
+    "y": 2081.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "fa5ccc46.c0c8e8",
-        "7f544ab3.a923ac",
-        "629c31b0.bf54b"
+        "ccc8d651.608a58",
+        "4c1a6f18.7cad4",
+        "d7a69532.21f81"
       ]
     ]
   },
   {
-    "id": "3e060ac3.b125d6",
+    "id": "1e83e9df.5f1ca6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4955.33349609375,
-    "y": 2132,
-    "z": "211aaefb.d906ea",
+    "x": 4978.216827392578,
+    "y": 2147.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "a8b3b7de.4e882"
+        "36af6584.4e4842"
       ]
     ]
   },
   {
-    "id": "c1dba387.605d3",
+    "id": "91efe90a.a989f",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4778.33349609375,
-    "y": 2140,
-    "z": "211aaefb.d906ea",
+    "x": 4801.216827392578,
+    "y": 2155.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "3e060ac3.b125d6"
+        "1e83e9df.5f1ca6"
       ]
     ]
   },
   {
-    "id": "a2d6f837.6f757",
+    "id": "44500a36.8314c4",
     "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": 5191.33349609375,
-    "y": 2014,
-    "z": "211aaefb.d906ea",
+    "x": 5214.216827392578,
+    "y": 2029.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "a8b3b7de.4e882",
+    "id": "36af6584.4e4842",
     "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": 5190.33349609375,
-    "y": 2256,
-    "z": "211aaefb.d906ea",
+    "x": 5213.216827392578,
+    "y": 2271.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "fa5ccc46.c0c8e8",
+    "id": "ccc8d651.608a58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5371.33349609375,
-    "y": 2057,
-    "z": "211aaefb.d906ea",
+    "x": 5394.216827392578,
+    "y": 2072.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "58f99424.7527f4"
+        "39681472.975784"
       ]
     ]
   },
   {
-    "id": "7f544ab3.a923ac",
+    "id": "4c1a6f18.7cad4",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5363.33349609375,
-    "y": 2112,
-    "z": "211aaefb.d906ea",
+    "x": 5386.216827392578,
+    "y": 2127.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "ffe0cce7.8e8ca"
+        "bc7c4cb6.e261e8"
       ]
     ]
   },
   {
-    "id": "629c31b0.bf54b",
+    "id": "d7a69532.21f81",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5368.33349609375,
-    "y": 2169,
-    "z": "211aaefb.d906ea",
+    "x": 5391.216827392578,
+    "y": 2184.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "cc8477b8.611dc8"
+        "10a038dd.f22947"
       ]
     ]
   },
   {
-    "id": "cc8477b8.611dc8",
+    "id": "10a038dd.f22947",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5520.33349609375,
-    "y": 2170,
-    "z": "211aaefb.d906ea",
+    "x": 5543.216827392578,
+    "y": 2185.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "ffe0cce7.8e8ca",
+    "id": "bc7c4cb6.e261e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5531.33349609375,
-    "y": 2115,
-    "z": "211aaefb.d906ea",
+    "x": 5554.216827392578,
+    "y": 2130.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "58f99424.7527f4",
+    "id": "39681472.975784",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5515.7158203125,
-    "y": 2054.6556701660156,
-    "z": "211aaefb.d906ea",
+    "x": 5538.599151611328,
+    "y": 2070.5390014648438,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "f5242e64.71f82"
+        "19f3508c.df2467"
       ]
     ]
   },
   {
-    "id": "f5242e64.71f82",
+    "id": "19f3508c.df2467",
     "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": 5730.33349609375,
-    "y": 2051,
-    "z": "211aaefb.d906ea",
+    "x": 5753.216827392578,
+    "y": 2066.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "20bb7eae.be3a32",
+    "id": "a8011cb7.dd8288",
     "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`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
+    "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": 3229,
-    "y": 1661,
-    "z": "211aaefb.d906ea",
+    "x": 3251.883331298828,
+    "y": 1676.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "7762f3ae.52a254",
+    "id": "48c20a24.e1d944",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4451,
-    "y": 944,
-    "z": "211aaefb.d906ea",
+    "x": 4473.883331298828,
+    "y": 959.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "edff520.fc6aeb",
+    "id": "33f8c668.c00922",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4443,
-    "y": 1034,
-    "z": "211aaefb.d906ea",
+    "x": 4465.883331298828,
+    "y": 1049.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "9fcb0922.e08ed",
+    "id": "60be6b60.c49e7c",
     "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`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
+    "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": 3210,
-    "y": 2517,
-    "z": "211aaefb.d906ea",
+    "x": 3232.883331298828,
+    "y": 2532.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "3db2acf8.6fe83c",
+    "id": "77fe2bdc.eed0c4",
     "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": 3361,
-    "y": 2765,
-    "z": "211aaefb.d906ea",
+    "x": 3383.883331298828,
+    "y": 2780.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "d8a34ec.a6346b",
+    "id": "c658e7ef.0b11d8",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3238,
-    "y": 2875,
-    "z": "211aaefb.d906ea",
+    "x": 3260.883331298828,
+    "y": 2890.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "52347f79.8db4f",
-        "cd09ff82.d8b0a8"
+        "5eb047e9.2f7668",
+        "a0bb1c61.b88728"
       ]
     ]
   },
   {
-    "id": "52347f79.8db4f",
+    "id": "5eb047e9.2f7668",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3422,
-    "y": 2854,
-    "z": "211aaefb.d906ea",
+    "x": 3444.883331298828,
+    "y": 2869.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "2a86c6f9.428e32"
+        "fb1841e2.6264"
       ]
     ]
   },
   {
-    "id": "cd09ff82.d8b0a8",
+    "id": "a0bb1c61.b88728",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3314,
-    "y": 5032,
-    "z": "211aaefb.d906ea",
+    "x": 3336.883331298828,
+    "y": 5047.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "36762610.1073d2"
+        "4d88182e.2579a"
       ]
     ]
   },
   {
-    "id": "36762610.1073d2",
+    "id": "4d88182e.2579a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3469,
-    "y": 5025,
-    "z": "211aaefb.d906ea",
+    "x": 3491.883331298828,
+    "y": 5040.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "ae52f9b0.eb7378",
-        "6bdb71eb.cd7da",
-        "5ba113f8.d2a564",
-        "536ae5e9.b25a04",
-        "5c19cae5.23f224"
+        "44d48088.590d78",
+        "a2dd9c19.75287",
+        "906b118c.b5ca4",
+        "80cc4c1e.a6bfe",
+        "3d1de5ec.2ac45a"
       ]
     ]
   },
   {
-    "id": "2a86c6f9.428e32",
+    "id": "fb1841e2.6264",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3565,
-    "y": 2854,
-    "z": "211aaefb.d906ea",
+    "x": 3587.883331298828,
+    "y": 2869.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "60b7b56f.adea4c",
-        "bdc41b3b.e9f9e8",
-        "9a7dac44.d03ca8",
-        "bedde447.35d04",
-        "7fc21231.2a386c",
-        "541e3cf1.3cdc4c",
-        "8e19f306.cd166",
-        "7aa2001.036a58",
-        "fd1584d2.77bd18",
-        "4d65e0ad.f66548",
-        "799454e3.25827c",
-        "ca44c46f.688fa8",
-        "3e5313a9.d78034",
-        "3f9a9e6f.0fc392",
-        "f035278d.c09ef",
-        "c934426f.9b2fb",
-        "a387df7d.b7b76",
-        "944ed400.3d2108",
-        "e04ee2dc.c84258"
+        "e6eab534.0772a8",
+        "b10b9835.71fc5",
+        "9c84ab4f.a1a008",
+        "50925bce.958aec",
+        "eab645cb.c973",
+        "74310cc1.794b3c",
+        "b442de01.03d108",
+        "a559e6ec.97fea8",
+        "c65cb0db.1db578",
+        "c0792f26.4d13b8",
+        "e82ea719.e6f068",
+        "c4a1bace.0d4bb",
+        "8f561f42.000fe8",
+        "aa738c85.1c137",
+        "54d18bcb.0986c4",
+        "4494cc45.3ce764",
+        "b937ed07.a77618",
+        "d5c180c8.9f0b08",
+        "123d53b6.2c62dc"
       ]
     ]
   },
   {
-    "id": "fd1584d2.77bd18",
+    "id": "c65cb0db.1db578",
     "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": 3876,
-    "y": 3209,
-    "z": "211aaefb.d906ea",
+    "x": 3898.883331298828,
+    "y": 3224.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "60b7b56f.adea4c",
+    "id": "e6eab534.0772a8",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 3830,
-    "y": 3307,
-    "z": "211aaefb.d906ea",
+    "x": 3852.883331298828,
+    "y": 3322.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "bdc41b3b.e9f9e8",
+    "id": "b10b9835.71fc5",
     "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": 3966,
-    "y": 3354,
-    "z": "211aaefb.d906ea",
+    "x": 3988.883331298828,
+    "y": 3369.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "335c026d.7b6e86",
+    "id": "6e8e8040.0d64",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3797,
-    "y": 3158,
-    "z": "211aaefb.d906ea",
+    "x": 3819.883331298828,
+    "y": 3173.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "15801117.33a03f",
+    "id": "69147836.dfe478",
     "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": 4323,
-    "y": 3649,
-    "z": "211aaefb.d906ea",
+    "x": 4345.883331298828,
+    "y": 3664.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "9a7dac44.d03ca8",
+    "id": "9c84ab4f.a1a008",
     "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": 3887,
-    "y": 3688,
-    "z": "211aaefb.d906ea",
+    "x": 3909.883331298828,
+    "y": 3703.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "bedde447.35d04",
+    "id": "50925bce.958aec",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 3835,
-    "y": 3739,
-    "z": "211aaefb.d906ea",
+    "x": 3857.883331298828,
+    "y": 3754.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "7fc21231.2a386c",
+    "id": "eab645cb.c973",
     "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": 3971,
-    "y": 3786,
-    "z": "211aaefb.d906ea",
+    "x": 3993.883331298828,
+    "y": 3801.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "9c57f099.e1906",
+    "id": "921a5ccf.2b2f38",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3828,
-    "y": 3648,
-    "z": "211aaefb.d906ea",
+    "x": 3850.883331298828,
+    "y": 3663.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "c4862f6c.a2a29",
+    "id": "8fa15646.014b68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4258,
-    "y": 3845,
-    "z": "211aaefb.d906ea",
+    "x": 4280.883331298828,
+    "y": 3860.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "541e3cf1.3cdc4c",
+    "id": "74310cc1.794b3c",
     "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": 3849,
-    "y": 3892,
-    "z": "211aaefb.d906ea",
+    "x": 3871.883331298828,
+    "y": 3907.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "42cf0b77.2dec84",
-        "81ea64e.302c518",
-        "1a138015.57b74"
+        "9785079b.24c0f8",
+        "81e9c000.43765",
+        "377b8f18.e7499"
       ]
     ]
   },
   {
-    "id": "42cf0b77.2dec84",
+    "id": "9785079b.24c0f8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4096,
-    "y": 3846,
-    "z": "211aaefb.d906ea",
+    "x": 4118.883331298828,
+    "y": 3861.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "c4862f6c.a2a29"
+        "8fa15646.014b68"
       ]
     ]
   },
   {
-    "id": "81ea64e.302c518",
+    "id": "81e9c000.43765",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4096.490966796875,
-    "y": 3891.5740356445312,
-    "z": "211aaefb.d906ea",
+    "x": 4119.374298095703,
+    "y": 3907.4573669433594,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "396ed743.e6ca6"
+        "b389b203.4af2"
       ]
     ]
   },
   {
-    "id": "1a138015.57b74",
+    "id": "377b8f18.e7499",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4094,
-    "y": 3935,
-    "z": "211aaefb.d906ea",
+    "x": 4116.883331298828,
+    "y": 3950.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "f5385619.47f03"
+        "7f887f7.029e08"
       ]
     ]
   },
   {
-    "id": "396ed743.e6ca6",
+    "id": "b389b203.4af2",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4259.0623779296875,
-    "y": 3891.8597717285156,
-    "z": "211aaefb.d906ea",
+    "x": 4281.945709228516,
+    "y": 3907.7431030273438,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "f5385619.47f03",
+    "id": "7f887f7.029e08",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4263,
-    "y": 3936,
-    "z": "211aaefb.d906ea",
+    "x": 4285.883331298828,
+    "y": 3951.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "f035278d.c09ef",
+    "id": "54d18bcb.0986c4",
     "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": 3906,
-    "y": 4171,
-    "z": "211aaefb.d906ea",
+    "x": 3928.883331298828,
+    "y": 4186.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "c934426f.9b2fb",
+    "id": "4494cc45.3ce764",
     "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": 3909,
-    "y": 4216,
-    "z": "211aaefb.d906ea",
+    "x": 3931.883331298828,
+    "y": 4231.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "944ed400.3d2108",
+    "id": "d5c180c8.9f0b08",
     "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": 3898,
-    "y": 4007,
-    "z": "211aaefb.d906ea",
+    "x": 3920.883331298828,
+    "y": 4022.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "e04ee2dc.c84258",
+    "id": "123d53b6.2c62dc",
     "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": 3900,
-    "y": 4054,
-    "z": "211aaefb.d906ea",
+    "x": 3922.883331298828,
+    "y": 4069.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "49a17204.cabfec",
+    "id": "8369bd06.57f78",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3822,
-    "y": 4124,
-    "z": "211aaefb.d906ea",
+    "x": 3844.883331298828,
+    "y": 4139.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "f9147a44.abd5d",
+    "id": "487123e4.9cc8ac",
     "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": 4429,
-    "y": 4853,
-    "z": "211aaefb.d906ea",
+    "x": 4451.883331298828,
+    "y": 4868.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "ae52f9b0.eb7378",
+    "id": "44d48088.590d78",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3684,
-    "y": 5006,
-    "z": "211aaefb.d906ea",
+    "x": 3706.883331298828,
+    "y": 5021.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "2031568b.5c466a",
-        "d5c3bda4.9d44d"
+        "876b39f.35a52c8",
+        "8bc7cacf.04871"
       ]
     ]
   },
   {
-    "id": "d5c3bda4.9d44d",
+    "id": "8bc7cacf.04871",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3856,
-    "y": 5003,
-    "z": "211aaefb.d906ea",
+    "x": 3878.883331298828,
+    "y": 5018.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "3fb1d79b.8d6fb8"
+        "682f4705.be7878"
       ]
     ]
   },
   {
-    "id": "2031568b.5c466a",
+    "id": "876b39f.35a52c8",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3808,
-    "y": 5850,
-    "z": "211aaefb.d906ea",
+    "x": 3830.883331298828,
+    "y": 5865.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "ff5eb6bb.d3898"
+        "dd90ad1a.7eef1"
       ]
     ]
   },
   {
-    "id": "35005760.153d9",
+    "id": "270e251f.118d82",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3869,
-    "y": 4973,
-    "z": "211aaefb.d906ea",
+    "x": 3891.883331298828,
+    "y": 4988.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "53b6adea.273794",
+    "id": "4e629c01.10676c",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3879,
-    "y": 5808,
-    "z": "211aaefb.d906ea",
+    "x": 3901.883331298828,
+    "y": 5823.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "8e19f306.cd166",
+    "id": "b442de01.03d108",
     "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": 3906,
-    "y": 4280,
-    "z": "211aaefb.d906ea",
+    "x": 3928.883331298828,
+    "y": 4295.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "3fb1d79b.8d6fb8",
+    "id": "682f4705.be7878",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4032,
-    "y": 5005,
-    "z": "211aaefb.d906ea",
+    "x": 4054.883331298828,
+    "y": 5020.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "a4f5d754.33c548",
-        "77d0a120.a8d4c8",
-        "ea3dea31.55403",
-        "faf54698.eda79",
-        "e80f8be5.03c42",
-        "3b266df3.e7977a",
-        "f9147a44.abd5d"
+        "bf69d5f0.d5943",
+        "50051e09.5a44c8",
+        "d933fbbc.703308",
+        "52cab496.bab24c",
+        "86c9672.840f818",
+        "81a4b89b.48797",
+        "487123e4.9cc8ac"
       ]
     ]
   },
   {
-    "id": "30197835.1bf978",
+    "id": "b674f25b.3aa2a8",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5477,
-    "y": 4478,
-    "z": "211aaefb.d906ea",
+    "x": 5499.883331298828,
+    "y": 4493.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "a4f5d754.33c548",
+    "id": "bf69d5f0.d5943",
     "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": 4424,
-    "y": 5156,
-    "z": "211aaefb.d906ea",
+    "x": 4446.883331298828,
+    "y": 5171.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "cce2d7d9.b9218",
+    "id": "5c84b550.a10344",
     "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": 3916,
-    "y": 4335,
-    "z": "211aaefb.d906ea",
+    "x": 3938.883331298828,
+    "y": 4350.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "7aa2001.036a58",
+    "id": "a559e6ec.97fea8",
     "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": 3882,
-    "y": 3548,
-    "z": "211aaefb.d906ea",
+    "x": 3904.883331298828,
+    "y": 3563.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "2d8b9b70.b52efc",
+    "id": "ce126dd2.e4e358",
     "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 = $prop.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": 3342,
-    "y": 1767,
-    "z": "211aaefb.d906ea",
+    "x": 3364.883331298828,
+    "y": 1782.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "26382876.b9a68",
+    "id": "b48deb35.d704b8",
     "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-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3249,
-    "y": 1714,
-    "z": "211aaefb.d906ea",
+    "x": 3271.883331298828,
+    "y": 1729.8833312988281,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "31c62db7.5b8522",
+    "id": "dfa7cbf8.916408",
     "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": 3932,
-    "y": 3251,
-    "z": "211aaefb.d906ea",
+    "x": 3954.883331298828,
+    "y": 3266.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "4d65e0ad.f66548",
+    "id": "c0792f26.4d13b8",
     "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": 3879,
-    "y": 2839,
-    "z": "211aaefb.d906ea",
+    "x": 3901.883331298828,
+    "y": 2854.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "799454e3.25827c",
+    "id": "e82ea719.e6f068",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 3827,
-    "y": 2887,
-    "z": "211aaefb.d906ea",
+    "x": 3849.883331298828,
+    "y": 2902.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "ca44c46f.688fa8",
+    "id": "c4a1bace.0d4bb",
     "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": 3955,
-    "y": 2934,
-    "z": "211aaefb.d906ea",
+    "x": 3977.883331298828,
+    "y": 2949.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "c038b97c.5e298",
+    "id": "c598b640.a89e8",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3792,
-    "y": 2797,
-    "z": "211aaefb.d906ea",
+    "x": 3814.883331298828,
+    "y": 2812.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "3e5313a9.d78034",
+    "id": "8f561f42.000fe8",
     "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": 3789,
-    "y": 3025,
-    "z": "211aaefb.d906ea",
+    "x": 3811.883331298828,
+    "y": 3040.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "3f9a9e6f.0fc392",
+    "id": "aa738c85.1c137",
     "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": 3882,
-    "y": 3078,
-    "z": "211aaefb.d906ea",
+    "x": 3904.883331298828,
+    "y": 3093.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "281fc4fa.e1a84c",
+    "id": "b51a7f91.5cff9",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3773,
-    "y": 2981,
-    "z": "211aaefb.d906ea",
+    "x": 3795.883331298828,
+    "y": 2996.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "9dc1c6e1.2dba4",
+    "id": "4ec3384a.676a5",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3779,
-    "y": 3431,
-    "z": "211aaefb.d906ea",
+    "x": 3801.883331298828,
+    "y": 3446.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "faf54698.eda79",
+    "id": "52cab496.bab24c",
     "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": 4346,
-    "y": 4486,
-    "z": "211aaefb.d906ea",
+    "x": 4368.883331298828,
+    "y": 4501.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "eb955021.5749d",
+    "id": "1646f155.836fb7",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4330,
-    "y": 4442,
-    "z": "211aaefb.d906ea",
+    "x": 4352.883331298828,
+    "y": 4457.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "b9a6d392.b28d6",
+    "id": "778ce84a.a3568",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5077,
-    "y": 4473,
-    "z": "211aaefb.d906ea",
+    "x": 5099.883331298828,
+    "y": 4488.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "bed8a2a5.609b9",
+    "id": "b61f10f5.eeecf",
     "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": 5164,
-    "y": 4515,
-    "z": "211aaefb.d906ea",
+    "x": 5186.883331298828,
+    "y": 4530.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "bbe5119a.b6b9a",
+    "id": "90640d99.12302",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 5112,
-    "y": 4563,
-    "z": "211aaefb.d906ea",
+    "x": 5134.883331298828,
+    "y": 4578.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "2aa44f99.3f02c8",
+    "id": "42e8372d.d506e",
     "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": 5240,
-    "y": 4610,
-    "z": "211aaefb.d906ea",
+    "x": 5262.883331298828,
+    "y": 4625.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "3b266df3.e7977a",
+    "id": "81a4b89b.48797",
     "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": 4417,
-    "y": 4895,
-    "z": "211aaefb.d906ea",
+    "x": 4439.883331298828,
+    "y": 4910.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "bd185a34.34e6a8",
+    "id": "a53bc0fc.34d448",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4400,
-    "y": 4957,
-    "z": "211aaefb.d906ea",
+    "x": 4422.883331298828,
+    "y": 4972.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "77d0a120.a8d4c8",
+    "id": "50051e09.5a44c8",
     "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": 4511,
-    "y": 4999,
-    "z": "211aaefb.d906ea",
+    "x": 4533.883331298828,
+    "y": 5014.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "915b754b.45601",
+    "id": "3073b323.349b7c",
     "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": 4959,
-    "y": 5052,
-    "z": "211aaefb.d906ea",
+    "x": 4981.883331298828,
+    "y": 5067.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "8cb093f8.38739",
+    "id": "dbdd7c00.c39698",
     "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": 4269,
-    "y": 5750,
-    "z": "211aaefb.d906ea",
+    "x": 4291.883331298828,
+    "y": 5765.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "90b420e2.468d1",
+    "id": "1d6ec4bb.ad8c0b",
     "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": 4167,
-    "y": 5699,
-    "z": "211aaefb.d906ea",
+    "x": 4189.883331298828,
+    "y": 5714.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "e890a410.6577f8",
+    "id": "41eb9866.4372",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4151,
-    "y": 5655,
-    "z": "211aaefb.d906ea",
+    "x": 4173.883331298828,
+    "y": 5670.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "ca407fe0.a74b58",
+    "id": "c54f6272.9ba24",
     "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.999755859375,
-    "y": 5853,
-    "z": "211aaefb.d906ea",
+    "x": 4980.883087158203,
+    "y": 5868.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea3dea31.55403",
+    "id": "d933fbbc.703308",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4338,
-    "y": 5056,
-    "z": "211aaefb.d906ea",
+    "x": 4360.883331298828,
+    "y": 5071.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "130129c6.4e6896",
-        "c2790bbb.b39ef"
+        "4c2996a3.75ee88",
+        "d5943bd2.ad1f5"
       ]
     ]
   },
   {
-    "id": "130129c6.4e6896",
+    "id": "4c2996a3.75ee88",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4549,
-    "y": 5056,
-    "z": "211aaefb.d906ea",
+    "x": 4571.883331298828,
+    "y": 5071.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "b2be4205.132768"
+        "8f5805d9.890fd8"
       ]
     ]
   },
   {
-    "id": "b2be4205.132768",
+    "id": "8f5805d9.890fd8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4705,
-    "y": 5052,
-    "z": "211aaefb.d906ea",
+    "x": 4727.883331298828,
+    "y": 5067.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "915b754b.45601",
-        "3264661d.b6671a",
-        "cf1a8f36.08af8"
+        "3073b323.349b7c",
+        "7eeebeb3.54b298",
+        "eadd33f3.5f43"
       ]
     ]
   },
   {
-    "id": "c2790bbb.b39ef",
+    "id": "d5943bd2.ad1f5",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4545,
-    "y": 5104,
-    "z": "211aaefb.d906ea",
+    "x": 4567.883331298828,
+    "y": 5119.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "1090c9ed.cf8dde"
+        "329fba30.af81ce"
       ]
     ]
   },
   {
-    "id": "1090c9ed.cf8dde",
+    "id": "329fba30.af81ce",
     "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": 4693,
-    "y": 5099,
-    "z": "211aaefb.d906ea",
+    "x": 4715.883331298828,
+    "y": 5114.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "53ad7751.2dcd08",
+    "id": "7679135b.31e8e4",
     "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": 5201,
-    "y": 4681,
-    "z": "211aaefb.d906ea",
+    "x": 5223.883331298828,
+    "y": 4696.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "59db3330.69645c",
+    "id": "d050303.0f4a3d",
     "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": 2367,
-    "y": 92,
-    "z": "211aaefb.d906ea",
+    "x": 2389.883331298828,
+    "y": 107.88333129882812,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "4ebbcee7.69b52",
+    "id": "c2f95f80.985fc",
     "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": 2301,
-    "y": 128,
-    "z": "211aaefb.d906ea",
+    "x": 2323.883331298828,
+    "y": 143.88333129882812,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "4ea5390e.a52cc",
+    "id": "360465cd.d1fc3a",
     "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": 2486,
-    "y": 55,
-    "z": "211aaefb.d906ea",
+    "x": 2508.883331298828,
+    "y": 70.88333129882812,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "37299dd0.22785a",
+    "id": "33673680.57cf72",
     "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": 4236,
-    "y": 5816,
-    "z": "211aaefb.d906ea",
+    "x": 4258.883331298828,
+    "y": 5831.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "606aa5ab.2206bc",
+    "id": "e2cec405.b0409",
     "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": 4369,
-    "y": 5864,
-    "z": "211aaefb.d906ea",
+    "x": 4391.883331298828,
+    "y": 5879.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "17ac1f1.6d565e1",
+    "id": "6e2ab292.566884",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4188,
-    "y": 5922,
-    "z": "211aaefb.d906ea",
+    "x": 4210.883331298828,
+    "y": 5937.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "7b13241a.22fd54",
-        "f9b4895b.fbea48"
+        "9073e816.ad482",
+        "45d66689.aaaf7"
       ]
     ]
   },
   {
-    "id": "7b13241a.22fd54",
+    "id": "9073e816.ad482",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4381,
-    "y": 5923,
-    "z": "211aaefb.d906ea",
+    "x": 4403.883331298828,
+    "y": 5938.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "827a3a72.ba4bd8"
+        "db09f17e.79bb3"
       ]
     ]
   },
   {
-    "id": "827a3a72.ba4bd8",
+    "id": "db09f17e.79bb3",
     "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": 4537,
-    "y": 5920,
-    "z": "211aaefb.d906ea",
+    "x": 4559.883331298828,
+    "y": 5935.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "f9b4895b.fbea48",
+    "id": "45d66689.aaaf7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4385,
-    "y": 5967,
-    "z": "211aaefb.d906ea",
+    "x": 4407.883331298828,
+    "y": 5982.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "4c414c23.1dfa5c"
+        "2adb498f.b3f97e"
       ]
     ]
   },
   {
-    "id": "4c414c23.1dfa5c",
+    "id": "2adb498f.b3f97e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4524,
-    "y": 5962,
-    "z": "211aaefb.d906ea",
+    "x": 4546.883331298828,
+    "y": 5977.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "ca407fe0.a74b58",
-        "87b885a5.5cf0c8",
-        "7c94a6cd.50e738",
-        "9f0fa012.5d1bf",
-        "fafaba2.e8268c8",
-        "25a2525f.49399e",
-        "593dba4.344bf44",
-        "90f4ba85.137fb",
-        "52c2d3cf.976804",
-        "274ef282.e256ee",
-        "eba4a386.8ade58",
-        "91ff8ca0.2410d8"
+        "c54f6272.9ba24",
+        "6998ca1d.92c5d4",
+        "15021f96.80eb18",
+        "e6e1dbd3.6e0a6",
+        "67962261.2516d4",
+        "1b601be6.7f6134",
+        "27a83227.012ede",
+        "b320b0e.20770d",
+        "34955381.c5797c",
+        "9ca77368.01f7",
+        "6922fe88.2fe5f8",
+        "4514c9c4.eaef1"
       ]
     ]
   },
   {
-    "id": "593dba4.344bf44",
+    "id": "27a83227.012ede",
     "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": 4721,
-    "y": 6641,
-    "z": "211aaefb.d906ea",
+    "x": 4743.883331298828,
+    "y": 6656.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "a83c7fc2.c5da78",
-        "914d2791.9def8",
-        "a0fd345.ac08f48"
+        "c2308ca7.57dff",
+        "aeb0b0d0.9dedb8",
+        "b67a59a3.18fb1"
       ]
     ]
   },
   {
-    "id": "a83c7fc2.c5da78",
+    "id": "c2308ca7.57dff",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4926,
-    "y": 6638,
-    "z": "211aaefb.d906ea",
+    "x": 4948.883331298828,
+    "y": 6653.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "c1df45ea.8ba52"
+        "eeeb2441.6710c8"
       ]
     ]
   },
   {
-    "id": "914d2791.9def8",
+    "id": "aeb0b0d0.9dedb8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4909.490966796875,
-    "y": 6699.574035644531,
-    "z": "211aaefb.d906ea",
+    "x": 4932.374298095703,
+    "y": 6715.457366943359,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "119f1b5d.4e6f5d"
+        "77e5496.94ba0b8"
       ]
     ]
   },
   {
-    "id": "a0fd345.ac08f48",
+    "id": "b67a59a3.18fb1",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4907,
-    "y": 6743,
-    "z": "211aaefb.d906ea",
+    "x": 4929.883331298828,
+    "y": 6758.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "3791525f.f4d3fe"
+        "f70b29bb.3fb788"
       ]
     ]
   },
   {
-    "id": "c1df45ea.8ba52",
+    "id": "eeeb2441.6710c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5082,
-    "y": 6652,
-    "z": "211aaefb.d906ea",
+    "x": 5104.883331298828,
+    "y": 6667.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "78ac2a8d.cd0874"
+        "a3bf8aa6.020cb8"
       ]
     ]
   },
   {
-    "id": "119f1b5d.4e6f5d",
+    "id": "77e5496.94ba0b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5072.0623779296875,
-    "y": 6699.859771728516,
-    "z": "211aaefb.d906ea",
+    "x": 5094.945709228516,
+    "y": 6715.743103027344,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "3791525f.f4d3fe",
+    "id": "f70b29bb.3fb788",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5074,
-    "y": 6742,
-    "z": "211aaefb.d906ea",
+    "x": 5096.883331298828,
+    "y": 6757.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "78ac2a8d.cd0874",
+    "id": "a3bf8aa6.020cb8",
     "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": 5329,
-    "y": 6649,
-    "z": "211aaefb.d906ea",
+    "x": 5351.883331298828,
+    "y": 6664.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "110b3f91.4725e8"
+        "8a5692b6.b002c8"
       ]
     ]
   },
   {
-    "id": "110b3f91.4725e8",
+    "id": "8a5692b6.b002c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5566,
-    "y": 6645,
-    "z": "211aaefb.d906ea",
+    "x": 5588.883331298828,
+    "y": 6660.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e53605cc.b83c3"
+        "eabc4609.9defb"
       ]
     ]
   },
   {
-    "id": "cf79f711.acd51",
+    "id": "98f388ed.2cda7",
     "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": 5809,
-    "y": 6617,
-    "z": "211aaefb.d906ea",
+    "x": 5831.883331298828,
+    "y": 6632.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "f8a0a965.9fe23",
-        "b32c6358.b77858"
+        "6a0ae6a2.ba9fb",
+        "25f881ea.6e0566"
       ]
     ]
   },
   {
-    "id": "f8a0a965.9fe23",
+    "id": "6a0ae6a2.ba9fb",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6014,
-    "y": 6637,
-    "z": "211aaefb.d906ea",
+    "x": 6036.883331298828,
+    "y": 6652.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "e53605cc.b83c3"
+        "eabc4609.9defb"
       ]
     ]
   },
   {
-    "id": "b32c6358.b77858",
+    "id": "25f881ea.6e0566",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6013,
-    "y": 6590,
-    "z": "211aaefb.d906ea",
+    "x": 6035.883331298828,
+    "y": 6605.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "e53605cc.b83c3",
+    "id": "eabc4609.9defb",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4757,
-    "y": 6912,
-    "z": "211aaefb.d906ea",
+    "x": 4779.883331298828,
+    "y": 6927.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "d173aa3d.6dc13"
+        "392e3f81.e0a6a8"
       ]
     ]
   },
   {
-    "id": "fdc415c8.6a0598",
+    "id": "f8de35a7.d0325",
     "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": 5606,
-    "y": 6817,
-    "z": "211aaefb.d906ea",
+    "x": 6241.88330078125,
+    "y": 6865.88330078125,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "37d800ad.83215",
+    "id": "8d84ad9.3a159d",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4819,
-    "y": 6588,
-    "z": "211aaefb.d906ea",
+    "x": 4841.883331298828,
+    "y": 6603.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "25a2525f.49399e",
+    "id": "1b601be6.7f6134",
     "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": 4703,
-    "y": 6437,
-    "z": "211aaefb.d906ea",
+    "x": 4725.883331298828,
+    "y": 6452.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "5323ec48.960894",
+    "id": "6e7ae435.b7607c",
     "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": 5048,
-    "y": 6268,
-    "z": "211aaefb.d906ea",
+    "x": 5070.883331298828,
+    "y": 6283.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "de0031e3.730958"
+        "82ed19a6.aafd78"
       ]
     ]
   },
   {
-    "id": "de0031e3.730958",
+    "id": "82ed19a6.aafd78",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5268,
-    "y": 6274,
-    "z": "211aaefb.d906ea",
+    "x": 5290.883331298828,
+    "y": 6289.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "2707e8d8.7ec9d"
+        "fa1ec726.b4647"
       ]
     ]
   },
   {
-    "id": "2707e8d8.7ec9d",
+    "id": "fa1ec726.b4647",
     "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": 5453,
-    "y": 6273,
-    "z": "211aaefb.d906ea",
+    "x": 5475.883331298828,
+    "y": 6288.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "37890125.bbe60e"
+        "46306bd4.ee79e4"
       ]
     ]
   },
   {
-    "id": "37890125.bbe60e",
+    "id": "46306bd4.ee79e4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5645,
-    "y": 6276,
-    "z": "211aaefb.d906ea",
+    "x": 5667.883331298828,
+    "y": 6291.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "95332efd.102e7"
+        "3b3ddb68.994c3c"
       ]
     ]
   },
   {
-    "id": "95332efd.102e7",
+    "id": "3b3ddb68.994c3c",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5854,
-    "y": 6274,
-    "z": "211aaefb.d906ea",
+    "x": 5876.883331298828,
+    "y": 6289.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "90f4ba85.137fb",
+    "id": "b320b0e.20770d",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4755,
-    "y": 6262,
-    "z": "211aaefb.d906ea",
+    "x": 4777.883331298828,
+    "y": 6277.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "5323ec48.960894"
+        "6e7ae435.b7607c"
       ]
     ]
   },
   {
-    "id": "7c94a6cd.50e738",
+    "id": "15021f96.80eb18",
     "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": 4763,
-    "y": 6155,
-    "z": "211aaefb.d906ea",
+    "x": 4785.883331298828,
+    "y": 6170.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "b0864a09.98f318",
-        "a95b7f6b.2686a",
-        "109466fa.601861"
+        "90de6696.037bd8",
+        "ce29f9bd.7d263",
+        "94bbebf0.09f428"
       ]
     ]
   },
   {
-    "id": "b0864a09.98f318",
+    "id": "90de6696.037bd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4999,
-    "y": 6138,
-    "z": "211aaefb.d906ea",
+    "x": 5021.883331298828,
+    "y": 6153.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "a95b7f6b.2686a",
+    "id": "ce29f9bd.7d263",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4996,
-    "y": 6179,
-    "z": "211aaefb.d906ea",
+    "x": 5018.883331298828,
+    "y": 6194.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "109466fa.601861",
+    "id": "94bbebf0.09f428",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5010,
-    "y": 6219,
-    "z": "211aaefb.d906ea",
+    "x": 5032.883331298828,
+    "y": 6234.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "9f0fa012.5d1bf",
+    "id": "e6e1dbd3.6e0a6",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4699,
-    "y": 6314,
-    "z": "211aaefb.d906ea",
+    "x": 4721.883331298828,
+    "y": 6329.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "fafaba2.e8268c8",
+    "id": "67962261.2516d4",
     "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": 4707,
-    "y": 6372,
-    "z": "211aaefb.d906ea",
+    "x": 4729.883331298828,
+    "y": 6387.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "87b885a5.5cf0c8",
+    "id": "6998ca1d.92c5d4",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4712,
-    "y": 6112,
-    "z": "211aaefb.d906ea",
+    "x": 4734.883331298828,
+    "y": 6127.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "aa72fa33.6435d",
+    "id": "94b4d538.041a9",
     "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": 4827,
-    "y": 6064,
-    "z": "211aaefb.d906ea",
+    "x": 4849.883331298828,
+    "y": 6079.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "d173aa3d.6dc13",
+    "id": "392e3f81.e0a6a8",
     "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": 5000,
-    "y": 6909,
-    "z": "211aaefb.d906ea",
+    "x": 5022.883331298828,
+    "y": 6924.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "cecd58a1.5c073",
-        "a1afbc37.0664b8"
+        "84fb2e7.f2e54d",
+        "113d3615.17adaa"
       ]
     ]
   },
   {
-    "id": "cecd58a1.5c073",
+    "id": "84fb2e7.f2e54d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5229,
-    "y": 6886,
-    "z": "211aaefb.d906ea",
+    "x": 5251.883331298828,
+    "y": 6901.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "217cc28.e6a45be"
+        "c3b316fd.fba0a8"
       ]
     ]
   },
   {
-    "id": "a1afbc37.0664b8",
+    "id": "113d3615.17adaa",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5229,
-    "y": 6935,
-    "z": "211aaefb.d906ea",
+    "x": 5251.883331298828,
+    "y": 6950.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "217cc28.e6a45be",
+    "id": "b6424391.0ceee8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5390,
-    "y": 6891,
-    "z": "211aaefb.d906ea",
+    "x": 5984.88330078125,
+    "y": 6956.88330078125,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "efcdc93a.a5e52",
-        "fdc415c8.6a0598",
-        "1d0e63ee.415bac"
+        "1cb2d5ed.65008a",
+        "f8de35a7.d0325",
+        "515cca2b.2a6e8c"
       ]
     ]
   },
   {
-    "id": "3c8e9462.ad4a14",
+    "id": "b0305853.25009",
     "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": 5734,
-    "y": 6871,
-    "z": "211aaefb.d906ea",
+    "x": 6369.88330078125,
+    "y": 6919.88330078125,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "1d0e63ee.415bac",
+    "id": "515cca2b.2a6e8c",
     "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": 5704,
-    "y": 6931,
-    "z": "211aaefb.d906ea",
+    "x": 6339.88330078125,
+    "y": 6979.88330078125,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "efcdc93a.a5e52",
+    "id": "1cb2d5ed.65008a",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5611,
-    "y": 6759,
-    "z": "211aaefb.d906ea",
+    "x": 6246.88330078125,
+    "y": 6807.88330078125,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "ff5eb6bb.d3898",
+    "id": "dd90ad1a.7eef1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3960,
-    "y": 5849,
-    "z": "211aaefb.d906ea",
+    "x": 3982.883331298828,
+    "y": 5864.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "90b420e2.468d1",
-        "37299dd0.22785a",
-        "606aa5ab.2206bc",
-        "17ac1f1.6d565e1",
-        "8cb093f8.38739"
+        "1d6ec4bb.ad8c0b",
+        "33673680.57cf72",
+        "e2cec405.b0409",
+        "6e2ab292.566884",
+        "dbdd7c00.c39698"
       ]
     ]
   },
   {
-    "id": "754638fa.2f5ed",
+    "id": "74fcf6b5.dbb39",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4704,
-    "y": 6212,
-    "z": "211aaefb.d906ea",
+    "x": 4726.883331298828,
+    "y": 6227.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "52c2d3cf.976804",
+    "id": "34955381.c5797c",
     "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.999755859375,
-    "y": 5934,
-    "z": "211aaefb.d906ea",
+    "x": 4873.883087158203,
+    "y": 5949.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "6227c2aa.a1e1a4",
+    "id": "2a032dd9.9380b2",
     "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.999755859375,
-    "y": 5884,
-    "z": "211aaefb.d906ea",
+    "x": 5010.883087158203,
+    "y": 5899.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "a387df7d.b7b76",
+    "id": "b937ed07.a77618",
     "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": 3795,
-    "y": 3490,
-    "z": "211aaefb.d906ea",
+    "x": 3817.883331298828,
+    "y": 3505.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "a7eb3fa1.887168",
+    "id": "3dd82151.976f0e",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3977,
-    "y": 1745,
-    "z": "211aaefb.d906ea",
+    "x": 3999.883331298828,
+    "y": 1760.8833312988281,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "c5a9fcf9.09d1b",
+    "id": "6b6522.bc964ae",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3955,
-    "y": 2615,
-    "z": "211aaefb.d906ea",
+    "x": 3977.883331298828,
+    "y": 2630.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "7010bc9b.4157a4",
+    "id": "195c3e5b.085da2",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3786,
-    "y": 3957,
-    "z": "211aaefb.d906ea",
+    "x": 3808.883331298828,
+    "y": 3972.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "2c9dde75.d2cff2",
+    "id": "a8e7354f.a1833",
     "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": 3467,
-    "y": 5989,
-    "z": "211aaefb.d906ea",
+    "x": 3489.883331298828,
+    "y": 6004.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "6bdb71eb.cd7da",
+    "id": "a2dd9c19.75287",
     "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": 3678,
-    "y": 4866,
-    "z": "211aaefb.d906ea",
+    "x": 3700.883331298828,
+    "y": 4881.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "5ba113f8.d2a564",
+    "id": "906b118c.b5ca4",
     "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": 3811,
-    "y": 4914,
-    "z": "211aaefb.d906ea",
+    "x": 3833.883331298828,
+    "y": 4929.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "e80f8be5.03c42",
+    "id": "86c9672.840f818",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4357,
-    "y": 4542,
-    "z": "211aaefb.d906ea",
+    "x": 4379.883331298828,
+    "y": 4557.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "8d6edd02.689f",
-        "977606e5.20b248"
+        "b9a92126.1d0eb",
+        "e7523195.456808"
       ]
     ]
   },
   {
-    "id": "8d6edd02.689f",
+    "id": "b9a92126.1d0eb",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4550,
-    "y": 4543,
-    "z": "211aaefb.d906ea",
+    "x": 4572.883331298828,
+    "y": 4558.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "5ee87f24.28a388"
+        "71a4d763.a9eac"
       ]
     ]
   },
   {
-    "id": "977606e5.20b248",
+    "id": "e7523195.456808",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4554,
-    "y": 4587,
-    "z": "211aaefb.d906ea",
+    "x": 4576.883331298828,
+    "y": 4602.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "89bf54cd.2d4a38"
+        "6742a953.fe0d28"
       ]
     ]
   },
   {
-    "id": "89bf54cd.2d4a38",
+    "id": "6742a953.fe0d28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4693,
-    "y": 4582,
-    "z": "211aaefb.d906ea",
+    "x": 4715.883331298828,
+    "y": 4597.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "32dd4db5.fb786a",
-        "c09e6974.d8d248",
-        "47355e53.0b694"
+        "34f2cb8a.7f3954",
+        "50607a4b.9927b4",
+        "d6e6e1de.8f0598"
       ]
     ]
   },
   {
-    "id": "5ee87f24.28a388",
+    "id": "71a4d763.a9eac",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4693,
-    "y": 4539,
-    "z": "211aaefb.d906ea",
+    "x": 4715.883331298828,
+    "y": 4554.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "bed8a2a5.609b9",
-        "bbe5119a.b6b9a",
-        "2aa44f99.3f02c8",
-        "53ad7751.2dcd08"
+        "b61f10f5.eeecf",
+        "90640d99.12302",
+        "42e8372d.d506e",
+        "7679135b.31e8e4"
       ]
     ]
   },
   {
-    "id": "32dd4db5.fb786a",
+    "id": "34f2cb8a.7f3954",
     "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": 5095.000244140625,
-    "y": 4804,
-    "z": "211aaefb.d906ea",
+    "x": 5117.883575439453,
+    "y": 4819.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "62f002ed.2a5444",
+    "id": "9d0b91dc.02ae8",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5102.000244140625,
-    "y": 4758,
-    "z": "211aaefb.d906ea",
+    "x": 5124.883575439453,
+    "y": 4773.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "274ef282.e256ee",
+    "id": "9ca77368.01f7",
     "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": 4892,
-    "y": 6537,
-    "z": "211aaefb.d906ea",
+    "x": 4914.883331298828,
+    "y": 6552.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "c09e6974.d8d248",
+    "id": "50607a4b.9927b4",
     "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": 5213.000244140625,
-    "y": 4846,
-    "z": "211aaefb.d906ea",
+    "x": 5235.883575439453,
+    "y": 4861.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "3264661d.b6671a",
+    "id": "7eeebeb3.54b298",
     "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": 5088,
-    "y": 5104,
-    "z": "211aaefb.d906ea",
+    "x": 5110.883331298828,
+    "y": 5119.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "7ec54c4d.3b77ec",
+    "id": "d039e4e7.e91be8",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3642,
-    "y": 4464,
-    "z": "211aaefb.d906ea",
+    "x": 3664.883331298828,
+    "y": 4479.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "f9f5a12a.cd0cc",
+    "id": "3c0dfd8f.f0eaca",
     "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": 3976,
-    "y": 4647,
-    "z": "211aaefb.d906ea",
+    "x": 3998.883331298828,
+    "y": 4662.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "536ae5e9.b25a04",
+    "id": "80cc4c1e.a6bfe",
     "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": 3588,
-    "y": 4514,
-    "z": "211aaefb.d906ea",
+    "x": 3610.883331298828,
+    "y": 4529.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "d61393d.72bde7",
-        "afea424c.c72b88",
-        "48da2e94.b0d678"
+        "ef8f5d34.35bfc8",
+        "7b54fcfe.00d69c",
+        "e9708f34.58ed3"
       ]
     ]
   },
   {
-    "id": "afea424c.c72b88",
+    "id": "7b54fcfe.00d69c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3815.490966796875,
-    "y": 4486.573974609375,
-    "z": "211aaefb.d906ea",
+    "x": 3838.374298095703,
+    "y": 4502.457305908203,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "74d191cb.7bdf48"
+        "edc83f73.f7df38"
       ]
     ]
   },
   {
-    "id": "48da2e94.b0d678",
+    "id": "e9708f34.58ed3",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3811,
-    "y": 4530.999938964844,
-    "z": "211aaefb.d906ea",
+    "x": 3833.883331298828,
+    "y": 4546.883270263672,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "d340d8ff.74286"
+        "a66e06b4.3bd7c"
       ]
     ]
   },
   {
-    "id": "74d191cb.7bdf48",
+    "id": "edc83f73.f7df38",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3978.0625,
-    "y": 4485.859680175781,
-    "z": "211aaefb.d906ea",
+    "x": 4000.945831298828,
+    "y": 4501.743011474609,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "d340d8ff.74286",
+    "id": "a66e06b4.3bd7c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3979,
-    "y": 4530.999938964844,
-    "z": "211aaefb.d906ea",
+    "x": 4001.883331298828,
+    "y": 4546.883270263672,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "60eac93d.331ca",
+    "id": "fa42d876.f3bfc8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3764,
-    "y": 4604,
-    "z": "211aaefb.d906ea",
+    "x": 3786.883331298828,
+    "y": 4619.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "a693b00.ef5e95",
-        "f9f5a12a.cd0cc"
+        "b660a30a.8893a8",
+        "3c0dfd8f.f0eaca"
       ]
     ]
   },
   {
-    "id": "d61393d.72bde7",
+    "id": "ef8f5d34.35bfc8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3595,
-    "y": 4604,
-    "z": "211aaefb.d906ea",
+    "x": 3617.883331298828,
+    "y": 4619.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "60eac93d.331ca"
+        "fa42d876.f3bfc8"
       ]
     ]
   },
   {
-    "id": "a693b00.ef5e95",
+    "id": "b660a30a.8893a8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3953,
-    "y": 4596,
-    "z": "211aaefb.d906ea",
+    "x": 3975.883331298828,
+    "y": 4611.883331298828,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "5c19cae5.23f224",
+    "id": "3d1de5ec.2ac45a",
     "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": 3786,
-    "y": 4742,
-    "z": "211aaefb.d906ea",
+    "x": 3808.883331298828,
+    "y": 4757.883331298828,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "a02818b5.44468",
+    "id": "25e4380.733ab48",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5892.88330078125,
-    "y": 6554.88330078125,
-    "z": "211aaefb.d906ea",
+    "x": 5915.766632080078,
+    "y": 6570.766632080078,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "47355e53.0b694",
+    "id": "d6e6e1de.8f0598",
     "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": 5092.667236328125,
-    "y": 4942.08349609375,
-    "z": "211aaefb.d906ea",
+    "x": 5115.550567626953,
+    "y": 4957.966827392578,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "be1641a6.50b31",
+    "id": "924c8eb8.8bcc2",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5094.884033203125,
-    "y": 4901.88330078125,
-    "z": "211aaefb.d906ea",
+    "x": 5117.767364501953,
+    "y": 4917.766632080078,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "cf1a8f36.08af8",
+    "id": "eadd33f3.5f43",
     "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": 4968.6669921875,
-    "y": 5192.08349609375,
-    "z": "211aaefb.d906ea",
+    "x": 4991.550323486328,
+    "y": 5207.966827392578,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "19ccdaa7.ec1b4d",
+    "id": "33d164e6.6e7844",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4970.8837890625,
-    "y": 5151.88330078125,
-    "z": "211aaefb.d906ea",
+    "x": 4993.767120361328,
+    "y": 5167.766632080078,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "66b615d7.25ca4c",
+    "id": "3216abfb.82724c",
     "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": 5063.466796875,
-    "y": 5647.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5086.350128173828,
+    "y": 5663.399932861328,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea12eeb9.12b1f",
+    "id": "723b66c7.37bb08",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4890.466796875,
-    "y": 5704.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 4913.350128173828,
+    "y": 5720.399932861328,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "7690697f.9ce41",
-        "27f9c6d9.503242"
+        "4b59f245.4d6edc",
+        "fb820a66.06fc1"
       ]
     ]
   },
   {
-    "id": "7690697f.9ce41",
+    "id": "4b59f245.4d6edc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5101.466796875,
-    "y": 5704.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5124.350128173828,
+    "y": 5720.399932861328,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "714a5cc9.4d7a1c"
+        "95f01780.285928"
       ]
     ]
   },
   {
-    "id": "27f9c6d9.503242",
+    "id": "fb820a66.06fc1",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5097.466796875,
-    "y": 5752.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5120.350128173828,
+    "y": 5768.399932861328,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "b6a962d8.a724e8"
+        "ceaa430d.e25cf8"
       ]
     ]
   },
   {
-    "id": "714a5cc9.4d7a1c",
+    "id": "95f01780.285928",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5257.466796875,
-    "y": 5700.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5280.350128173828,
+    "y": 5716.399932861328,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "1ac18bef.6e71e4",
-        "b2d3bd46.bdd318",
-        "7d68f1ff.1c9d18"
+        "363f2480.f640d4",
+        "ec57c9d5.e1e658",
+        "18db1f41.a7c409"
       ]
     ]
   },
   {
-    "id": "b6a962d8.a724e8",
+    "id": "ceaa430d.e25cf8",
     "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": 5245.466796875,
-    "y": 5747.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5268.350128173828,
+    "y": 5763.399932861328,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "a02cbc6f.9fe0b8",
+    "id": "7a15e8cb.5f6df8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5523.3505859375,
-    "y": 5800.39990234375,
-    "z": "211aaefb.d906ea",
+    "x": 5546.233917236328,
+    "y": 5816.283233642578,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "7d68f1ff.1c9d18",
+    "id": "18db1f41.a7c409",
     "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": 5521.1337890625,
-    "y": 5840.60009765625,
-    "z": "211aaefb.d906ea",
+    "x": 5544.017120361328,
+    "y": 5856.483428955078,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "b2d3bd46.bdd318",
+    "id": "ec57c9d5.e1e658",
     "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": 5640.466796875,
-    "y": 5752.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5663.350128173828,
+    "y": 5768.399932861328,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
   },
   {
-    "id": "1ac18bef.6e71e4",
+    "id": "363f2480.f640d4",
     "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": 5511.466796875,
-    "y": 5700.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 5534.350128173828,
+    "y": 5716.399932861328,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "a899461.9a784b8",
+    "id": "60039858.187258",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4952.466796875,
-    "y": 5605.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 4975.350128173828,
+    "y": 5621.399932861328,
+    "z": "4456793a.59a288",
     "wires": []
   },
   {
-    "id": "eba4a386.8ade58",
+    "id": "6922fe88.2fe5f8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4659.7998046875,
-    "y": 5687.5166015625,
-    "z": "211aaefb.d906ea",
+    "x": 4682.683135986328,
+    "y": 5703.399932861328,
+    "z": "4456793a.59a288",
     "wires": [
       [
-        "66b615d7.25ca4c",
-        "ea12eeb9.12b1f"
+        "3216abfb.82724c",
+        "723b66c7.37bb08"
       ]
     ]
   },
   {
-    "id": "91ff8ca0.2410d8",
+    "id": "4514c9c4.eaef1",
     "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.832763671875,
-    "y": 5989.2001953125,
-    "z": "211aaefb.d906ea",
+    "x": 5003.716094970703,
+    "y": 6005.083526611328,
+    "z": "4456793a.59a288",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "d7548734.759b08",
+    "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": 5789,
+    "y": 6901,
+    "z": "4456793a.59a288",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c3b316fd.fba0a8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5408,
+    "y": 6904,
+    "z": "4456793a.59a288",
+    "wires": [
+      [
+        "d7548734.759b08",
+        "d42bdb23.7a5dc8",
+        "40573be3.cee89c"
+      ]
+    ]
+  },
+  {
+    "id": "d42bdb23.7a5dc8",
+    "type": "switchNode",
+    "name": "switch $foundVpnName",
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5634,
+    "y": 6956,
+    "z": "4456793a.59a288",
+    "wires": [
+      [
+        "4a08f8b2.c71278"
+      ]
+    ]
+  },
+  {
+    "id": "4a08f8b2.c71278",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5813,
+    "y": 6955,
+    "z": "4456793a.59a288",
+    "wires": [
+      [
+        "b6424391.0ceee8"
+      ]
+    ]
+  },
+  {
+    "id": "40573be3.cee89c",
+    "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": 5635,
+    "y": 6849,
+    "z": "4456793a.59a288",
+    "wires": []
   }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
index 241228f8..50f87f43 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
@@ -3238,7 +3238,7 @@
         "id": "83634982.62f32",
         "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`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
+        "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": 3288.883331298828,
         "y": 1754,
@@ -3271,7 +3271,7 @@
         "id": "a78c5989.f5207",
         "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`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
+        "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": 3269.883331298828,
         "y": 2610,
@@ -4389,8 +4389,8 @@
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
         "info": "",
         "comments": "",
-        "x": 5188.784423828125,
-        "y": 4997.350067138672,
+        "x": 5119.783935546875,
+        "y": 4846.349884033203,
         "z": "d1eceead.adafe",
         "wires": []
     },
@@ -4401,8 +4401,8 @@
         "xml": "<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5221.784423828125,
-        "y": 5065.350067138672,
+        "x": 5063.783935546875,
+        "y": 4895.349884033203,
         "z": "d1eceead.adafe",
         "wires": [
             [
@@ -4418,8 +4418,8 @@
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5465.784454345703,
-        "y": 5037.349853515625,
+        "x": 5306.784423828125,
+        "y": 4936.349395751953,
         "z": "d1eceead.adafe",
         "wires": [
             []
@@ -4432,12 +4432,12 @@
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5346.784423828125,
-        "y": 4963.349822998047,
+        "x": 5317.7841796875,
+        "y": 4893.349609375,
         "z": "d1eceead.adafe",
         "wires": [
             [
-                "a5ecb13c.9c7548"
+                "b2c9765c.25999"
             ]
         ]
     },
@@ -4449,8 +4449,8 @@
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5473.767822265625,
-        "y": 4901.766326904297,
+        "x": 5544.767578125,
+        "y": 4900.76611328125,
         "z": "d1eceead.adafe",
         "wires": [
             [
@@ -9149,5 +9149,81 @@
         "wires": [
             []
         ]
+    },
+    {
+        "id": "b2c9765c.25999",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 5113,
+        "y": 5050,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "86e944dc.0c4178",
+                "5fccecfa.290f3c",
+                "76c53fa0.8ab25"
+            ]
+        ]
+    },
+    {
+        "id": "76c53fa0.8ab25",
+        "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": 4995,
+        "z": "d1eceead.adafe",
+        "wires": []
+    },
+    {
+        "id": "86e944dc.0c4178",
+        "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": 5047,
+        "z": "d1eceead.adafe",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "5fccecfa.290f3c",
+        "type": "switchNode",
+        "name": "switch $foundVpnName",
+        "xml": "<switch test=\"`$foundVpnName`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5339,
+        "y": 5102,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "2a17f2a1.8a9c0e"
+            ]
+        ]
+    },
+    {
+        "id": "2a17f2a1.8a9c0e",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5518,
+        "y": 5101,
+        "z": "d1eceead.adafe",
+        "wires": [
+            [
+                "a5ecb13c.9c7548"
+            ]
+        ]
     }
 ]
\ 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-helper-find-ROOT-conn.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json
index 55104ea9..592aa317 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "5597755d.1ce774",
+        "id": "3d72a78b.d5ca8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 147,
-        "y": 107,
-        "z": "2d4ea144.5587f6",
+        "x": 161.88333129882812,
+        "y": 93,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "8d0fd3e7.a3b7e8"
+                "9d241a09.87fad"
             ]
         ]
     },
     {
-        "id": "8d0fd3e7.a3b7e8",
+        "id": "9d241a09.87fad",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,339 +22,351 @@
         "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": 431.2856903076172,
-        "y": 168.23810863494873,
-        "z": "2d4ea144.5587f6",
+        "x": 446.1690216064453,
+        "y": 154.23810863494873,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "86b46a27.ca39b8"
+                "a7259be6.d447a"
             ]
         ]
     },
     {
-        "id": "86b46a27.ca39b8",
+        "id": "a7259be6.d447a",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 386.4285888671875,
-        "y": 260.0000305175781,
-        "z": "2d4ea144.5587f6",
+        "x": 401.3119201660156,
+        "y": 246.00003051757812,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "15886f7b.32e089"
+                "d786d41.1f92da8"
             ]
         ]
     },
     {
-        "id": "15886f7b.32e089",
+        "id": "d786d41.1f92da8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 747.238037109375,
-        "y": 244.66668701171875,
-        "z": "2d4ea144.5587f6",
+        "x": 762.1213684082031,
+        "y": 230.66668701171875,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "6bd3471b.bd1a98",
-                "5dece674.dd027",
-                "4d1bc5df.1d031c"
+                "7a44c426.80c71c",
+                "e5338f68.a61cd8",
+                "c3537cef.9e14b8",
+                "a3ebaf5b.c985e"
             ]
         ]
     },
     {
-        "id": "6bd3471b.bd1a98",
+        "id": "7a44c426.80c71c",
         "type": "save",
         "name": "get all-connectivities from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivities\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.helper-root-all-connectivities\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 232,
-        "y": 430,
-        "z": "2d4ea144.5587f6",
+        "x": 246.88333129882812,
+        "y": 416,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "92e14f80.21594",
-                "b9796c74.99212",
-                "e5bd0a99.00585"
+                "e85393c.ba370f",
+                "a557e38f.6e9a5",
+                "30d0e737.4ae9c8"
             ]
         ]
     },
     {
-        "id": "92e14f80.21594",
+        "id": "e85393c.ba370f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 476,
-        "y": 390,
-        "z": "2d4ea144.5587f6",
+        "x": 490.8833312988281,
+        "y": 376,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "61e9ae11.23c3a8"
+                "c39e44d3.0b437"
             ]
         ]
     },
     {
-        "id": "b9796c74.99212",
+        "id": "a557e38f.6e9a5",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 473.490966796875,
-        "y": 439.57403564453125,
-        "z": "2d4ea144.5587f6",
+        "x": 488.3742980957031,
+        "y": 425.57403564453125,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "cd38df9d.37406"
+                "704ffa2b.4115fc"
             ]
         ]
     },
     {
-        "id": "e5bd0a99.00585",
+        "id": "30d0e737.4ae9c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 471,
-        "y": 482,
-        "z": "2d4ea144.5587f6",
+        "x": 485.8833312988281,
+        "y": 468,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "62703aa0.44322c"
+                "628b9d60.85cb0c"
             ]
         ]
     },
     {
-        "id": "61e9ae11.23c3a8",
+        "id": "c39e44d3.0b437",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 624,
-        "y": 391,
-        "z": "2d4ea144.5587f6",
+        "x": 638.8833312988281,
+        "y": 377,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "ca24c19f.cdc85"
+                "e6b99f9d.23ec4"
             ]
         ]
     },
     {
-        "id": "cd38df9d.37406",
+        "id": "704ffa2b.4115fc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 623.0623779296875,
-        "y": 439.8597717285156,
-        "z": "2d4ea144.5587f6",
+        "x": 637.9457092285156,
+        "y": 425.8597717285156,
+        "z": "fa25e836.5eaa88",
         "wires": []
     },
     {
-        "id": "62703aa0.44322c",
+        "id": "628b9d60.85cb0c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 622,
-        "y": 479,
-        "z": "2d4ea144.5587f6",
+        "x": 636.8833312988281,
+        "y": 465,
+        "z": "fa25e836.5eaa88",
         "wires": []
     },
     {
-        "id": "ca24c19f.cdc85",
+        "id": "e6b99f9d.23ec4",
         "type": "for",
         "name": "for helprconnidx in all-connectivities",
         "xml": "<for index='helprconnidx' start='0' end='`$tmp.aai.helper-root-all-connectivities.connectivity_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 871,
-        "y": 386,
-        "z": "2d4ea144.5587f6",
+        "x": 885.8833312988281,
+        "y": 372,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "380582c8.7d331e"
+                "15f82643.3dda02"
             ]
         ]
     },
     {
-        "id": "380582c8.7d331e",
+        "id": "15f82643.3dda02",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1118,
-        "y": 392,
-        "z": "2d4ea144.5587f6",
+        "x": 1132.8833312988281,
+        "y": 378,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "174c6173.8ff53f"
+                "d5d56de1.9016d"
             ]
         ]
     },
     {
-        "id": "206a627e.5c0d46",
+        "id": "7d92b34f.9e55dc",
         "type": "switchNode",
         "name": "switch color-aware is ROOT?",
         "xml": "\n<switch test=\"`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].color-aware == $tmp.ROOT.uni-p-interface-long`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 312,
-        "y": 641,
-        "z": "2d4ea144.5587f6",
+        "x": 326.8833312988281,
+        "y": 627,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "463cdf78.946e4"
+                "4a67b867.df0b6"
             ]
         ]
     },
     {
-        "id": "463cdf78.946e4",
+        "id": "4a67b867.df0b6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 521,
-        "y": 635,
-        "z": "2d4ea144.5587f6",
+        "x": 535.8833312988281,
+        "y": 621,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "65cbe881.f7d1b"
+                "751ad577.51dfcc"
             ]
         ]
     },
     {
-        "id": "65cbe881.f7d1b",
+        "id": "751ad577.51dfcc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 678,
-        "y": 635,
-        "z": "2d4ea144.5587f6",
+        "x": 692.8833312988281,
+        "y": 621,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "ba048fa4.246cf8",
-                "34ebbdc4.bca6fa",
-                "3a84227a.7da866"
+                "b438dfb2.fcca1",
+                "7030d1be.87fa18",
+                "31d23be7.1d5a84"
             ]
         ]
     },
     {
-        "id": "5dece674.dd027",
+        "id": "e5338f68.a61cd8",
         "type": "set",
         "name": "unset found-root-connectivity",
         "xml": "<set>\n<parameter name='found-root-connectivity' value=\"false\" />\n",
         "comments": "",
-        "x": 990,
-        "y": 159,
-        "z": "2d4ea144.5587f6",
+        "x": 1004.8833312988281,
+        "y": 145,
+        "z": "fa25e836.5eaa88",
         "wires": []
     },
     {
-        "id": "ba048fa4.246cf8",
+        "id": "b438dfb2.fcca1",
         "type": "set",
         "name": "set found-root-connectivity=true",
         "xml": "<set>\n<parameter name='found-root-connectivity' value=\"true\" />\n",
         "comments": "",
-        "x": 939,
-        "y": 583,
-        "z": "2d4ea144.5587f6",
+        "x": 953.8833312988281,
+        "y": 569,
+        "z": "fa25e836.5eaa88",
         "wires": []
     },
     {
-        "id": "34ebbdc4.bca6fa",
+        "id": "7030d1be.87fa18",
         "type": "set",
         "name": "set tmp.aai.ROOT.connectivity.",
         "xml": "<set>\n<parameter name='tmp.aai.ROOT.connectivity.' value=\"`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].`\" />\n",
         "comments": "",
-        "x": 942,
-        "y": 636,
-        "z": "2d4ea144.5587f6",
+        "x": 956.8833312988281,
+        "y": 622,
+        "z": "fa25e836.5eaa88",
         "wires": []
     },
     {
-        "id": "4d1bc5df.1d031c",
+        "id": "c3537cef.9e14b8",
         "type": "set",
         "name": "unset tmp.aai.ROOT.connectivity.",
         "xml": "<set>\n<parameter name='tmp.aai.ROOT.connectivity.' value=\"\" />\n",
         "comments": "",
-        "x": 1008,
-        "y": 203,
-        "z": "2d4ea144.5587f6",
+        "x": 1022.8833312988281,
+        "y": 189,
+        "z": "fa25e836.5eaa88",
         "wires": []
     },
     {
-        "id": "3a84227a.7da866",
+        "id": "31d23be7.1d5a84",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 870,
-        "y": 699,
-        "z": "2d4ea144.5587f6",
+        "x": 884.8833312988281,
+        "y": 685,
+        "z": "fa25e836.5eaa88",
         "wires": []
     },
     {
-        "id": "174c6173.8ff53f",
+        "id": "d5d56de1.9016d",
         "type": "switchNode",
         "name": "switch conn type",
         "xml": "<switch test=\"`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].vpn-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 923.88330078125,
-        "y": 480.88330078125,
-        "z": "2d4ea144.5587f6",
+        "x": 938.7666320800781,
+        "y": 466.88330078125,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "466114cf.ced6ec"
+                "8760c9a3.310068"
             ]
         ]
     },
     {
-        "id": "466114cf.ced6ec",
+        "id": "8760c9a3.310068",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1083.88330078125,
-        "y": 482.8833312988281,
-        "z": "2d4ea144.5587f6",
+        "x": 1098.7666320800781,
+        "y": 468.8833312988281,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "64ce81d.c0f0f"
+                "a38c2649.b4dd5"
             ]
         ]
     },
     {
-        "id": "64ce81d.c0f0f",
+        "id": "a38c2649.b4dd5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1226.88330078125,
-        "y": 484.8833312988281,
-        "z": "2d4ea144.5587f6",
+        "x": 1241.7666320800781,
+        "y": 470.8833312988281,
+        "z": "fa25e836.5eaa88",
         "wires": [
             [
-                "206a627e.5c0d46"
+                "7d92b34f.9e55dc"
             ]
         ]
+    },
+    {
+        "id": "a3ebaf5b.c985e",
+        "type": "set",
+        "name": "unset tmp.aai.helper-root-all-connectivities",
+        "xml": "<set>\n<parameter name='tmp.aai.helper-root-all-connectivities.' value=\"\" />\n",
+        "comments": "",
+        "x": 1068,
+        "y": 244,
+        "z": "fa25e836.5eaa88",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json
index 713d6aba..1e578f8d 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "4ee6b24.013d9cc",
+        "id": "aeb91e9b.d42c7",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 163,
-        "y": 91,
-        "z": "1453a3a4.2dddfc",
+        "x": 189.88333129882812,
+        "y": 84.88333129882812,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "42ee2cb2.8b0aa4"
+                "84614040.2c4ec8"
             ]
         ]
     },
     {
-        "id": "42ee2cb2.8b0aa4",
+        "id": "84614040.2c4ec8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,339 +22,620 @@
         "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": 447.2856903076172,
-        "y": 152.23810863494873,
-        "z": "1453a3a4.2dddfc",
+        "x": 474.1690216064453,
+        "y": 146.12143993377686,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "2d8be51e.1fe5b2"
+                "8109fba8.cb20c"
             ]
         ]
     },
     {
-        "id": "2d8be51e.1fe5b2",
+        "id": "8109fba8.cb20c",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-helper-find-connectivity",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 402.4285888671875,
-        "y": 244.00003051757812,
-        "z": "1453a3a4.2dddfc",
+        "x": 429.3119201660156,
+        "y": 237.88336181640625,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "44543bcb.341e5c"
+                "dc0a4608.eb89a8"
             ]
         ]
     },
     {
-        "id": "44543bcb.341e5c",
+        "id": "dc0a4608.eb89a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 763.238037109375,
-        "y": 228.66668701171875,
-        "z": "1453a3a4.2dddfc",
+        "x": 790.1213684082031,
+        "y": 222.55001831054688,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "93197478.d2fae",
-                "eb6c2023.7ef7a",
-                "d72f415d.01bc08"
+                "509ec296.1bbe8c",
+                "5920f715.1dd26",
+                "838a9489.ed1eb",
+                "9abf8c8.8d1f07"
             ]
         ]
     },
     {
-        "id": "93197478.d2fae",
+        "id": "509ec296.1bbe8c",
         "type": "save",
         "name": "get all-connectivities from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivities\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.helper-all-connectivities\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 248,
-        "y": 414,
-        "z": "1453a3a4.2dddfc",
+        "x": 274.8833312988281,
+        "y": 407.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "3210bd43.c197f2",
-                "cb92b047.8ddef8",
-                "39efd1fc.091d56"
+                "718aef78.41717",
+                "f4bff51a.32c2a",
+                "be13a17a.8d69d8"
             ]
         ]
     },
     {
-        "id": "3210bd43.c197f2",
+        "id": "718aef78.41717",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 492,
-        "y": 374,
-        "z": "1453a3a4.2dddfc",
+        "x": 518.8833312988281,
+        "y": 367.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "b85791e3.02f868"
+                "41301f82.8c086"
             ]
         ]
     },
     {
-        "id": "cb92b047.8ddef8",
+        "id": "f4bff51a.32c2a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 489.490966796875,
-        "y": 423.57403564453125,
-        "z": "1453a3a4.2dddfc",
+        "x": 516.3742980957031,
+        "y": 417.4573669433594,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "7f9747fb.6ed01"
+                "46c2d85d.47d55"
             ]
         ]
     },
     {
-        "id": "39efd1fc.091d56",
+        "id": "be13a17a.8d69d8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 487,
-        "y": 466,
-        "z": "1453a3a4.2dddfc",
+        "x": 513.8833312988281,
+        "y": 459.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "d53ce1e7.42a2c"
+                "c5665fd8.f3a29"
             ]
         ]
     },
     {
-        "id": "b85791e3.02f868",
+        "id": "41301f82.8c086",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 640,
-        "y": 375,
-        "z": "1453a3a4.2dddfc",
+        "x": 666.8833312988281,
+        "y": 368.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "538f3beb.2d964c"
+                "de5d49ec.648cb"
             ]
         ]
     },
     {
-        "id": "7f9747fb.6ed01",
+        "id": "46c2d85d.47d55",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 639.0623779296875,
-        "y": 423.8597717285156,
-        "z": "1453a3a4.2dddfc",
+        "x": 665.9457092285156,
+        "y": 417.74310302734375,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "d53ce1e7.42a2c",
+        "id": "c5665fd8.f3a29",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 638,
-        "y": 463,
-        "z": "1453a3a4.2dddfc",
+        "x": 664.8833312988281,
+        "y": 456.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "538f3beb.2d964c",
+        "id": "de5d49ec.648cb",
         "type": "for",
         "name": "for helpconnidx in all-connectivities",
         "xml": "<for index='helpconnidx' start='0' end='`$tmp.aai.helper-all-connectivities.connectivity_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 887,
-        "y": 370,
-        "z": "1453a3a4.2dddfc",
+        "x": 913.8833312988281,
+        "y": 363.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "344678ba.b7f29"
+                "64800a1.2a06474"
             ]
         ]
     },
     {
-        "id": "344678ba.b7f29",
+        "id": "64800a1.2a06474",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1134,
-        "y": 376,
-        "z": "1453a3a4.2dddfc",
+        "x": 784.88330078125,
+        "y": 540.8833312988281,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "d48cc8ae.307b68"
+                "f3fa10d8.6f9d4",
+                "aad0e41e.4e03c"
             ]
         ]
     },
     {
-        "id": "d48cc8ae.307b68",
+        "id": "31c74b2e.3b274c",
         "type": "switchNode",
         "name": "switch current provider-id?",
         "xml": "\n<switch test=\"`$tmp.current-provider-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 328,
-        "y": 625,
-        "z": "1453a3a4.2dddfc",
+        "x": 345.88330078125,
+        "y": 984.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "bc092a3b.859928"
+                "7e112bdd.b19944"
             ]
         ]
     },
     {
-        "id": "bc092a3b.859928",
+        "id": "7e112bdd.b19944",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 537,
-        "y": 619,
-        "z": "1453a3a4.2dddfc",
+        "x": 554.88330078125,
+        "y": 978.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "121a7afe.07beb5"
+                "c05a9bda.8a79"
             ]
         ]
     },
     {
-        "id": "121a7afe.07beb5",
+        "id": "c05a9bda.8a79",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 694,
-        "y": 619,
-        "z": "1453a3a4.2dddfc",
+        "x": 711.88330078125,
+        "y": 978.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "7603071b.598a38"
+                "55ad0392.5f6db4"
             ]
         ]
     },
     {
-        "id": "7603071b.598a38",
+        "id": "55ad0392.5f6db4",
         "type": "switchNode",
         "name": "switch current-cvlan-id?",
         "xml": "\n<switch test=\"`$tmp.current-cvlan-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].cvlan`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 320,
-        "y": 713,
-        "z": "1453a3a4.2dddfc",
+        "x": 337.88330078125,
+        "y": 1072.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "e6157f7f.780a28"
+                "788f496d.e066e8"
             ]
         ]
     },
     {
-        "id": "e6157f7f.780a28",
+        "id": "788f496d.e066e8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 529,
-        "y": 707,
-        "z": "1453a3a4.2dddfc",
+        "x": 546.88330078125,
+        "y": 1066.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "4bd1a2a7.9f2d14"
+                "6fac95a4.8d5e0c"
             ]
         ]
     },
     {
-        "id": "eb6c2023.7ef7a",
+        "id": "5920f715.1dd26",
         "type": "set",
         "name": "unset found-connectivity",
         "xml": "<set>\n<parameter name='found-connectivity' value=\"false\" />\n",
         "comments": "",
-        "x": 1006,
-        "y": 143,
-        "z": "1453a3a4.2dddfc",
+        "x": 1032.8833312988281,
+        "y": 136.88333129882812,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "c418ca90.026d18",
+        "id": "276095dd.4c3c5a",
         "type": "set",
         "name": "set found-connectivity=true",
         "xml": "<set>\n<parameter name='found-connectivity' value=\"true\" />\n",
         "comments": "",
-        "x": 935,
-        "y": 707,
-        "z": "1453a3a4.2dddfc",
+        "x": 952.88330078125,
+        "y": 1066.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "4bd1a2a7.9f2d14",
+        "id": "6fac95a4.8d5e0c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 697,
-        "y": 708,
-        "z": "1453a3a4.2dddfc",
+        "x": 714.88330078125,
+        "y": 1067.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": [
             [
-                "c418ca90.026d18",
-                "cce4f57f.9fec88",
-                "cc11b7b4.773dc8"
+                "276095dd.4c3c5a",
+                "35f5de07.464e0a",
+                "40d9d0fe.d02c3"
             ]
         ]
     },
     {
-        "id": "cce4f57f.9fec88",
+        "id": "35f5de07.464e0a",
         "type": "set",
         "name": "set the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].`\" />\n",
         "comments": "",
-        "x": 916,
-        "y": 763,
-        "z": "1453a3a4.2dddfc",
+        "x": 933.88330078125,
+        "y": 1122.88330078125,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "d72f415d.01bc08",
+        "id": "838a9489.ed1eb",
         "type": "set",
         "name": "unset tmp.the-connectivity.",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value=\"\" />\n",
         "comments": "",
-        "x": 1010,
-        "y": 187,
-        "z": "1453a3a4.2dddfc",
+        "x": 1036.8833312988281,
+        "y": 180.88333129882812,
+        "z": "b7dcb328.93d858",
         "wires": []
     },
     {
-        "id": "cc11b7b4.773dc8",
+        "id": "40d9d0fe.d02c3",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 877,
-        "y": 814,
-        "z": "1453a3a4.2dddfc",
+        "x": 894.88330078125,
+        "y": 1173.88330078125,
+        "z": "b7dcb328.93d858",
+        "wires": []
+    },
+    {
+        "id": "9abf8c8.8d1f07",
+        "type": "set",
+        "name": "unset tmp.aai.helper-all-connectivities",
+        "xml": "<set>\n<parameter name='tmp.aai.helper-all-connectivities.' value=\"\" />\n",
+        "comments": "",
+        "x": 1063,
+        "y": 233,
+        "z": "b7dcb328.93d858",
+        "wires": []
+    },
+    {
+        "id": "9cad442b.773338",
+        "type": "switchNode",
+        "name": "switch access-provider-id != ''",
+        "xml": "<switch test=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id != ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1043,
+        "y": 633,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "4d1586da.4c4ea8",
+                "8c666101.3ce288"
+            ]
+        ]
+    },
+    {
+        "id": "f3fa10d8.6f9d4",
+        "type": "record",
+        "name": "record access-provider-id",
+        "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=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`\"/>\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1022,
+        "y": 481,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "aad0e41e.4e03c",
+        "type": "switchNode",
+        "name": "access-provider-id empty?",
+        "xml": "<switch test='`length($tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id) == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1031,
+        "y": 543,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "ea8bd792.630a88",
+                "3693d975.d419ee"
+            ]
+        ]
+    },
+    {
+        "id": "ea8bd792.630a88",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1242,
+        "y": 521,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "266f1b69.40bd84"
+            ]
+        ]
+    },
+    {
+        "id": "3693d975.d419ee",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1250,
+        "y": 577,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "be2ed43a.87e25"
+            ]
+        ]
+    },
+    {
+        "id": "266f1b69.40bd84",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1379,
+        "y": 522,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "be2ed43a.87e25",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1382,
+        "y": 578,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "9cad442b.773338"
+            ]
+        ]
+    },
+    {
+        "id": "4d1586da.4c4ea8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1250,
+        "y": 683,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "ebe04a71.67d7"
+            ]
+        ]
+    },
+    {
+        "id": "8c666101.3ce288",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1252,
+        "y": 635,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "dea822fb.78f968"
+            ]
+        ]
+    },
+    {
+        "id": "ebe04a71.67d7",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1388,
+        "y": 687,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "bc41ce93.ef44f8"
+            ]
+        ]
+    },
+    {
+        "id": "dea822fb.78f968",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1383,
+        "y": 635,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "bc41ce93.ef44f8",
+        "type": "switchNode",
+        "name": "switch type is not mdsc",
+        "xml": "<switch test=\"`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].vpn-type != 'mdsc' `\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1023,
+        "y": 732,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "66c221d8.65d09",
+                "1093c517.0894a3"
+            ]
+        ]
+    },
+    {
+        "id": "66c221d8.65d09",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1239,
+        "y": 733,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "a35a8a78.60736"
+            ]
+        ]
+    },
+    {
+        "id": "1093c517.0894a3",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1237,
+        "y": 781,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "4932f7b5.545a3"
+            ]
+        ]
+    },
+    {
+        "id": "a35a8a78.60736",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1370,
+        "y": 733,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4932f7b5.545a3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1375,
+        "y": 785,
+        "z": "b7dcb328.93d858",
+        "wires": [
+            [
+                "31c74b2e.3b274c"
+            ]
+        ]
+    },
+    {
+        "id": "e835ab85.de0738",
+        "type": "comment",
+        "name": "access-provider-id in mdsc connectivity should be empty",
+        "info": "middle-man connectivity should not have its access-provider-id set. It should be empty.",
+        "comments": "",
+        "x": 1095,
+        "y": 443,
+        "z": "b7dcb328.93d858",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.json
index 340a1b89..f22b986a 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.json
@@ -1,590 +1,590 @@
 [
     {
-        "id": "7b0a2375.19194c",
+        "id": "ae6ce233.cb49c8",
         "type": "save",
         "name": "get all-connectivities from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivities\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/connectivities\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-connectivities\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 271,
-        "y": 341,
-        "z": "fb45f2fd.f3f61",
+        "x": 342.8833312988281,
+        "y": 355,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "f06c3947.630bf",
-                "baa57021.06de88",
-                "770d11f9.13541"
+                "ad0ebe6a.108058",
+                "e70f7c6d.fdd708",
+                "478400c1.aa8de8"
             ]
         ]
     },
     {
-        "id": "f06c3947.630bf",
+        "id": "ad0ebe6a.108058",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 509,
-        "y": 309,
-        "z": "fb45f2fd.f3f61",
+        "x": 580.8833312988281,
+        "y": 323,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "8f09fc1f.1f9e1"
+                "39997c10.b90074"
             ]
         ]
     },
     {
-        "id": "baa57021.06de88",
+        "id": "e70f7c6d.fdd708",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 509.490966796875,
-        "y": 354.57403564453125,
-        "z": "fb45f2fd.f3f61",
+        "x": 581.3742980957031,
+        "y": 368.57403564453125,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "770d11f9.13541",
+        "id": "478400c1.aa8de8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 507,
-        "y": 398,
-        "z": "fb45f2fd.f3f61",
+        "x": 578.8833312988281,
+        "y": 412,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "8f09fc1f.1f9e1",
+        "id": "39997c10.b90074",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 682,
-        "y": 307,
-        "z": "fb45f2fd.f3f61",
+        "x": 753.8833312988281,
+        "y": 321,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "e755721c.711348"
+                "aefbd8d9.0d607"
             ]
         ]
     },
     {
-        "id": "15095086.d2123f",
+        "id": "11206470.526174",
         "type": "for",
         "name": "for connidx in all-connectivities",
         "xml": "<for index='connidx' start='0' end='`$tmp.aai.all-connectivities.connectivity_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 718,
-        "y": 528,
-        "z": "fb45f2fd.f3f61",
+        "x": 789.8833312988281,
+        "y": 542,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "990dc4a9.cfdf28"
+                "f0aadf36.87aff"
             ]
         ]
     },
     {
-        "id": "990dc4a9.cfdf28",
+        "id": "f0aadf36.87aff",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 157,
-        "y": 624,
-        "z": "fb45f2fd.f3f61",
+        "x": 228.88333129882812,
+        "y": 638,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "504b7173.9a04",
-                "abd234d.58ac848"
+                "a9594d85.e9f878",
+                "380d57d7.fea4b"
             ]
         ]
     },
     {
-        "id": "504b7173.9a04",
+        "id": "a9594d85.e9f878",
         "type": "switchNode",
         "name": "switch conn type is mdsc",
         "xml": "<switch test=\"`$tmp.aai.all-connectivities.connectivity[$connidx].vpn-type == 'mdsc' `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 187,
-        "y": 745,
-        "z": "fb45f2fd.f3f61",
+        "x": 258.8833312988281,
+        "y": 759,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "21e297f1.dc3d08",
-                "1c75dc19.23204c"
+                "cd105cc3.e86598",
+                "e73994bf.bcc7a"
             ]
         ]
     },
     {
-        "id": "21e297f1.dc3d08",
+        "id": "cd105cc3.e86598",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 391,
-        "y": 778,
-        "z": "fb45f2fd.f3f61",
+        "x": 462.8833312988281,
+        "y": 792,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "f10ea601.371e28"
+                "fb61d765.95738"
             ]
         ]
     },
     {
-        "id": "1c75dc19.23204c",
+        "id": "e73994bf.bcc7a",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 393,
-        "y": 723,
-        "z": "fb45f2fd.f3f61",
+        "x": 464.8833312988281,
+        "y": 737,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "eba2e2ab.d5d96"
+                "87d4935c.7f47b"
             ]
         ]
     },
     {
-        "id": "f10ea601.371e28",
+        "id": "fb61d765.95738",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 543,
-        "y": 778,
-        "z": "fb45f2fd.f3f61",
+        "x": 614.8833312988281,
+        "y": 792,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "7a2fe87b.22223"
+                "fce0046e.17ed4"
             ]
         ]
     },
     {
-        "id": "e755721c.711348",
+        "id": "aefbd8d9.0d607",
         "type": "switchNode",
         "name": "switch conn list empty?",
         "xml": "<switch test=\"`$tmp.aai.all-connectivities.connectivity_length == 0`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 274,
-        "y": 523,
-        "z": "fb45f2fd.f3f61",
+        "x": 345.8833312988281,
+        "y": 537,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "f98c61eb.311468",
-                "f482191d.a1c73"
+                "226ed271.6fe31e",
+                "c192b354.6af6d8"
             ]
         ]
     },
     {
-        "id": "f98c61eb.311468",
+        "id": "226ed271.6fe31e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 499,
-        "y": 458,
-        "z": "fb45f2fd.f3f61",
+        "x": 570.8833312988281,
+        "y": 472,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "f482191d.a1c73",
+        "id": "c192b354.6af6d8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 493,
-        "y": 528,
-        "z": "fb45f2fd.f3f61",
+        "x": 564.8833312988281,
+        "y": 542,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "15095086.d2123f"
+                "11206470.526174"
             ]
         ]
     },
     {
-        "id": "f6a19ff.e5e506",
+        "id": "e5434531.84e89",
         "type": "comment",
         "name": "ein addi normal",
         "info": "",
         "comments": "",
-        "x": 644,
-        "y": 457,
-        "z": "fb45f2fd.f3f61",
+        "x": 715.8833312988281,
+        "y": 471,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "6b9d01c8.8380d",
+        "id": "faa6b1fb.f35298",
         "type": "comment",
         "name": "ein addi normal",
         "info": "",
         "comments": "",
-        "x": 667,
-        "y": 353,
-        "z": "fb45f2fd.f3f61",
+        "x": 738.8833312988281,
+        "y": 367,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "5b66feaa.e86c28",
+        "id": "af480ce1.7cb108",
         "type": "comment",
         "name": "ein addi normal",
         "info": "",
         "comments": "",
-        "x": 662,
-        "y": 396,
-        "z": "fb45f2fd.f3f61",
+        "x": 733.8833312988281,
+        "y": 410,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "d5e8e6d4.6174b",
+        "id": "b34ecdaf.e57d9",
         "type": "switchNode",
         "name": "switch conn vlan same as curr ll",
         "xml": "<!--<switch test=\"`$tmp.aai.all-connectivities.connectivity[$connidx].cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `\">-->\n<switch test=\"`$tmp.aai.mmrconnectivity.cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 236,
-        "y": 1432,
-        "z": "fb45f2fd.f3f61",
+        "x": 307.8833312988281,
+        "y": 1446,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "cd252ece.fc6de",
-                "60cb2182.fee2"
+                "91cd0712.b09c18",
+                "b11fe991.358eb"
             ]
         ]
     },
     {
-        "id": "cd252ece.fc6de",
+        "id": "91cd0712.b09c18",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 447,
-        "y": 1402,
-        "z": "fb45f2fd.f3f61",
+        "x": 518.8833312988281,
+        "y": 1416,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "4f3cf1a8.7050e"
+                "1f3692a3.acfe3d"
             ]
         ]
     },
     {
-        "id": "60cb2182.fee2",
+        "id": "b11fe991.358eb",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 445,
-        "y": 1454,
-        "z": "fb45f2fd.f3f61",
+        "x": 516.8833312988281,
+        "y": 1468,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "cef30c4.ef4cd7"
+                "234b7ab5.de6a7e"
             ]
         ]
     },
     {
-        "id": "eba2e2ab.d5d96",
+        "id": "87d4935c.7f47b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 548,
-        "y": 722,
-        "z": "fb45f2fd.f3f61",
+        "x": 619.8833312988281,
+        "y": 736,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "4f3cf1a8.7050e",
+        "id": "1f3692a3.acfe3d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 602,
-        "y": 1403,
-        "z": "fb45f2fd.f3f61",
+        "x": 673.8833312988281,
+        "y": 1417,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "cef30c4.ef4cd7",
+        "id": "234b7ab5.de6a7e",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='connrelidx' start='0' end='`$tmp.aai.mmrconnectivity.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 629,
-        "y": 1452,
-        "z": "fb45f2fd.f3f61",
+        "x": 700.8833312988281,
+        "y": 1466,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "d05fb37f.c486c8",
-                "1276102f.a824d8"
+                "b4ee2585.74fbf",
+                "ff81000b.fb7c2"
             ]
         ]
     },
     {
-        "id": "d05fb37f.c486c8",
+        "id": "b4ee2585.74fbf",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 835,
-        "y": 1452,
-        "z": "fb45f2fd.f3f61",
+        "x": 906.8833312988281,
+        "y": 1466,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "25263c04.90ef7c"
+                "2cc806a4.6e3c9a"
             ]
         ]
     },
     {
-        "id": "25263c04.90ef7c",
+        "id": "2cc806a4.6e3c9a",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 999.28564453125,
-        "y": 1451.82177734375,
-        "z": "fb45f2fd.f3f61",
+        "x": 1071.1689758300781,
+        "y": 1465.82177734375,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "15768efa.a62941"
+                "38fac4a0.444754"
             ]
         ]
     },
     {
-        "id": "15768efa.a62941",
+        "id": "38fac4a0.444754",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 197.1171875,
-        "y": 1553.34033203125,
-        "z": "fb45f2fd.f3f61",
+        "x": 269.0005187988281,
+        "y": 1567.34033203125,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "1e97f046.fc5fc8",
-                "11d23afb.a558bd"
+                "825d7520.c89d3",
+                "f01e6cc3.227fc"
             ]
         ]
     },
     {
-        "id": "d5f57787.9b2fc8",
+        "id": "3d5ae731.2a14e8",
         "type": "comment",
         "name": "TODO",
         "info": "",
         "comments": "",
-        "x": 216,
-        "y": 1460,
-        "z": "fb45f2fd.f3f61",
+        "x": 287.8833312988281,
+        "y": 1474,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "3f1e619e.884ab6",
+        "id": "370aae9e.ee24b2",
         "type": "switchNode",
         "name": "switch uni.tp-id is ROOT",
         "xml": "<switch test='`$tmp.aai.uni.id == $tmp.ROOT.uni-p-interface-long`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 916,
-        "y": 1555,
-        "z": "fb45f2fd.f3f61",
+        "x": 987.8833312988281,
+        "y": 1569,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "b4219e4f.0520e",
-                "777497f5.84d998"
+                "7e154eb9.5d4cc8",
+                "afc167b3.ef6778"
             ]
         ]
     },
     {
-        "id": "1e97f046.fc5fc8",
+        "id": "825d7520.c89d3",
         "type": "set",
         "name": "set tmp.uni.id",
         "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
-        "x": 370,
-        "y": 1549,
-        "z": "fb45f2fd.f3f61",
+        "x": 441.8833312988281,
+        "y": 1563,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "1276102f.a824d8",
+        "id": "ff81000b.fb7c2",
         "type": "set",
         "name": "unset tmp.uni.id",
         "xml": "<set>\n<parameter name='tmp.uni.id' value='' />\n",
         "comments": "",
-        "x": 828,
-        "y": 1402,
-        "z": "fb45f2fd.f3f61",
+        "x": 899.8833312988281,
+        "y": 1416,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "11d23afb.a558bd",
+        "id": "f01e6cc3.227fc",
         "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": 373,
-        "y": 1596,
-        "z": "fb45f2fd.f3f61",
+        "x": 444.8833312988281,
+        "y": 1610,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "892d20e.12d85e",
-                "7da1ee3a.e78cb",
-                "58ab5e35.f749d"
+                "ea6303b2.75e68",
+                "a6891bca.04787",
+                "9b99051a.095eb8"
             ]
         ]
     },
     {
-        "id": "892d20e.12d85e",
+        "id": "ea6303b2.75e68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 545,
-        "y": 1580,
-        "z": "fb45f2fd.f3f61",
+        "x": 616.8833312988281,
+        "y": 1594,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "8ca2de8b.fa6f4"
+                "49a1213f.79c1"
             ]
         ]
     },
     {
-        "id": "7da1ee3a.e78cb",
+        "id": "a6891bca.04787",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 545.490966796875,
-        "y": 1625.5740356445312,
-        "z": "fb45f2fd.f3f61",
+        "x": 617.3742980957031,
+        "y": 1639.5740356445312,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "889ff.98f506018"
+                "e29da398.a00668"
             ]
         ]
     },
     {
-        "id": "58ab5e35.f749d",
+        "id": "9b99051a.095eb8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 546,
-        "y": 1666,
-        "z": "fb45f2fd.f3f61",
+        "x": 617.8833312988281,
+        "y": 1680,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "8d5edab7.25bff"
+                "fe2cb11b.f77b8"
             ]
         ]
     },
     {
-        "id": "889ff.98f506018",
+        "id": "e29da398.a00668",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='uni not found' />\n",
         "comments": "",
-        "x": 696,
-        "y": 1626,
-        "z": "fb45f2fd.f3f61",
+        "x": 767.8833312988281,
+        "y": 1640,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "8d5edab7.25bff",
+        "id": "fe2cb11b.f77b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value='uni not found' />\n",
         "comments": "",
-        "x": 693,
-        "y": 1665,
-        "z": "fb45f2fd.f3f61",
+        "x": 764.8833312988281,
+        "y": 1679,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "8ca2de8b.fa6f4",
+        "id": "49a1213f.79c1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 706,
-        "y": 1576,
-        "z": "fb45f2fd.f3f61",
+        "x": 777.8833312988281,
+        "y": 1590,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "8429b9e7.1b46b",
-                "f62ad7f3.b94538"
+                "8ee8b27a.1e548",
+                "36182b29.e459c4"
             ]
         ]
     },
     {
-        "id": "bc37f012.c984b",
+        "id": "20dd4097.429e6",
         "type": "comment",
         "name": "THIS SHOULD BE RETIRED?",
         "info": "",
         "comments": "",
-        "x": 898,
-        "y": 1509,
-        "z": "fb45f2fd.f3f61",
+        "x": 969.8833312988281,
+        "y": 1523,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "f7004653.aced4",
+        "id": "f8a7e147.d035a",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 178,
-        "y": 78,
-        "z": "fb45f2fd.f3f61",
+        "x": 249.88333129882812,
+        "y": 92,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "4d6292f9.29a84c"
+                "9c94eec9.5c0dd8"
             ]
         ]
     },
     {
-        "id": "4d6292f9.29a84c",
+        "id": "9c94eec9.5c0dd8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -592,853 +592,877 @@
         "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": 462.2856903076172,
-        "y": 139.23810863494873,
-        "z": "fb45f2fd.f3f61",
+        "x": 534.1690216064453,
+        "y": 153.23810863494873,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "cb7f429c.c16cd8"
+                "482cf9ba.cfa1a8"
             ]
         ]
     },
     {
-        "id": "cb7f429c.c16cd8",
+        "id": "482cf9ba.cfa1a8",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-logic",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-logic' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 468.42860412597656,
-        "y": 224.00003051757812,
-        "z": "fb45f2fd.f3f61",
+        "x": 540.3119354248047,
+        "y": 238.00003051757812,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "f9801a6c.b832c"
+                "c6167e24.8c2b48"
             ]
         ]
     },
     {
-        "id": "f9801a6c.b832c",
+        "id": "c6167e24.8c2b48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 778.238037109375,
-        "y": 215.66668701171875,
-        "z": "fb45f2fd.f3f61",
+        "x": 850.1213684082031,
+        "y": 229.66668701171875,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "7b0a2375.19194c",
-                "faf609fb.751ba",
-                "a41833d1.ac9d88",
-                "5bc7dc0.190fca4",
-                "287c8e9d.ecd2da"
+                "ae6ce233.cb49c8",
+                "38523ea0.abfb72",
+                "7dfa60b1.017b38",
+                "bf82e982.34914",
+                "9f305e4b.2c08a8"
             ]
         ]
     },
     {
-        "id": "dfb8236b.074ec8",
+        "id": "11d67f79.34efb1",
         "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": 1418,
-        "y": 1597,
-        "z": "fb45f2fd.f3f61",
+        "x": 1489.8833312988281,
+        "y": 1611,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "b4219e4f.0520e",
+        "id": "7e154eb9.5d4cc8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1095,
-        "y": 1511,
-        "z": "fb45f2fd.f3f61",
+        "x": 1166.8833312988281,
+        "y": 1525,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "71aa028b.bdc3e4"
+                "93854e03.17954"
             ]
         ]
     },
     {
-        "id": "777497f5.84d998",
+        "id": "afc167b3.ef6778",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1094,
-        "y": 1567,
-        "z": "fb45f2fd.f3f61",
+        "x": 1165.8833312988281,
+        "y": 1581,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "aa4430ef.d9e498"
+                "76ae18a3.6c831"
             ]
         ]
     },
     {
-        "id": "aa4430ef.d9e498",
+        "id": "76ae18a3.6c831",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1236,
-        "y": 1566,
-        "z": "fb45f2fd.f3f61",
+        "x": 1307.8833312988281,
+        "y": 1580,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "dfb8236b.074ec8",
-                "e041bd52.978d1"
+                "11d67f79.34efb1",
+                "1deeeaf.25d7015"
             ]
         ]
     },
     {
-        "id": "e041bd52.978d1",
+        "id": "1deeeaf.25d7015",
         "type": "set",
         "name": "set found-middle-man",
         "xml": "<set>\n<parameter name='found-middle-man' value=\"true\" />\n",
         "comments": "",
-        "x": 1422,
-        "y": 1543,
-        "z": "fb45f2fd.f3f61",
+        "x": 1493.8833312988281,
+        "y": 1557,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "faf609fb.751ba",
+        "id": "38523ea0.abfb72",
         "type": "set",
         "name": "set found-middle-man",
         "xml": "<set>\n<parameter name='found-middle-man' value=\"false\" />\n",
         "comments": "",
-        "x": 1016,
-        "y": 152,
-        "z": "fb45f2fd.f3f61",
+        "x": 1087.8833312988281,
+        "y": 166,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "8429b9e7.1b46b",
+        "id": "8ee8b27a.1e548",
         "type": "switchNode",
         "name": "switch uni-tp-id-node-part is OTHERSIRE-NODEONLY",
         "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 945,
-        "y": 1972,
-        "z": "fb45f2fd.f3f61",
+        "x": 1016.8833312988281,
+        "y": 1986,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "967dd77f.a9ddf8",
-                "3a04bb6.f5843c4"
+                "27dde82a.2f3c2",
+                "cd264050.8e9db"
             ]
         ]
     },
     {
-        "id": "967dd77f.a9ddf8",
+        "id": "27dde82a.2f3c2",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1226,
-        "y": 1949,
-        "z": "fb45f2fd.f3f61",
+        "x": 1297.8833312988281,
+        "y": 1963,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "e6273a1e.a882d8"
+                "509e3144.330748"
             ]
         ]
     },
     {
-        "id": "3a04bb6.f5843c4",
+        "id": "cd264050.8e9db",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1219,
-        "y": 2008,
-        "z": "fb45f2fd.f3f61",
+        "x": 1290.8833312988281,
+        "y": 2022,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "ad97b1cf.83f91"
+                "b8b89d47.17e2d8"
             ]
         ]
     },
     {
-        "id": "ad97b1cf.83f91",
+        "id": "b8b89d47.17e2d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1361,
-        "y": 2007,
-        "z": "fb45f2fd.f3f61",
+        "x": 1432.8833312988281,
+        "y": 2021,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "5b517936.cbfa08",
-                "311640ea.18d798",
-                "1778233a.2c990d",
-                "aa0b4226.979d68"
+                "f293ac63.f31218",
+                "d839efbf.779a6",
+                "92b81e5e.75b818",
+                "5bc64c01.f1d944",
+                "94ffeddc.43efb"
             ]
         ]
     },
     {
-        "id": "71aa028b.bdc3e4",
+        "id": "93854e03.17954",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1237,
-        "y": 1501,
-        "z": "fb45f2fd.f3f61",
+        "x": 1308.8833312988281,
+        "y": 1515,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6273a1e.a882d8",
+        "id": "509e3144.330748",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1356,
-        "y": 1953,
-        "z": "fb45f2fd.f3f61",
+        "x": 1427.8833312988281,
+        "y": 1967,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "311640ea.18d798",
+        "id": "d839efbf.779a6",
         "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": 1569,
-        "y": 2026,
-        "z": "fb45f2fd.f3f61",
+        "x": 1640.8833312988281,
+        "y": 2040,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "5b517936.cbfa08",
+        "id": "f293ac63.f31218",
         "type": "set",
         "name": "set no-pce-call",
         "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",
         "comments": "",
-        "x": 1553,
-        "y": 1974,
-        "z": "fb45f2fd.f3f61",
+        "x": 1624.8833312988281,
+        "y": 1988,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "a41833d1.ac9d88",
+        "id": "7dfa60b1.017b38",
         "type": "set",
         "name": "set no-pce-call",
         "xml": "<set>\n<parameter name='no-pce-call' value=\"false\" />\n",
         "comments": "",
-        "x": 993,
-        "y": 198,
-        "z": "fb45f2fd.f3f61",
+        "x": 1064.8833312988281,
+        "y": 212,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "663e6db8.3ac154",
+        "id": "5ac1fa22.3be604",
         "type": "comment",
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",
         "info": "",
         "comments": "",
-        "x": 966,
-        "y": 1781,
-        "z": "fb45f2fd.f3f61",
+        "x": 1037.8833312988281,
+        "y": 1795,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "f62ad7f3.b94538",
+        "id": "36182b29.e459c4",
         "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": 901,
-        "y": 1838,
-        "z": "fb45f2fd.f3f61",
+        "x": 972.8833312988281,
+        "y": 1852,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "a1c99a4f.cc4ba8",
-                "b212c5d0.bf7fe"
+                "1e88bba0.df5a0c",
+                "cf2a5e36.db8d08"
             ]
         ]
     },
     {
-        "id": "b212c5d0.bf7fe",
+        "id": "cf2a5e36.db8d08",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1124,
-        "y": 1824,
-        "z": "fb45f2fd.f3f61",
+        "x": 1195.8833312988281,
+        "y": 1838,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "476892d7.bc3d8c"
+                "6c1ba065.ca6"
             ]
         ]
     },
     {
-        "id": "a1c99a4f.cc4ba8",
+        "id": "1e88bba0.df5a0c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1126,
-        "y": 1857,
-        "z": "fb45f2fd.f3f61",
+        "x": 1197.8833312988281,
+        "y": 1871,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "cb705f2e.381028"
+                "1fbe5fca.067f6"
             ]
         ]
     },
     {
-        "id": "476892d7.bc3d8c",
+        "id": "6c1ba065.ca6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1272,
-        "y": 1817,
-        "z": "fb45f2fd.f3f61",
+        "x": 1343.8833312988281,
+        "y": 1831,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "dd2db0f7.6e11c8"
+                "1fe3499.6fc8f36"
             ]
         ]
     },
     {
-        "id": "cb705f2e.381028",
+        "id": "1fbe5fca.067f6",
         "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": 1269,
-        "y": 1854,
-        "z": "fb45f2fd.f3f61",
+        "x": 1340.8833312988281,
+        "y": 1868,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "dd2db0f7.6e11c8",
+        "id": "1fe3499.6fc8f36",
         "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": 1449,
-        "y": 1817,
-        "z": "fb45f2fd.f3f61",
+        "x": 1520.8833312988281,
+        "y": 1831,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "7a2fe87b.22223",
+        "id": "fce0046e.17ed4",
         "type": "switchNode",
         "name": "switch color-aware is ROOT",
         "xml": "<switch test=\"`$tmp.aai.all-connectivities.connectivity[$connidx].color-aware == $tmp.ROOT.uni-p-interface-long`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 789,
-        "y": 777,
-        "z": "fb45f2fd.f3f61",
+        "x": 860.8833312988281,
+        "y": 791,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "173f4814.22298",
-                "e05c6609.d62108"
+                "b74a4f09.9ed18",
+                "14087de4.567de2"
             ]
         ]
     },
     {
-        "id": "173f4814.22298",
+        "id": "b74a4f09.9ed18",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 989,
-        "y": 738,
-        "z": "fb45f2fd.f3f61",
+        "x": 1060.8833312988281,
+        "y": 752,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "c2195b31.7e4bd"
+                "d1c419ac.9685a8"
             ]
         ]
     },
     {
-        "id": "e05c6609.d62108",
+        "id": "14087de4.567de2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 988,
-        "y": 794,
-        "z": "fb45f2fd.f3f61",
+        "x": 1059.8833312988281,
+        "y": 808,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "debff193.d4e6d"
+                "edcebb95.f9b518"
             ]
         ]
     },
     {
-        "id": "c2195b31.7e4bd",
+        "id": "d1c419ac.9685a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1131,
-        "y": 728,
-        "z": "fb45f2fd.f3f61",
+        "x": 1202.8833312988281,
+        "y": 742,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "debff193.d4e6d",
+        "id": "edcebb95.f9b518",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1130,
-        "y": 793,
-        "z": "fb45f2fd.f3f61",
+        "x": 1201.8833312988281,
+        "y": 807,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "e8efcfa.5f73cb",
-                "c46e249d.aa62a8"
+                "b8f288cf.803b8",
+                "f15c072a.39099"
             ]
         ]
     },
     {
-        "id": "c46e249d.aa62a8",
+        "id": "f15c072a.39099",
         "type": "set",
         "name": "set found-middle-man",
         "xml": "<set>\n<parameter name='found-middle-man' value=\"true\" />\n",
         "comments": "",
-        "x": 1341,
-        "y": 750,
-        "z": "fb45f2fd.f3f61",
+        "x": 1412.8833312988281,
+        "y": 764,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "e8efcfa.5f73cb",
+        "id": "b8f288cf.803b8",
         "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": 1342,
-        "y": 802,
-        "z": "fb45f2fd.f3f61",
+        "x": 1413.8833312988281,
+        "y": 816,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "5bc7dc0.190fca4",
+        "id": "bf82e982.34914",
         "type": "set",
         "name": "unset tmp.aai.all-connectivities",
         "xml": "<set>\n<parameter name='tmp.aai.all-connectivities.' value=\"\" />\n",
         "comments": "",
-        "x": 991,
-        "y": 100,
-        "z": "fb45f2fd.f3f61",
+        "x": 1062.8833312988281,
+        "y": 114,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "287c8e9d.ecd2da",
+        "id": "9f305e4b.2c08a8",
         "type": "set",
         "name": "unset middle-man-conn",
         "xml": "<set>\n<parameter name='middle-man-conn.' value='' />\n",
         "comments": "",
-        "x": 957,
-        "y": 64,
-        "z": "fb45f2fd.f3f61",
+        "x": 1028.8833312988281,
+        "y": 78,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "5330b6b3.3bf2d8",
+        "id": "1eb5be31.ea0af2",
         "type": "record",
         "name": "record tmp.pce-src and dst node",
         "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=\"Path computation succeed!\"/>-->\n<!--<parameter name=\"field2\" value=\"`$ccsdkTopo.resp.solutions_length`\"/>-->\n\n<!--<parameter name=\"field1\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"field2\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"field1\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"field2\" value=\"`$tmp.pce-dst-node`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1602,
-        "y": 2084,
-        "z": "fb45f2fd.f3f61",
+        "x": 1673.8833312988281,
+        "y": 2098,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "aa0b4226.979d68",
+        "id": "5bc64c01.f1d944",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamebb`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1566,
-        "y": 2165,
-        "z": "fb45f2fd.f3f61",
+        "x": 1637.8833312988281,
+        "y": 2179,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "1778233a.2c990d",
+        "id": "92b81e5e.75b818",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamebb' value=\"`$param-prefix-uni-pnfName[8]`\" />",
         "comments": "",
-        "x": 1535,
-        "y": 2125,
-        "z": "fb45f2fd.f3f61",
+        "x": 1606.8833312988281,
+        "y": 2139,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "abd234d.58ac848",
+        "id": "380d57d7.fea4b",
         "type": "switchNode",
         "name": "switch found-middle-man",
         "xml": "<switch test=\"`$found-middle-man`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 188,
-        "y": 911,
-        "z": "fb45f2fd.f3f61",
+        "x": 259.8833312988281,
+        "y": 925,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "1e2b2b53.734fe5",
-                "4e1ac306.8f9a04"
+                "d4fb18fc.5f1838",
+                "f8995511.35102"
             ]
         ]
     },
     {
-        "id": "4e1ac306.8f9a04",
+        "id": "f8995511.35102",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 394,
-        "y": 889,
-        "z": "fb45f2fd.f3f61",
+        "x": 465.8833312988281,
+        "y": 903,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "504b4dff.3f7944"
+                "2b130822.bbaac8"
             ]
         ]
     },
     {
-        "id": "1e2b2b53.734fe5",
+        "id": "d4fb18fc.5f1838",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 392,
-        "y": 944,
-        "z": "fb45f2fd.f3f61",
+        "x": 463.8833312988281,
+        "y": 958,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "e852f499.d7d47"
+                "d3e727a3.fb5608"
             ]
         ]
     },
     {
-        "id": "504b4dff.3f7944",
+        "id": "2b130822.bbaac8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 549,
-        "y": 888,
-        "z": "fb45f2fd.f3f61",
+        "x": 620.8833312988281,
+        "y": 902,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "e852f499.d7d47",
+        "id": "d3e727a3.fb5608",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 544,
-        "y": 944,
-        "z": "fb45f2fd.f3f61",
+        "x": 615.8833312988281,
+        "y": 958,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "95ae8b1f.95bdf"
+                "bc564ff1.6fc448",
+                "26e6024f.524ade"
             ]
         ]
     },
     {
-        "id": "95ae8b1f.95bdf",
+        "id": "bc564ff1.6fc448",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='mmridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 756,
-        "y": 947,
-        "z": "fb45f2fd.f3f61",
+        "x": 820.88330078125,
+        "y": 933,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "6ca655d7.32b94c",
-                "71946c21.27e46c"
+                "b40c41cb.477e98",
+                "98b45503.cbd6b"
             ]
         ]
     },
     {
-        "id": "71946c21.27e46c",
+        "id": "98b45503.cbd6b",
         "type": "set",
         "name": "unset tmp.aai.mmrconnectivity",
         "xml": "<set>\n<parameter name='tmp.aai.mmrconnectivity.' value='' />\n",
         "comments": "",
-        "x": 978,
-        "y": 903,
-        "z": "fb45f2fd.f3f61",
+        "x": 1049.8833312988281,
+        "y": 917,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "6ca655d7.32b94c",
+        "id": "b40c41cb.477e98",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$mmridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 962,
-        "y": 947,
-        "z": "fb45f2fd.f3f61",
+        "x": 1033.8833312988281,
+        "y": 961,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "89f1fe8.12eb2"
+                "9eec80ed.6cbdc8"
             ]
         ]
     },
     {
-        "id": "89f1fe8.12eb2",
+        "id": "9eec80ed.6cbdc8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1145.28564453125,
-        "y": 946.82177734375,
-        "z": "fb45f2fd.f3f61",
+        "x": 1217.1689758300781,
+        "y": 960.82177734375,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "c43f8d7b.42f328"
+                "ce382b36.485b4"
             ]
         ]
     },
     {
-        "id": "c43f8d7b.42f328",
+        "id": "ce382b36.485b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 173,
-        "y": 1052,
-        "z": "fb45f2fd.f3f61",
+        "x": 244.88333129882812,
+        "y": 1066,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "c356b2d1.473de"
+                "46c63945.972b4"
             ]
         ]
     },
     {
-        "id": "c356b2d1.473de",
+        "id": "46c63945.972b4",
         "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[$mmridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.mmrconnectivity\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 380,
-        "y": 1052,
-        "z": "fb45f2fd.f3f61",
+        "x": 451.8833312988281,
+        "y": 1066,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "7d3aad12.e7729c",
-                "445bc622.878b58",
-                "a630aaa4.2b5c1"
+                "de8e8eee.d3dd18",
+                "50fa2e7f.3ee61",
+                "680182f7.2b7684"
             ]
         ]
     },
     {
-        "id": "7d3aad12.e7729c",
+        "id": "de8e8eee.d3dd18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 601,
-        "y": 1025,
-        "z": "fb45f2fd.f3f61",
+        "x": 672.8833312988281,
+        "y": 1039,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "29193430.648e5c"
+                "d92dcdc3.4a7f2"
             ]
         ]
     },
     {
-        "id": "57eaf357.b6c024",
+        "id": "f3bd00d1.eaecd",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 755,
-        "y": 1106,
-        "z": "fb45f2fd.f3f61",
+        "x": 826.8833312988281,
+        "y": 1120,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "e9fd4655.c826d",
+        "id": "9ce9cbd5.62a98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 751.0623779296875,
-        "y": 1061.8597717285156,
-        "z": "fb45f2fd.f3f61",
+        "x": 822.9457092285156,
+        "y": 1075.8597717285156,
+        "z": "17ebb490.e5413b",
         "wires": []
     },
     {
-        "id": "445bc622.878b58",
+        "id": "50fa2e7f.3ee61",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 588.490966796875,
-        "y": 1061.5740356445312,
-        "z": "fb45f2fd.f3f61",
+        "x": 660.3742980957031,
+        "y": 1075.5740356445312,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "e9fd4655.c826d"
+                "9ce9cbd5.62a98"
             ]
         ]
     },
     {
-        "id": "a630aaa4.2b5c1",
+        "id": "680182f7.2b7684",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 586,
-        "y": 1105,
-        "z": "fb45f2fd.f3f61",
+        "x": 657.8833312988281,
+        "y": 1119,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "57eaf357.b6c024"
+                "f3bd00d1.eaecd"
             ]
         ]
     },
     {
-        "id": "29193430.648e5c",
+        "id": "d92dcdc3.4a7f2",
         "type": "switchNode",
         "name": "switch mmrconn type is LEAF",
         "xml": "<switch test=\"`$tmp.aai.mmrconnectivity.vpn-type == 'leaf' `\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 829,
-        "y": 1019,
-        "z": "fb45f2fd.f3f61",
+        "x": 900.8833312988281,
+        "y": 1033,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "152b411b.34753f",
-                "c764b7cf.a07508"
+                "2e362251.21075e",
+                "e383a8c2.7dacf8"
             ]
         ]
     },
     {
-        "id": "c764b7cf.a07508",
+        "id": "e383a8c2.7dacf8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1035,
-        "y": 997,
-        "z": "fb45f2fd.f3f61",
+        "x": 1106.8833312988281,
+        "y": 1011,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "758dd9de.5cdc2"
+                "6609acc9.62773c"
             ]
         ]
     },
     {
-        "id": "152b411b.34753f",
+        "id": "2e362251.21075e",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1033,
-        "y": 1052,
-        "z": "fb45f2fd.f3f61",
+        "x": 1104.8833312988281,
+        "y": 1066,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "eb586f24.4ec9a"
+                "3dcdf3fe.a74594"
             ]
         ]
     },
     {
-        "id": "758dd9de.5cdc2",
+        "id": "6609acc9.62773c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1190,
-        "y": 996,
-        "z": "fb45f2fd.f3f61",
+        "x": 1261.8833312988281,
+        "y": 1010,
+        "z": "17ebb490.e5413b",
         "wires": [
             []
         ]
     },
     {
-        "id": "eb586f24.4ec9a",
+        "id": "3dcdf3fe.a74594",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1185,
-        "y": 1052,
-        "z": "fb45f2fd.f3f61",
+        "x": 1256.8833312988281,
+        "y": 1066,
+        "z": "17ebb490.e5413b",
         "wires": [
             [
-                "d5e8e6d4.6174b"
+                "b34ecdaf.e57d9"
             ]
         ]
+    },
+    {
+        "id": "26e6024f.524ade",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 779,
+        "y": 978,
+        "z": "17ebb490.e5413b",
+        "wires": []
+    },
+    {
+        "id": "94ffeddc.43efb",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 1587,
+        "y": 2241,
+        "z": "17ebb490.e5413b",
+        "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-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 ad56b544..2e4b6b66 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": "d60c3cf9.321a6",
+    "id": "781e35fa.f2e1d4",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 205.88333129882812,
-    "y": 156.88333129882812,
-    "z": "7062000.f761",
+    "x": 173.88333129882812,
+    "y": 149.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cce5e3d9.59223"
+        "9e11530a.17bcb"
       ]
     ]
   },
   {
-    "id": "cce5e3d9.59223",
+    "id": "9e11530a.17bcb",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,7912 +22,8076 @@
     "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": 490.1690216064453,
-    "y": 218.12143993377686,
-    "z": "7062000.f761",
+    "x": 458.1690216064453,
+    "y": 211.12143993377686,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "73cbe8fd.7b7b"
+        "2b94c108.46c67e"
       ]
     ]
   },
   {
-    "id": "73cbe8fd.7b7b",
+    "id": "2b94c108.46c67e",
     "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": 496.3119354248047,
-    "y": 302.88336181640625,
-    "z": "7062000.f761",
+    "x": 464.3119354248047,
+    "y": 295.88336181640625,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b5475b4e.9dc8a"
+        "fc45d9d.aa25928"
       ]
     ]
   },
   {
-    "id": "b5475b4e.9dc8a",
+    "id": "fc45d9d.aa25928",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 845.8833312988281,
-    "y": 361.8833312988281,
-    "z": "7062000.f761",
+    "x": 813.8833312988281,
+    "y": 354.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "bacceb8f.95926",
-        "e0024e9e.57e7f8",
-        "6d19a9bc.4fa958"
+        "5f20119b.1c25f",
+        "440015de.6e018c",
+        "7415bdce.bb1424"
       ]
     ]
   },
   {
-    "id": "bacceb8f.95926",
+    "id": "5f20119b.1c25f",
     "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": 1147.2168273925781,
-    "y": 632.8136291503906,
-    "z": "7062000.f761",
+    "x": 1115.2168273925781,
+    "y": 625.8136291503906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e0024e9e.57e7f8",
+    "id": "440015de.6e018c",
     "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": 1168.6452941894531,
-    "y": 335.2166442871094,
-    "z": "7062000.f761",
+    "x": 1136.6452941894531,
+    "y": 328.2166442871094,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "dc9a92d7.7dd0c",
-        "68404646.133ac8",
-        "f6dee010.98fcd"
+        "12c8110b.ec9bd7",
+        "bbd39d34.8832e",
+        "23fc32e8.f22086"
       ]
     ]
   },
   {
-    "id": "dc9a92d7.7dd0c",
+    "id": "12c8110b.ec9bd7",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1393.6452941894531,
-    "y": 193.21664428710938,
-    "z": "7062000.f761",
+    "x": 1361.6452941894531,
+    "y": 186.21664428710938,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d1be34ef.26139"
+        "61f16e51.c24158"
       ]
     ]
   },
   {
-    "id": "68404646.133ac8",
+    "id": "bbd39d34.8832e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1389.1362609863281,
-    "y": 262.7906799316406,
-    "z": "7062000.f761",
+    "x": 1357.1362609863281,
+    "y": 255.79067993164062,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c39ebb83.790b68"
+        "47248fa2.17d9d"
       ]
     ]
   },
   {
-    "id": "f6dee010.98fcd",
+    "id": "23fc32e8.f22086",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1377.6452941894531,
-    "y": 309.2166442871094,
-    "z": "7062000.f761",
+    "x": 1345.6452941894531,
+    "y": 302.2166442871094,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f8b91686.4a47a8"
+        "cdbbe291.f3553"
       ]
     ]
   },
   {
-    "id": "6c16fe1b.61251",
+    "id": "493ce64.5d5d418",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1147.6452941894531,
-    "y": 223.21664428710938,
-    "z": "7062000.f761",
+    "x": 1115.6452941894531,
+    "y": 216.21664428710938,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6d19a9bc.4fa958",
+    "id": "7415bdce.bb1424",
     "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": 1135.6452941894531,
-    "y": 275.2166442871094,
-    "z": "7062000.f761",
+    "x": 1103.6452941894531,
+    "y": 268.2166442871094,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "d1be34ef.26139",
+    "id": "61f16e51.c24158",
     "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": 1633.8833312988281,
-    "y": 189.88333129882812,
-    "z": "7062000.f761",
+    "x": 1601.8833312988281,
+    "y": 182.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "74daedf5.b00d34",
-        "3ddd8ea0.9d48e2"
+        "58e97c67.87accc",
+        "d2e64d43.49ac68"
       ]
     ]
   },
   {
-    "id": "c39ebb83.790b68",
+    "id": "47248fa2.17d9d",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 1543.9457092285156,
-    "y": 265.74310302734375,
-    "z": "7062000.f761",
+    "x": 1511.9457092285156,
+    "y": 258.74310302734375,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f8b91686.4a47a8",
+    "id": "cdbbe291.f3553",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1547.8833312988281,
-    "y": 309.8833312988281,
-    "z": "7062000.f761",
+    "x": 1515.8833312988281,
+    "y": 302.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "74daedf5.b00d34",
+    "id": "58e97c67.87accc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1838.8833312988281,
-    "y": 226.88333129882812,
-    "z": "7062000.f761",
+    "x": 1806.8833312988281,
+    "y": 219.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "50897ba7.acdc24"
+        "c54a8c68.c345e"
       ]
     ]
   },
   {
-    "id": "3ddd8ea0.9d48e2",
+    "id": "d2e64d43.49ac68",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1848.8833312988281,
-    "y": 153.88333129882812,
-    "z": "7062000.f761",
+    "x": 1816.8833312988281,
+    "y": 146.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "50897ba7.acdc24",
+    "id": "c54a8c68.c345e",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1831.8833312988281,
-    "y": 301.8833312988281,
-    "z": "7062000.f761",
+    "x": 1799.8833312988281,
+    "y": 294.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "25219f6c.9cf818",
-        "166df7f7.8cb52",
-        "35f1defb.605572",
-        "f67d2f30.77ecd8",
-        "2530e84c.0abb78"
+        "27adf24c.af1566",
+        "31a766ce.e0455a",
+        "7436fd76.690054",
+        "2b9d3039.23a428",
+        "2f2ed9c0.e0663e"
       ]
     ]
   },
   {
-    "id": "e3fc1b13.141158",
+    "id": "d2a449e8.f07b58",
     "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": 2317.883331298828,
-    "y": 352.8833312988281,
-    "z": "7062000.f761",
+    "x": 2285.883331298828,
+    "y": 345.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "792e0cb6.295efc",
-        "9cda4258.33c028",
-        "8ec312be.acb358"
+        "41c867c6.b55cd8",
+        "84c1b468.c04558",
+        "621effb3.a9e918"
       ]
     ]
   },
   {
-    "id": "792e0cb6.295efc",
+    "id": "41c867c6.b55cd8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2533.883331298828,
-    "y": 419.8833312988281,
-    "z": "7062000.f761",
+    "x": 2501.883331298828,
+    "y": 412.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d2a1ae9f.45e878"
+        "821dc5ef.6d3aa8"
       ]
     ]
   },
   {
-    "id": "9cda4258.33c028",
+    "id": "84c1b468.c04558",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2534.374298095703,
-    "y": 319.4573059082031,
-    "z": "7062000.f761",
+    "x": 2502.374298095703,
+    "y": 312.4573059082031,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5f00fc5b.612da4"
+        "4a81091b.110a38"
       ]
     ]
   },
   {
-    "id": "8ec312be.acb358",
+    "id": "621effb3.a9e918",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2529.883331298828,
-    "y": 368.8833312988281,
-    "z": "7062000.f761",
+    "x": 2497.883331298828,
+    "y": 361.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "24485e5a.4004d2"
+        "6269ae05.e67ee8"
       ]
     ]
   },
   {
-    "id": "25219f6c.9cf818",
+    "id": "27adf24c.af1566",
     "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": 2034.8833312988281,
-    "y": 333.8833312988281,
-    "z": "7062000.f761",
+    "x": 2002.8833312988281,
+    "y": 326.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e97f59ea.8d55",
-        "e3fc1b13.141158",
-        "dca67cc5.30d2f8",
-        "ce64f5e6.94469"
+        "2c28c5a4.c9fc4a",
+        "d2a449e8.f07b58",
+        "42097510.f58b64",
+        "7a55e6a1.70e4b"
       ]
     ]
   },
   {
-    "id": "e97f59ea.8d55",
+    "id": "2c28c5a4.c9fc4a",
     "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": 2314.883331298828,
-    "y": 271.8833312988281,
-    "z": "7062000.f761",
+    "x": 2282.883331298828,
+    "y": 264.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f67d2f30.77ecd8",
+    "id": "2b9d3039.23a428",
     "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": 2008.8833312988281,
-    "y": 283.8833312988281,
-    "z": "7062000.f761",
+    "x": 1976.8833312988281,
+    "y": 276.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "166df7f7.8cb52",
+    "id": "31a766ce.e0455a",
     "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": 2051.883331298828,
-    "y": 142.88333129882812,
-    "z": "7062000.f761",
+    "x": 2019.8833312988281,
+    "y": 135.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "35f1defb.605572",
+    "id": "7436fd76.690054",
     "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": 2063.883331298828,
-    "y": 183.88333129882812,
-    "z": "7062000.f761",
+    "x": 2031.8833312988281,
+    "y": 176.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "2302212a.18d7a6",
+    "id": "e57021b1.8566f8",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2088.883331298828,
-    "y": 95.88333129882812,
-    "z": "7062000.f761",
+    "x": 2056.883331298828,
+    "y": 88.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "67aae728.5fece",
+    "id": "f75cee20.f52e5",
     "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": 2008.8833312988281,
-    "y": 229.88333129882812,
-    "z": "7062000.f761",
+    "x": 1976.8833312988281,
+    "y": 222.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5f00fc5b.612da4",
+    "id": "4a81091b.110a38",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 2712.883331298828,
-    "y": 321.8833312988281,
-    "z": "7062000.f761",
+    "x": 2680.883331298828,
+    "y": 314.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "24485e5a.4004d2",
+    "id": "6269ae05.e67ee8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2712.820831298828,
-    "y": 371.0235900878906,
-    "z": "7062000.f761",
+    "x": 2680.820831298828,
+    "y": 364.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d2a1ae9f.45e878",
+    "id": "821dc5ef.6d3aa8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2714.820831298828,
-    "y": 422.0235900878906,
-    "z": "7062000.f761",
+    "x": 2682.820831298828,
+    "y": 415.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "61c50290.a54bf4"
+        "2337e3a2.faa61c"
       ]
     ]
   },
   {
-    "id": "61c50290.a54bf4",
+    "id": "2337e3a2.faa61c",
     "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": 3007.820831298828,
-    "y": 369.0235900878906,
-    "z": "7062000.f761",
+    "x": 2975.820831298828,
+    "y": 362.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d79412d7.a6c38",
-        "3f6fbc64.721af4",
-        "a6250e3f.f36fa"
+        "cccd155c.90e07",
+        "b9a7ac6e.7fea5",
+        "73057b22.08e1dc"
       ]
     ]
   },
   {
-    "id": "3f6fbc64.721af4",
+    "id": "b9a7ac6e.7fea5",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3281.311798095703,
-    "y": 261.5975646972656,
-    "z": "7062000.f761",
+    "x": 3249.311798095703,
+    "y": 254.59756469726562,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "16afc6a3.6b5401"
+        "e5cee345.1eaae"
       ]
     ]
   },
   {
-    "id": "16afc6a3.6b5401",
+    "id": "e5cee345.1eaae",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3458.883331298828,
-    "y": 261.8833312988281,
-    "z": "7062000.f761",
+    "x": 3426.883331298828,
+    "y": 254.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a6250e3f.f36fa",
+    "id": "73057b22.08e1dc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3276.820831298828,
-    "y": 311.0235900878906,
-    "z": "7062000.f761",
+    "x": 3244.820831298828,
+    "y": 304.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5cebea40.e205d4"
+        "f16a75f9.e23598"
       ]
     ]
   },
   {
-    "id": "5cebea40.e205d4",
+    "id": "f16a75f9.e23598",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3458.820831298828,
-    "y": 311.0235900878906,
-    "z": "7062000.f761",
+    "x": 3426.820831298828,
+    "y": 304.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d79412d7.a6c38",
+    "id": "cccd155c.90e07",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3280.820831298828,
-    "y": 362.0235900878906,
-    "z": "7062000.f761",
+    "x": 3248.820831298828,
+    "y": 355.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9ae7a072.d1e518"
+        "e05a51c3.eb7208"
       ]
     ]
   },
   {
-    "id": "9ae7a072.d1e518",
+    "id": "e05a51c3.eb7208",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3460.820831298828,
-    "y": 362.0235900878906,
-    "z": "7062000.f761",
+    "x": 3428.820831298828,
+    "y": 355.0235900878906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "360b8115.051b46"
+        "a185fcaa.c01b7"
       ]
     ]
   },
   {
-    "id": "360b8115.051b46",
+    "id": "a185fcaa.c01b7",
     "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": 3026.883331298828,
-    "y": 496.8833312988281,
-    "z": "7062000.f761",
+    "x": 2994.883331298828,
+    "y": 489.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "28ab4f33.316c8",
-        "e49a7d12.f127b"
+        "64dc3552.29da24",
+        "1cf4e379.2b6355"
       ]
     ]
   },
   {
-    "id": "e49a7d12.f127b",
+    "id": "1cf4e379.2b6355",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3336.883331298828,
-    "y": 503.8833312988281,
-    "z": "7062000.f761",
+    "x": 3304.883331298828,
+    "y": 496.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "28ab4f33.316c8",
+    "id": "64dc3552.29da24",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3335.883331298828,
-    "y": 557.8833312988281,
-    "z": "7062000.f761",
+    "x": 3303.883331298828,
+    "y": 550.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "32ff3e84.f9f78a"
+        "49cf9d82.f3816c"
       ]
     ]
   },
   {
-    "id": "ac20a1c4.b5d88",
+    "id": "61811a9.92ccce4",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.883331298828,
-    "y": 511.8833312988281,
-    "z": "7062000.f761",
+    "x": 4048.883331298828,
+    "y": 504.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "eb5b39ae.c0eb7"
+        "5422df0.13119a"
       ]
     ]
   },
   {
-    "id": "eb5b39ae.c0eb7",
+    "id": "5422df0.13119a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4257.883209228516,
-    "y": 504.8832092285156,
-    "z": "7062000.f761",
+    "x": 4225.883209228516,
+    "y": 497.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c3ea0a96.012838",
-        "42443b39.66d044"
+        "cc385253.b8fbd",
+        "2cd49ffd.326448"
       ]
     ]
   },
   {
-    "id": "32ff3e84.f9f78a",
+    "id": "49cf9d82.f3816c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3499.883331298828,
-    "y": 483.8833312988281,
-    "z": "7062000.f761",
+    "x": 3467.883331298828,
+    "y": 476.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6034bf74.a356a8",
-        "cf462c55.82"
+        "f69edc6a.996158",
+        "7412251.16d085c"
       ]
     ]
   },
   {
-    "id": "6034bf74.a356a8",
+    "id": "f69edc6a.996158",
     "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": 3780.883331298828,
-    "y": 439.8833312988281,
-    "z": "7062000.f761",
+    "x": 3748.883331298828,
+    "y": 432.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6ceb7138.15694"
+        "ed2a485c.4e373"
       ]
     ]
   },
   {
-    "id": "6ceb7138.15694",
+    "id": "ed2a485c.4e373",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.883331298828,
-    "y": 439.8833312988281,
-    "z": "7062000.f761",
+    "x": 4010.883331298828,
+    "y": 432.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ac20a1c4.b5d88"
+        "61811a9.92ccce4"
       ]
     ]
   },
   {
-    "id": "c3ea0a96.012838",
+    "id": "cc385253.b8fbd",
     "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": 4500.883209228516,
-    "y": 461.8832092285156,
-    "z": "7062000.f761",
+    "x": 4468.883209228516,
+    "y": 454.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "42443b39.66d044",
+    "id": "2cd49ffd.326448",
     "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": 4489.883209228516,
-    "y": 516.8832092285156,
-    "z": "7062000.f761",
+    "x": 4457.883209228516,
+    "y": 509.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cb5892f8.a134a",
-        "3110dc42.56e8b4",
-        "b948b2e1.478978"
+        "9972e623.c70578",
+        "34812087.cb8a98",
+        "1b373493.bb5393"
       ]
     ]
   },
   {
-    "id": "b948b2e1.478978",
+    "id": "1b373493.bb5393",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4742.883331298828,
-    "y": 402.8833312988281,
-    "z": "7062000.f761",
+    "x": 4710.883331298828,
+    "y": 395.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f1bf9a6a.1a4ef8"
+        "f7f40cf5.3f9508"
       ]
     ]
   },
   {
-    "id": "f1bf9a6a.1a4ef8",
+    "id": "f7f40cf5.3f9508",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4891.454864501953,
-    "y": 403.1690979003906,
-    "z": "7062000.f761",
+    "x": 4859.454864501953,
+    "y": 396.1690979003906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e719bcf6.a15758",
+    "id": "a22797f6.37b0d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4890.392364501953,
-    "y": 447.3093566894531,
-    "z": "7062000.f761",
+    "x": 4858.392364501953,
+    "y": 440.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3110dc42.56e8b4",
+    "id": "34812087.cb8a98",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4731.392364501953,
-    "y": 447.3093566894531,
-    "z": "7062000.f761",
+    "x": 4699.392364501953,
+    "y": 440.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e719bcf6.a15758"
+        "a22797f6.37b0d8"
       ]
     ]
   },
   {
-    "id": "cb5892f8.a134a",
+    "id": "9972e623.c70578",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4738.392364501953,
-    "y": 526.3093566894531,
-    "z": "7062000.f761",
+    "x": 4706.392364501953,
+    "y": 519.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f905d5a0.4b001"
+        "2ecc1ca4.45238c"
       ]
     ]
   },
   {
-    "id": "f905d5a0.4b001",
+    "id": "2ecc1ca4.45238c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4877.392364501953,
-    "y": 526.3093566894531,
-    "z": "7062000.f761",
+    "x": 4845.392364501953,
+    "y": 519.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "abc9ac08.900428",
-        "808b62f7.887bc"
+        "4189f313.1a9cd4",
+        "b78697ee.5ce55"
       ]
     ]
   },
   {
-    "id": "abc9ac08.900428",
+    "id": "4189f313.1a9cd4",
     "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": 5082.883331298828,
-    "y": 523.8833312988281,
-    "z": "7062000.f761",
+    "x": 5050.883331298828,
+    "y": 516.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "808b62f7.887bc",
+    "id": "b78697ee.5ce55",
     "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": 5081.883331298828,
-    "y": 569.8833312988281,
-    "z": "7062000.f761",
+    "x": 5049.883331298828,
+    "y": 562.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "cf462c55.82",
+    "id": "7412251.16d085c",
     "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": 3597.883331298828,
-    "y": 555.8833312988281,
-    "z": "7062000.f761",
+    "x": 3565.883331298828,
+    "y": 548.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d512c83a.b4f08"
+        "6604e9c7.0c6c6"
       ]
     ]
   },
   {
-    "id": "d512c83a.b4f08",
+    "id": "6604e9c7.0c6c6",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3877.883331298828,
-    "y": 555.8833312988281,
-    "z": "7062000.f761",
+    "x": 3845.883331298828,
+    "y": 548.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7f3fc2f9.da6f6c"
+        "85f44348.40e85"
       ]
     ]
   },
   {
-    "id": "7f3fc2f9.da6f6c",
+    "id": "85f44348.40e85",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2290.8834533691406,
-    "y": 808.8834533691406,
-    "z": "7062000.f761",
+    "x": 2258.8834533691406,
+    "y": 801.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c5194935.bd2228"
+        "4b9c1fcb.91dc9"
       ]
     ]
   },
   {
-    "id": "c5194935.bd2228",
+    "id": "4b9c1fcb.91dc9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2467.883331298828,
-    "y": 801.8833312988281,
-    "z": "7062000.f761",
+    "x": 2435.883331298828,
+    "y": 794.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d3179b9f.9873a8",
-        "b976f3f3.6f7998"
+        "27f44efc.6f6d32",
+        "c7edfd64.b3753"
       ]
     ]
   },
   {
-    "id": "d3179b9f.9873a8",
+    "id": "27f44efc.6f6d32",
     "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": 2710.883331298828,
-    "y": 758.8833312988281,
-    "z": "7062000.f761",
+    "x": 2678.883331298828,
+    "y": 751.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b976f3f3.6f7998",
+    "id": "c7edfd64.b3753",
     "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": 2699.883331298828,
-    "y": 813.8833312988281,
-    "z": "7062000.f761",
+    "x": 2667.883331298828,
+    "y": 806.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "78ac5925.ecf5a8",
-        "b7b22856.252df8",
-        "ac6d9ce2.b2e9e"
+        "24ace19f.75b966",
+        "ac0fada7.2237a",
+        "7d46d2c9.4b5f9c"
       ]
     ]
   },
   {
-    "id": "78ac5925.ecf5a8",
+    "id": "24ace19f.75b966",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2991.374298095703,
-    "y": 792.4573059082031,
-    "z": "7062000.f761",
+    "x": 2959.374298095703,
+    "y": 785.4573059082031,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cd49934.02e89f"
+        "d7ebe78c.3ec37"
       ]
     ]
   },
   {
-    "id": "b7b22856.252df8",
+    "id": "ac0fada7.2237a",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2979.883331298828,
-    "y": 836.8833312988281,
-    "z": "7062000.f761",
+    "x": 2947.883331298828,
+    "y": 829.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ed06d18.02143b"
+        "77d529f.fb28458"
       ]
     ]
   },
   {
-    "id": "cd49934.02e89f",
+    "id": "d7ebe78c.3ec37",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3139.945831298828,
-    "y": 792.7430725097656,
-    "z": "7062000.f761",
+    "x": 3107.945831298828,
+    "y": 785.7430725097656,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "ed06d18.02143b",
+    "id": "77d529f.fb28458",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3138.883331298828,
-    "y": 836.8833312988281,
-    "z": "7062000.f761",
+    "x": 3106.883331298828,
+    "y": 829.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "ac6d9ce2.b2e9e",
+    "id": "7d46d2c9.4b5f9c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2986.883331298828,
-    "y": 915.8833312988281,
-    "z": "7062000.f761",
+    "x": 2954.883331298828,
+    "y": 908.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "87f4e9d.ba71598"
+        "265410a7.36ec88"
       ]
     ]
   },
   {
-    "id": "87f4e9d.ba71598",
+    "id": "265410a7.36ec88",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3125.883331298828,
-    "y": 915.8833312988281,
-    "z": "7062000.f761",
+    "x": 3093.883331298828,
+    "y": 908.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c2cb656b.4adff",
-        "148d0b0c.712fa5",
-        "d89221fb.e3072",
-        "ea9aeb3f.7f8c98",
-        "11e605d7.ecd0fa",
-        "104f2b87.41fe14",
-        "1a00d4a4.ff98a3",
-        "59b35d49.e5c194",
-        "52e7c1a.b628dc",
-        "cdada9b0.2f3a48",
-        "850e2800.badf2",
-        "2b1064a0.eade7c",
-        "a5bcbd5b.23b83",
-        "23879b91.f9cdd4"
+        "98c1de20.9fd92",
+        "22cf748c.dba294",
+        "6d145189.478b8",
+        "8cce98e.0c8f3e8",
+        "d4009f69.0bc89",
+        "9190bf27.d61b08",
+        "1fa44b37.7a7c65",
+        "1ebd0160.929687",
+        "f7e98987.293918",
+        "6b01ec04.e8e8dc",
+        "ce90c6ec.193398",
+        "323cec2c.88d45c",
+        "fba2883c.72d2",
+        "abd6e7f0.9745e8"
       ]
     ]
   },
   {
-    "id": "f8061145.abbc7",
+    "id": "ec511c6.7493e6",
     "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": 3439.883331298828,
-    "y": 721.8833312988281,
-    "z": "7062000.f761",
+    "x": 3407.883331298828,
+    "y": 714.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "c2cb656b.4adff",
+    "id": "98c1de20.9fd92",
     "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": 3420.883331298828,
-    "y": 771.8833312988281,
-    "z": "7062000.f761",
+    "x": 3388.883331298828,
+    "y": 764.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "23879b91.f9cdd4",
+    "id": "abd6e7f0.9745e8",
     "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": 3377.883331298828,
-    "y": 816.8833312988281,
-    "z": "7062000.f761",
+    "x": 3345.883331298828,
+    "y": 809.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "148d0b0c.712fa5",
+    "id": "22cf748c.dba294",
     "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": 3352.883331298828,
-    "y": 879.8833312988281,
-    "z": "7062000.f761",
+    "x": 3320.883331298828,
+    "y": 872.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d89221fb.e3072",
+    "id": "6d145189.478b8",
     "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": 3353.883331298828,
-    "y": 934.8833312988281,
-    "z": "7062000.f761",
+    "x": 3321.883331298828,
+    "y": 927.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "ea9aeb3f.7f8c98",
+    "id": "8cce98e.0c8f3e8",
     "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": 3369.883331298828,
-    "y": 982.8833312988281,
-    "z": "7062000.f761",
+    "x": 3337.883331298828,
+    "y": 975.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "842b0094.75a4a",
-        "7eb2f3df.e44f04",
-        "b07921bb.e3808"
+        "909d17c4.8ebc6",
+        "f19af18e.9ab1b8",
+        "7d20c22a.cc52a4"
       ]
     ]
   },
   {
-    "id": "11e605d7.ecd0fa",
+    "id": "d4009f69.0bc89",
     "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": 3358.883331298828,
-    "y": 1069.8832092285156,
-    "z": "7062000.f761",
+    "x": 3326.883331298828,
+    "y": 1062.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2d5fb508.bfab52",
-        "cb29efc.c6f4b1",
-        "61b86bd0.897d5c"
+        "9444273f.3b6308",
+        "2c5b38f8.57c148",
+        "b9db8112.11ed58"
       ]
     ]
   },
   {
-    "id": "842b0094.75a4a",
+    "id": "909d17c4.8ebc6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3570.883331298828,
-    "y": 866.8833312988281,
-    "z": "7062000.f761",
+    "x": 3538.883331298828,
+    "y": 859.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "20684afd.b6d766"
+        "c14b1c12.22174"
       ]
     ]
   },
   {
-    "id": "7eb2f3df.e44f04",
+    "id": "f19af18e.9ab1b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3566.392364501953,
-    "y": 916.3093566894531,
-    "z": "7062000.f761",
+    "x": 3534.392364501953,
+    "y": 909.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d2041960.fe2c28"
+        "2b40f083.4de84"
       ]
     ]
   },
   {
-    "id": "b07921bb.e3808",
+    "id": "7d20c22a.cc52a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3570.392364501953,
-    "y": 969.3093566894531,
-    "z": "7062000.f761",
+    "x": 3538.392364501953,
+    "y": 962.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f96f84b2.606d"
+        "aaa35683.7d2c38"
       ]
     ]
   },
   {
-    "id": "20684afd.b6d766",
+    "id": "c14b1c12.22174",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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.454864501953,
-    "y": 866.1690979003906,
-    "z": "7062000.f761",
+    "x": 3687.454864501953,
+    "y": 859.1690979003906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d2041960.fe2c28",
+    "id": "2b40f083.4de84",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3709.392364501953,
-    "y": 916.3093566894531,
-    "z": "7062000.f761",
+    "x": 3677.392364501953,
+    "y": 909.3093566894531,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2d5fb508.bfab52",
+    "id": "9444273f.3b6308",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3581.883331298828,
-    "y": 1039.8832092285156,
-    "z": "7062000.f761",
+    "x": 3549.883331298828,
+    "y": 1032.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "96baba9a.d0e19"
+        "106ff1ef.63ffd6"
       ]
     ]
   },
   {
-    "id": "cb29efc.c6f4b1",
+    "id": "2c5b38f8.57c148",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3577.392364501953,
-    "y": 1089.3092346191406,
-    "z": "7062000.f761",
+    "x": 3545.392364501953,
+    "y": 1082.3092346191406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1fb34f72.484a51"
+        "ce83157c.4b6778"
       ]
     ]
   },
   {
-    "id": "61b86bd0.897d5c",
+    "id": "b9db8112.11ed58",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3578.392364501953,
-    "y": 1142.3092346191406,
-    "z": "7062000.f761",
+    "x": 3546.392364501953,
+    "y": 1135.3092346191406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "10c44aa8.1e2ead"
+        "a56ebadb.ee398"
       ]
     ]
   },
   {
-    "id": "96baba9a.d0e19",
+    "id": "106ff1ef.63ffd6",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3730.454864501953,
-    "y": 1039.1689758300781,
-    "z": "7062000.f761",
+    "x": 3698.454864501953,
+    "y": 1032.1689758300781,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1fb34f72.484a51",
+    "id": "ce83157c.4b6778",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3720.392364501953,
-    "y": 1089.3092346191406,
-    "z": "7062000.f761",
+    "x": 3688.392364501953,
+    "y": 1082.3092346191406,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f96f84b2.606d",
+    "id": "aaa35683.7d2c38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3731.883331298828,
-    "y": 968.8833312988281,
-    "z": "7062000.f761",
+    "x": 3699.883331298828,
+    "y": 961.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c276b776.1eb8a"
+        "bc98fef2.b2548"
       ]
     ]
   },
   {
-    "id": "10c44aa8.1e2ead",
+    "id": "a56ebadb.ee398",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3731.883331298828,
-    "y": 1141.8832092285156,
-    "z": "7062000.f761",
+    "x": 3699.883331298828,
+    "y": 1134.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "dfc4c0e1.407a7"
+        "80324f63.fa516"
       ]
     ]
   },
   {
-    "id": "c276b776.1eb8a",
+    "id": "bc98fef2.b2548",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3903.883331298828,
-    "y": 968.8833312988281,
-    "z": "7062000.f761",
+    "x": 3871.883331298828,
+    "y": 961.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "680276dd.9e09b8",
-        "fada4cff.fbd328"
+        "49900721.03dea8",
+        "7a97b419.9c3254"
       ]
     ]
   },
   {
-    "id": "dfc4c0e1.407a7",
+    "id": "80324f63.fa516",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3904.883331298828,
-    "y": 1141.8833312988281,
-    "z": "7062000.f761",
+    "x": 3872.883331298828,
+    "y": 1134.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1f020e0e.66975a",
-        "a14ce01a.56f21"
+        "9dd66c65.827358",
+        "1559fb7e.bddfc5"
       ]
     ]
   },
   {
-    "id": "680276dd.9e09b8",
+    "id": "49900721.03dea8",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4079.883331298828,
-    "y": 947.8833312988281,
-    "z": "7062000.f761",
+    "x": 4047.883331298828,
+    "y": 940.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2d74202a.0b02c"
+        "9c76efc2.c7f458"
       ]
     ]
   },
   {
-    "id": "fada4cff.fbd328",
+    "id": "7a97b419.9c3254",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4081.883331298828,
-    "y": 1001.8833312988281,
-    "z": "7062000.f761",
+    "x": 4049.883331298828,
+    "y": 994.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7e647400.994a6c"
+        "36b200ce.3626f"
       ]
     ]
   },
   {
-    "id": "1f020e0e.66975a",
+    "id": "9dd66c65.827358",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4080.883331298828,
-    "y": 1111.8833312988281,
-    "z": "7062000.f761",
+    "x": 4048.883331298828,
+    "y": 1104.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "45ecb3a3.4434cc"
+        "f7a8d104.b779c8"
       ]
     ]
   },
   {
-    "id": "a14ce01a.56f21",
+    "id": "1559fb7e.bddfc5",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4082.883331298828,
-    "y": 1165.8833312988281,
-    "z": "7062000.f761",
+    "x": 4050.883331298828,
+    "y": 1158.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c83b931a.caa288"
+        "2781339a.2c9d8c"
       ]
     ]
   },
   {
-    "id": "698ac3d0.bab4ec",
+    "id": "a64deb38.79c21",
     "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": 4389.883331298828,
-    "y": 899.8833312988281,
-    "z": "7062000.f761",
+    "x": 4357.883331298828,
+    "y": 892.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d12533f5.293ec",
+    "id": "d00069b9.08211",
     "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": 4382.883331298828,
-    "y": 997.8833312988281,
-    "z": "7062000.f761",
+    "x": 4350.883331298828,
+    "y": 990.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "cfe2458d.e53598",
+    "id": "e2a3248.b77d4d8",
     "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": 4382.883331298828,
-    "y": 1084.8833312988281,
-    "z": "7062000.f761",
+    "x": 4350.883331298828,
+    "y": 1077.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e0154f38.db2ba",
+    "id": "69fc971e.d1c948",
     "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": 4386.883331298828,
-    "y": 1177.8833312988281,
-    "z": "7062000.f761",
+    "x": 4354.883331298828,
+    "y": 1170.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "c5ef28c0.6623d",
+    "id": "79a28b11.e62b74",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3613.883331298828,
-    "y": 1586.8833312988281,
-    "z": "7062000.f761",
+    "x": 3581.883331298828,
+    "y": 1579.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cf149009.40de5"
+        "4a634c2c.1a75ec"
       ]
     ]
   },
   {
-    "id": "892e385b.99fcd8",
+    "id": "940be839.4c9f2",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3623.374298095703,
-    "y": 1629.4573669433594,
-    "z": "7062000.f761",
+    "x": 3591.374298095703,
+    "y": 1622.4573669433594,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fcd9fb7.509ae08"
+        "87a8481c.69d658"
       ]
     ]
   },
   {
-    "id": "a241b92b.410968",
+    "id": "a420af0c.05d778",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3611.883331298828,
-    "y": 1675.8833312988281,
-    "z": "7062000.f761",
+    "x": 3579.883331298828,
+    "y": 1668.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3987c181.ee8c26"
+        "2583b063.d99b38"
       ]
     ]
   },
   {
-    "id": "277d69d7.fb78d6",
+    "id": "2f08f142.24c856",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3313.883331298828,
-    "y": 1548.8833312988281,
-    "z": "7062000.f761",
+    "x": 3281.883331298828,
+    "y": 1541.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1a00d4a4.ff98a3",
+    "id": "1fa44b37.7a7c65",
     "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": 3356.883331298828,
-    "y": 1613.8833312988281,
-    "z": "7062000.f761",
+    "x": 3324.883331298828,
+    "y": 1606.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c5ef28c0.6623d",
-        "892e385b.99fcd8",
-        "a241b92b.410968"
+        "79a28b11.e62b74",
+        "940be839.4c9f2",
+        "a420af0c.05d778"
       ]
     ]
   },
   {
-    "id": "104f2b87.41fe14",
+    "id": "9190bf27.d61b08",
     "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": 3357.883331298828,
-    "y": 1283.8833312988281,
-    "z": "7062000.f761",
+    "x": 3325.883331298828,
+    "y": 1276.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a533cbf2.9ff568",
-        "84397dc4.6052e8"
+        "d3643022.187b08",
+        "f8e2bf22.0eeef"
       ]
     ]
   },
   {
-    "id": "84397dc4.6052e8",
+    "id": "f8e2bf22.0eeef",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.883331298828,
-    "y": 1269.8833312988281,
-    "z": "7062000.f761",
+    "x": 3548.883331298828,
+    "y": 1262.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a3186923.403f7"
+        "624eaece.91144"
       ]
     ]
   },
   {
-    "id": "a533cbf2.9ff568",
+    "id": "d3643022.187b08",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3582.883331298828,
-    "y": 1302.8833312988281,
-    "z": "7062000.f761",
+    "x": 3550.883331298828,
+    "y": 1295.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fb4a8c19.28b8c8"
+        "c2708361.dc58a8"
       ]
     ]
   },
   {
-    "id": "cf149009.40de5",
+    "id": "4a634c2c.1a75ec",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3786.549835205078,
-    "y": 1585.8833312988281,
-    "z": "7062000.f761",
+    "x": 3754.549835205078,
+    "y": 1578.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d71c8cc2.44ee38",
-        "eeee90c0.e5cea8"
+        "a3465897.dfb6c",
+        "6701a8e7.d232d8"
       ]
     ]
   },
   {
-    "id": "fcd9fb7.509ae08",
+    "id": "87a8481c.69d658",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3776.9457092285156,
-    "y": 1632.7431030273438,
-    "z": "7062000.f761",
+    "x": 3744.9457092285156,
+    "y": 1625.7431030273438,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3987c181.ee8c26",
+    "id": "2583b063.d99b38",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3780.883331298828,
-    "y": 1676.8833312988281,
-    "z": "7062000.f761",
+    "x": 3748.883331298828,
+    "y": 1669.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d71c8cc2.44ee38",
+    "id": "a3465897.dfb6c",
     "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": 4050.883331298828,
-    "y": 1569.8833312988281,
-    "z": "7062000.f761",
+    "x": 4018.883331298828,
+    "y": 1562.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "245c145e.ebe6e4",
-        "5de5cc75.c2e844"
+        "345ba8bf.bbff3",
+        "cd05726a.f82838"
       ]
     ]
   },
   {
-    "id": "5de5cc75.c2e844",
+    "id": "cd05726a.f82838",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4273.883331298828,
-    "y": 1524.8833312988281,
-    "z": "7062000.f761",
+    "x": 4241.883331298828,
+    "y": 1517.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a0f9be9b.313468"
+        "2d1297aa.955328"
       ]
     ]
   },
   {
-    "id": "245c145e.ebe6e4",
+    "id": "345ba8bf.bbff3",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4275.883331298828,
-    "y": 1588.8833312988281,
-    "z": "7062000.f761",
+    "x": 4243.883331298828,
+    "y": 1581.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "911806e7.142508"
+        "c1965743.4c3d48"
       ]
     ]
   },
   {
-    "id": "911806e7.142508",
+    "id": "c1965743.4c3d48",
     "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": 4437.883331298828,
-    "y": 1584.8833312988281,
-    "z": "7062000.f761",
+    "x": 4405.883331298828,
+    "y": 1577.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a0f9be9b.313468",
+    "id": "2d1297aa.955328",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4438.883331298828,
-    "y": 1521.8833312988281,
-    "z": "7062000.f761",
+    "x": 4406.883331298828,
+    "y": 1514.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e1f125c0.caa6f",
-        "a1eca114.4be78"
+        "2cdfacb5.3a35a4",
+        "3e9d9121.36c9d6"
       ]
     ]
   },
   {
-    "id": "d95b965d.c926c",
+    "id": "8deb3478.19bbc8",
     "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\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 4052.883331298828,
-    "y": 1728.8833312988281,
-    "z": "7062000.f761",
+    "x": 4020.883331298828,
+    "y": 1721.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "6b95fc34.5ad8b4",
+    "id": "97704f04.65be9",
     "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": 4097.883331298828,
-    "y": 1638.8833312988281,
-    "z": "7062000.f761",
+    "x": 4065.883331298828,
+    "y": 1631.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8335544a.4f7eb",
+    "id": "d3e16022.86087",
     "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": 4180.883331298828,
-    "y": 1776.8833312988281,
-    "z": "7062000.f761",
+    "x": 4148.883331298828,
+    "y": 1769.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "fb4a8c19.28b8c8",
+    "id": "c2708361.dc58a8",
     "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": 3725.883331298828,
-    "y": 1299.8833312988281,
-    "z": "7062000.f761",
+    "x": 3693.883331298828,
+    "y": 1292.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a3186923.403f7",
+    "id": "624eaece.91144",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3728.883331298828,
-    "y": 1262.8833312988281,
-    "z": "7062000.f761",
+    "x": 3696.883331298828,
+    "y": 1255.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "df51c615.6dea38",
-        "42564be7.1576fc"
+        "72c971d0.4048b8",
+        "afa94a20.a982b"
       ]
     ]
   },
   {
-    "id": "df51c615.6dea38",
+    "id": "72c971d0.4048b8",
     "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": 3902.883331298828,
-    "y": 1218.8833312988281,
-    "z": "7062000.f761",
+    "x": 3870.883331298828,
+    "y": 1211.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "eeee90c0.e5cea8",
+    "id": "6701a8e7.d232d8",
     "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": 4004.883331298828,
-    "y": 1853.8833312988281,
-    "z": "7062000.f761",
+    "x": 3972.883331298828,
+    "y": 1846.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1b697bac.74bf24"
+        "db5b6ad5.7610d"
       ]
     ]
   },
   {
-    "id": "1b697bac.74bf24",
+    "id": "db5b6ad5.7610d",
     "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": 4210.883331298828,
-    "y": 1853.8833312988281,
-    "z": "7062000.f761",
+    "x": 4178.883331298828,
+    "y": 1846.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fad81e7.f76f06"
+        "91f60d7.c7d4bf"
       ]
     ]
   },
   {
-    "id": "fad81e7.f76f06",
+    "id": "91f60d7.c7d4bf",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4426.168975830078,
-    "y": 1853.7051086425781,
-    "z": "7062000.f761",
+    "x": 4394.168975830078,
+    "y": 1846.7051086425781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f6db1963.f8cc08"
+        "f6e4c256.99ed68"
       ]
     ]
   },
   {
-    "id": "42564be7.1576fc",
+    "id": "afa94a20.a982b",
     "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": 3917.883331298828,
-    "y": 1329.8833312988281,
-    "z": "7062000.f761",
+    "x": 3885.883331298828,
+    "y": 1322.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3d26932b.7c3bc4",
-        "11ea41e8.6fef1e",
-        "60ff709f.49eb3"
+        "1979ced2.4d0299",
+        "9890a5f2.a73b18",
+        "d6c935ad.2c18"
       ]
     ]
   },
   {
-    "id": "3d26932b.7c3bc4",
+    "id": "1979ced2.4d0299",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4113.383453369141,
-    "y": 1281.8833312988281,
-    "z": "7062000.f761",
+    "x": 4081.3834533691406,
+    "y": 1274.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e66646fd.ae97a8"
+        "d4f7d32a.177f28"
       ]
     ]
   },
   {
-    "id": "11ea41e8.6fef1e",
+    "id": "9890a5f2.a73b18",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4105.383453369141,
-    "y": 1336.8833312988281,
-    "z": "7062000.f761",
+    "x": 4073.3834533691406,
+    "y": 1329.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6bc38e9e.a8f668"
+        "4c3f3b2.6283544"
       ]
     ]
   },
   {
-    "id": "60ff709f.49eb3",
+    "id": "d6c935ad.2c18",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4110.383453369141,
-    "y": 1393.8833312988281,
-    "z": "7062000.f761",
+    "x": 4078.3834533691406,
+    "y": 1386.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1b2700d2.65979f"
+        "13564645.a1e6da"
       ]
     ]
   },
   {
-    "id": "1b2700d2.65979f",
+    "id": "13564645.a1e6da",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4262.383453369141,
-    "y": 1394.8833312988281,
-    "z": "7062000.f761",
+    "x": 4230.383453369141,
+    "y": 1387.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6bc38e9e.a8f668",
+    "id": "4c3f3b2.6283544",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4273.383453369141,
-    "y": 1339.8833312988281,
-    "z": "7062000.f761",
+    "x": 4241.383453369141,
+    "y": 1332.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e66646fd.ae97a8",
+    "id": "d4f7d32a.177f28",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4257.765777587891,
-    "y": 1279.5390014648438,
-    "z": "7062000.f761",
+    "x": 4225.765777587891,
+    "y": 1272.5390014648438,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8c7c1f5.e4db1e"
+        "755f8d33.dd06bc"
       ]
     ]
   },
   {
-    "id": "8c7c1f5.e4db1e",
+    "id": "755f8d33.dd06bc",
     "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": 4441.883331298828,
-    "y": 1293.8833312988281,
-    "z": "7062000.f761",
+    "x": 4409.883331298828,
+    "y": 1286.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9be30f1d.25d3a8"
+        "910fe315.8317e8"
       ]
     ]
   },
   {
-    "id": "a1eca114.4be78",
+    "id": "3e9d9121.36c9d6",
     "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": 4608.883331298828,
-    "y": 1479.8833312988281,
-    "z": "7062000.f761",
+    "x": 4576.883331298828,
+    "y": 1472.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e1f125c0.caa6f",
+    "id": "2cdfacb5.3a35a4",
     "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": 4609.883331298828,
-    "y": 1587.8833312988281,
-    "z": "7062000.f761",
+    "x": 4577.883331298828,
+    "y": 1580.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b9cba76c.d9c1f8",
+    "id": "80df0a60.dec0f8",
     "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": 4610.883331298828,
-    "y": 1536.8833312988281,
-    "z": "7062000.f761",
+    "x": 4578.883331298828,
+    "y": 1529.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f6db1963.f8cc08",
+    "id": "f6e4c256.99ed68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4633.000518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 4601.000518798828,
+    "y": 1847.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7891783a.b17838",
-        "d094659a.049558",
-        "9c226fb0.3cc118"
+        "a4a05745.968c7",
+        "d1e00a0e.d2e56",
+        "d1a2356d.4786a8"
       ]
     ]
   },
   {
-    "id": "7891783a.b17838",
+    "id": "a4a05745.968c7",
     "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": 4848.000518798828,
-    "y": 1816.2236633300781,
-    "z": "7062000.f761",
+    "x": 4816.000518798828,
+    "y": 1809.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d094659a.049558",
+    "id": "d1e00a0e.d2e56",
     "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": 4845.000518798828,
-    "y": 1855.2236633300781,
-    "z": "7062000.f761",
+    "x": 4813.000518798828,
+    "y": 1848.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7580173.08b9968"
+        "17a4f2c1.f6b375"
       ]
     ]
   },
   {
-    "id": "9c226fb0.3cc118",
+    "id": "d1a2356d.4786a8",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4800.500518798828,
-    "y": 1897.2236633300781,
-    "z": "7062000.f761",
+    "x": 4768.500518798828,
+    "y": 1890.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7580173.08b9968",
+    "id": "17a4f2c1.f6b375",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5025.500518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 4993.500518798828,
+    "y": 1847.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cbf832f4.29b03"
+        "ba138e8e.753b68"
       ]
     ]
   },
   {
-    "id": "c301ea5d.736948",
+    "id": "8d6faffb.891c08",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4839.883331298828,
-    "y": 1297.8833312988281,
-    "z": "7062000.f761",
+    "x": 4807.883331298828,
+    "y": 1290.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "82c12c36.ef82a"
+        "17552ef5.2956f9"
       ]
     ]
   },
   {
-    "id": "82c12c36.ef82a",
+    "id": "17552ef5.2956f9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5016.883331298828,
-    "y": 1289.8833312988281,
-    "z": "7062000.f761",
+    "x": 4984.883331298828,
+    "y": 1282.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "99af67bd.f0a288",
-        "27aaa5b6.e5d6a2"
+        "55d02530.edc7ec",
+        "14cede7e.dd48aa"
       ]
     ]
   },
   {
-    "id": "9be30f1d.25d3a8",
+    "id": "910fe315.8317e8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4636.883331298828,
-    "y": 1293.8833312988281,
-    "z": "7062000.f761",
+    "x": 4604.883331298828,
+    "y": 1286.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c301ea5d.736948",
-        "d642ceb0.6d61d8"
+        "8d6faffb.891c08",
+        "fe294daa.41d368"
       ]
     ]
   },
   {
-    "id": "d642ceb0.6d61d8",
+    "id": "fe294daa.41d368",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4842.883331298828,
-    "y": 1371.8833312988281,
-    "z": "7062000.f761",
+    "x": 4810.883331298828,
+    "y": 1364.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8d64b35.e02ce5"
+        "d9a2dd9b.e37c68"
       ]
     ]
   },
   {
-    "id": "8d64b35.e02ce5",
+    "id": "d9a2dd9b.e37c68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5019.883331298828,
-    "y": 1363.8833312988281,
-    "z": "7062000.f761",
+    "x": 4987.883331298828,
+    "y": 1356.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b7238960.567a78"
+        "7ccc9bf1.00634c"
       ]
     ]
   },
   {
-    "id": "cbf832f4.29b03",
+    "id": "ba138e8e.753b68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5183.500518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 5151.500518798828,
+    "y": 1847.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "703f7e18.3396c8"
+        "949f2da8.99048"
       ]
     ]
   },
   {
-    "id": "703f7e18.3396c8",
+    "id": "949f2da8.99048",
     "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": 5390.500518798828,
-    "y": 1854.2236633300781,
-    "z": "7062000.f761",
+    "x": 5358.500518798828,
+    "y": 1847.2236633300781,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "27aaa5b6.e5d6a2",
+    "id": "14cede7e.dd48aa",
     "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": 5224.883331298828,
-    "y": 1296.8833312988281,
-    "z": "7062000.f761",
+    "x": 5192.883331298828,
+    "y": 1289.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5f4852b0.deaefc",
-        "a3e152bc.1612f",
-        "6a748238.68a734"
+        "b2a3145.b7edbe8",
+        "e74729d.3422f58",
+        "409c0b0b.c89e64"
       ]
     ]
   },
   {
-    "id": "99af67bd.f0a288",
+    "id": "55d02530.edc7ec",
     "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": 5254.883331298828,
-    "y": 1244.8833312988281,
-    "z": "7062000.f761",
+    "x": 5222.883331298828,
+    "y": 1237.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5f4852b0.deaefc",
+    "id": "b2a3145.b7edbe8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5434.883331298828,
-    "y": 1287.8833312988281,
-    "z": "7062000.f761",
+    "x": 5402.883331298828,
+    "y": 1280.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fce8f611.8c7338"
+        "4b8f6adb.6d0404"
       ]
     ]
   },
   {
-    "id": "a3e152bc.1612f",
+    "id": "e74729d.3422f58",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5426.883331298828,
-    "y": 1342.8833312988281,
-    "z": "7062000.f761",
+    "x": 5394.883331298828,
+    "y": 1335.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "23b3b244.7d6476"
+        "19136c8e.dcdfbb"
       ]
     ]
   },
   {
-    "id": "6a748238.68a734",
+    "id": "409c0b0b.c89e64",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5431.883331298828,
-    "y": 1399.8833312988281,
-    "z": "7062000.f761",
+    "x": 5399.883331298828,
+    "y": 1392.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a282f316.3a8968"
+        "e2070656.8dd03"
       ]
     ]
   },
   {
-    "id": "a282f316.3a8968",
+    "id": "e2070656.8dd03",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5583.883331298828,
-    "y": 1400.8833312988281,
-    "z": "7062000.f761",
+    "x": 5551.883331298828,
+    "y": 1393.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "23b3b244.7d6476",
+    "id": "19136c8e.dcdfbb",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5594.883331298828,
-    "y": 1345.8833312988281,
-    "z": "7062000.f761",
+    "x": 5562.883331298828,
+    "y": 1338.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "fce8f611.8c7338",
+    "id": "4b8f6adb.6d0404",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5579.265655517578,
-    "y": 1285.5390014648438,
-    "z": "7062000.f761",
+    "x": 5547.265655517578,
+    "y": 1278.5390014648438,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a440aece.fb083"
+        "c2a5af15.443d8"
       ]
     ]
   },
   {
-    "id": "b7238960.567a78",
+    "id": "7ccc9bf1.00634c",
     "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": 5254.883331298828,
-    "y": 1487.8833312988281,
-    "z": "7062000.f761",
+    "x": 5222.883331298828,
+    "y": 1480.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a440aece.fb083",
+    "id": "c2a5af15.443d8",
     "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": 5793.883331298828,
-    "y": 1281.8833312988281,
-    "z": "7062000.f761",
+    "x": 5761.883331298828,
+    "y": 1274.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5b9ee810.250ef",
+    "id": "4eba14c8.80a994",
     "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": 4377.883331298828,
-    "y": 935.8833312988281,
-    "z": "7062000.f761",
+    "x": 4345.883331298828,
+    "y": 928.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "8e2d81c0.4fd7e8",
+    "id": "620253a.9c2552c",
     "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": 4368.883331298828,
-    "y": 1033.8833312988281,
-    "z": "7062000.f761",
+    "x": 4336.883331298828,
+    "y": 1026.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2d74202a.0b02c",
+    "id": "9c76efc2.c7f458",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4202.883331298828,
-    "y": 941.8833312988281,
-    "z": "7062000.f761",
+    "x": 4170.883331298828,
+    "y": 934.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "698ac3d0.bab4ec",
-        "5b9ee810.250ef"
+        "a64deb38.79c21",
+        "4eba14c8.80a994"
       ]
     ]
   },
   {
-    "id": "7e647400.994a6c",
+    "id": "36b200ce.3626f",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4208.883331298828,
-    "y": 1005.8833312988281,
-    "z": "7062000.f761",
+    "x": 4176.883331298828,
+    "y": 998.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d12533f5.293ec",
-        "8e2d81c0.4fd7e8"
+        "d00069b9.08211",
+        "620253a.9c2552c"
       ]
     ]
   },
   {
-    "id": "45ecb3a3.4434cc",
+    "id": "f7a8d104.b779c8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4208.883331298828,
-    "y": 1111.8833312988281,
-    "z": "7062000.f761",
+    "x": 4176.883331298828,
+    "y": 1104.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cfe2458d.e53598",
-        "1ea1c70f.8279e9"
+        "e2a3248.b77d4d8",
+        "bcbbe769.3c0e1"
       ]
     ]
   },
   {
-    "id": "c83b931a.caa288",
+    "id": "2781339a.2c9d8c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4211.883331298828,
-    "y": 1164.8833312988281,
-    "z": "7062000.f761",
+    "x": 4179.883331298828,
+    "y": 1157.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e0154f38.db2ba",
-        "85671ae.a18b1e8"
+        "69fc971e.d1c948",
+        "6070cd17.b28d74"
       ]
     ]
   },
   {
-    "id": "1ea1c70f.8279e9",
+    "id": "bcbbe769.3c0e1",
     "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": 4368.883331298828,
-    "y": 1124.8833312988281,
-    "z": "7062000.f761",
+    "x": 4336.883331298828,
+    "y": 1117.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "85671ae.a18b1e8",
+    "id": "6070cd17.b28d74",
     "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": 4371.883331298828,
-    "y": 1215.8833312988281,
-    "z": "7062000.f761",
+    "x": 4339.883331298828,
+    "y": 1208.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7278edf2.b8b58c",
+    "id": "ef6aaa0a.46635",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3743.883331298828,
-    "y": 2425.883331298828,
-    "z": "7062000.f761",
+    "x": 3711.883331298828,
+    "y": 2418.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3fae525c.90658e",
-        "13c312d5.234edd"
+        "a10bbf1c.524bd",
+        "27427337.3be9a4"
       ]
     ]
   },
   {
-    "id": "2fa6509a.e12468",
+    "id": "a6501243.d121f",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3571.216827392578,
-    "y": 2426.883331298828,
-    "z": "7062000.f761",
+    "x": 3539.216827392578,
+    "y": 2419.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7278edf2.b8b58c"
+        "ef6aaa0a.46635"
       ]
     ]
   },
   {
-    "id": "2125c96e.09934e",
+    "id": "aaec6d99.4c304",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3580.707794189453,
-    "y": 2469.4573669433594,
-    "z": "7062000.f761",
+    "x": 3548.707794189453,
+    "y": 2462.4573669433594,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "68c9e27f.22495c"
+        "47f8697d.df9998"
       ]
     ]
   },
   {
-    "id": "be5c9f7d.6c274",
+    "id": "e6e0568a.7d4f68",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3569.216827392578,
-    "y": 2515.883331298828,
-    "z": "7062000.f761",
+    "x": 3537.216827392578,
+    "y": 2508.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "dc663a75.10e1e"
+        "2963b336.e3bc8c"
       ]
     ]
   },
   {
-    "id": "68c9e27f.22495c",
+    "id": "47f8697d.df9998",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 3734.2792053222656,
-    "y": 2472.7431030273438,
-    "z": "7062000.f761",
+    "x": 3702.2792053222656,
+    "y": 2465.7431030273438,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "dc663a75.10e1e",
+    "id": "2963b336.e3bc8c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3738.216827392578,
-    "y": 2516.883331298828,
-    "z": "7062000.f761",
+    "x": 3706.216827392578,
+    "y": 2509.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3fae525c.90658e",
+    "id": "a10bbf1c.524bd",
     "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": 4030.216827392578,
-    "y": 2429.8834533691406,
-    "z": "7062000.f761",
+    "x": 3998.216827392578,
+    "y": 2422.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f8506393.ef4d48",
-        "ae1a7fe2.9ff988"
+        "b2433bfc.a285b",
+        "e32efd70.259f3"
       ]
     ]
   },
   {
-    "id": "ae1a7fe2.9ff988",
+    "id": "e32efd70.259f3",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4253.216827392578,
-    "y": 2384.8834533691406,
-    "z": "7062000.f761",
+    "x": 4221.216827392578,
+    "y": 2377.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "bd5252ed.d0e86"
+        "e33d7c06.1215a"
       ]
     ]
   },
   {
-    "id": "f8506393.ef4d48",
+    "id": "b2433bfc.a285b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4255.216827392578,
-    "y": 2448.8834533691406,
-    "z": "7062000.f761",
+    "x": 4223.216827392578,
+    "y": 2441.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7b56fdc4.718894"
+        "96c9f851.720ff"
       ]
     ]
   },
   {
-    "id": "7b56fdc4.718894",
+    "id": "96c9f851.720ff",
     "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": 4414.216827392578,
-    "y": 2467.8834533691406,
-    "z": "7062000.f761",
+    "x": 4382.216827392578,
+    "y": 2460.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "bd5252ed.d0e86",
+    "id": "e33d7c06.1215a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4418.216827392578,
-    "y": 2381.8834533691406,
-    "z": "7062000.f761",
+    "x": 4386.216827392578,
+    "y": 2374.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a04df249.3edf9",
-        "4445456b.4ef0dc"
+        "64140131.87f6a",
+        "d9669ac1.5a2d68"
       ]
     ]
   },
   {
-    "id": "dfb0d610.c67228",
+    "id": "e5d24864.c4d21",
     "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<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\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 4032.216827392578,
-    "y": 2588.8834533691406,
-    "z": "7062000.f761",
+    "x": 4000.216827392578,
+    "y": 2581.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a9b19647.ecdf6",
+    "id": "f6b5343f.392d9",
     "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": 4077.216827392578,
-    "y": 2498.8834533691406,
-    "z": "7062000.f761",
+    "x": 4045.216827392578,
+    "y": 2491.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "d1080dc6.5d411",
+    "id": "cfe86ca7.011b18",
     "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": 4159.216827392578,
-    "y": 2653.8834533691406,
-    "z": "7062000.f761",
+    "x": 4127.216827392578,
+    "y": 2646.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "52e7c1a.b628dc",
+    "id": "f7e98987.293918",
     "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": 3343.216827392578,
-    "y": 2461.883331298828,
-    "z": "7062000.f761",
+    "x": 3311.216827392578,
+    "y": 2454.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2fa6509a.e12468",
-        "2125c96e.09934e",
-        "be5c9f7d.6c274"
+        "a6501243.d121f",
+        "aaec6d99.4c304",
+        "e6e0568a.7d4f68"
       ]
     ]
   },
   {
-    "id": "534c4b07.5a4374",
+    "id": "d0c5015f.630ad",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3304.216827392578,
-    "y": 2405.883331298828,
-    "z": "7062000.f761",
+    "x": 3272.216827392578,
+    "y": 2398.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "59b35d49.e5c194",
+    "id": "1ebd0160.929687",
     "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": 3361.216827392578,
-    "y": 2124.8832092285156,
-    "z": "7062000.f761",
+    "x": 3329.216827392578,
+    "y": 2117.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8468812d.ab7d98",
-        "832feae1.441b18"
+        "28ff08ce.889b38",
+        "1b36a02a.8e3468"
       ]
     ]
   },
   {
-    "id": "832feae1.441b18",
+    "id": "1b36a02a.8e3468",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3584.216827392578,
-    "y": 2110.8832092285156,
-    "z": "7062000.f761",
+    "x": 3552.216827392578,
+    "y": 2103.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "45b67ba7.081314"
+        "314f424e.949456"
       ]
     ]
   },
   {
-    "id": "8468812d.ab7d98",
+    "id": "28ff08ce.889b38",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3586.216827392578,
-    "y": 2143.8832092285156,
-    "z": "7062000.f761",
+    "x": 3554.216827392578,
+    "y": 2136.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "71974a85.bc9554"
+        "c351a018.b67f98"
       ]
     ]
   },
   {
-    "id": "71974a85.bc9554",
+    "id": "c351a018.b67f98",
     "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": 3729.216827392578,
-    "y": 2140.8832092285156,
-    "z": "7062000.f761",
+    "x": 3697.216827392578,
+    "y": 2133.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "45b67ba7.081314",
+    "id": "314f424e.949456",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3732.216827392578,
-    "y": 2103.8832092285156,
-    "z": "7062000.f761",
+    "x": 3700.216827392578,
+    "y": 2096.8832092285156,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "10560f97.9ccdb",
-        "fb974250.3eaa5"
+        "8065ca34.19e0e",
+        "27c4c436.c4a394"
       ]
     ]
   },
   {
-    "id": "10560f97.9ccdb",
+    "id": "8065ca34.19e0e",
     "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": 3926.216827392578,
-    "y": 2106.883331298828,
-    "z": "7062000.f761",
+    "x": 3894.216827392578,
+    "y": 2099.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "13c312d5.234edd",
+    "id": "27427337.3be9a4",
     "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": 3989.216827392578,
-    "y": 2738.883331298828,
-    "z": "7062000.f761",
+    "x": 3957.216827392578,
+    "y": 2731.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4f9cbec5.496d9"
+        "b95f783a.80c45"
       ]
     ]
   },
   {
-    "id": "4f9cbec5.496d9",
+    "id": "b95f783a.80c45",
     "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": 4195.216827392578,
-    "y": 2738.883331298828,
-    "z": "7062000.f761",
+    "x": 4163.216827392578,
+    "y": 2731.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b238117c.f6854"
+        "fdd7c5c3.71bfe8"
       ]
     ]
   },
   {
-    "id": "b238117c.f6854",
+    "id": "fdd7c5c3.71bfe8",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4412.502471923828,
-    "y": 2737.705108642578,
-    "z": "7062000.f761",
+    "x": 4380.502471923828,
+    "y": 2730.705108642578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3bbc3c62.de1f1c"
+        "240f5a27.c1a7a6"
       ]
     ]
   },
   {
-    "id": "fb974250.3eaa5",
+    "id": "27c4c436.c4a394",
     "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": 3948.216827392578,
-    "y": 2174.883331298828,
-    "z": "7062000.f761",
+    "x": 3916.216827392578,
+    "y": 2167.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8b8a9b87.c8a068",
-        "46f3b355.657d1c",
-        "789bb9ae.3c411"
+        "47b31581.268b0c",
+        "43867bdb.1b0d54",
+        "bbdefe01.0e663"
       ]
     ]
   },
   {
-    "id": "8b8a9b87.c8a068",
+    "id": "47b31581.268b0c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4143.716949462891,
-    "y": 2126.883331298828,
-    "z": "7062000.f761",
+    "x": 4111.716949462891,
+    "y": 2119.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "288864eb.075f34"
+        "bdcfd968.805c18"
       ]
     ]
   },
   {
-    "id": "46f3b355.657d1c",
+    "id": "43867bdb.1b0d54",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4135.716949462891,
-    "y": 2181.883331298828,
-    "z": "7062000.f761",
+    "x": 4103.716949462891,
+    "y": 2174.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f82ba322.6474e"
+        "a95a4d5b.d3114"
       ]
     ]
   },
   {
-    "id": "789bb9ae.3c411",
+    "id": "bbdefe01.0e663",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4140.716949462891,
-    "y": 2238.883331298828,
-    "z": "7062000.f761",
+    "x": 4108.716949462891,
+    "y": 2231.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "98f52488.0327b8"
+        "64398d6f.e5c684"
       ]
     ]
   },
   {
-    "id": "98f52488.0327b8",
+    "id": "64398d6f.e5c684",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4292.716949462891,
-    "y": 2239.883331298828,
-    "z": "7062000.f761",
+    "x": 4260.716949462891,
+    "y": 2232.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f82ba322.6474e",
+    "id": "a95a4d5b.d3114",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4303.716949462891,
-    "y": 2184.883331298828,
-    "z": "7062000.f761",
+    "x": 4271.716949462891,
+    "y": 2177.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "288864eb.075f34",
+    "id": "bdcfd968.805c18",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4288.099273681641,
-    "y": 2124.5390014648438,
-    "z": "7062000.f761",
+    "x": 4256.099273681641,
+    "y": 2117.5390014648438,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ce45d16c.d5e628"
+        "6d52f6e9.bcbf28"
       ]
     ]
   },
   {
-    "id": "a04df249.3edf9",
+    "id": "64140131.87f6a",
     "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": 4588.216827392578,
-    "y": 2342.8834533691406,
-    "z": "7062000.f761",
+    "x": 4556.216827392578,
+    "y": 2335.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "4445456b.4ef0dc",
+    "id": "d9669ac1.5a2d68",
     "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": 4589.216827392578,
-    "y": 2447.8834533691406,
-    "z": "7062000.f761",
+    "x": 4557.216827392578,
+    "y": 2440.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "c559d0ff.64e92",
+    "id": "9ddf3bf9.57ff3",
     "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": 4584.216827392578,
-    "y": 2396.8834533691406,
-    "z": "7062000.f761",
+    "x": 4552.216827392578,
+    "y": 2389.8834533691406,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3bbc3c62.de1f1c",
+    "id": "240f5a27.c1a7a6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4619.334014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 4587.334014892578,
+    "y": 2720.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f4fc0b3b.90cef8",
-        "6738a6d1.eac328",
-        "94eb5da4.00ce9"
+        "801a071e.c98f98",
+        "45d249d1.4a712",
+        "37813776.11957"
       ]
     ]
   },
   {
-    "id": "f4fc0b3b.90cef8",
+    "id": "801a071e.c98f98",
     "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": 4834.334014892578,
-    "y": 2689.2237854003906,
-    "z": "7062000.f761",
+    "x": 4802.334014892578,
+    "y": 2682.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6738a6d1.eac328",
+    "id": "45d249d1.4a712",
     "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": 4831.334014892578,
-    "y": 2728.2237854003906,
-    "z": "7062000.f761",
+    "x": 4799.334014892578,
+    "y": 2721.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "99dab506.61b3a8"
+        "d7c43050.0743b"
       ]
     ]
   },
   {
-    "id": "94eb5da4.00ce9",
+    "id": "37813776.11957",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4786.834014892578,
-    "y": 2770.2237854003906,
-    "z": "7062000.f761",
+    "x": 4754.834014892578,
+    "y": 2763.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "99dab506.61b3a8",
+    "id": "d7c43050.0743b",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5011.834014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 4979.834014892578,
+    "y": 2720.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d09db1ae.3d50e8"
+        "161c6e5f.bccb42"
       ]
     ]
   },
   {
-    "id": "d09db1ae.3d50e8",
+    "id": "161c6e5f.bccb42",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5169.834014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 5137.834014892578,
+    "y": 2720.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b4fea58e.4d08b"
+        "268de5ce.943522"
       ]
     ]
   },
   {
-    "id": "b4fea58e.4d08b",
+    "id": "268de5ce.943522",
     "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": 5376.834014892578,
-    "y": 2727.2237854003906,
-    "z": "7062000.f761",
+    "x": 5344.834014892578,
+    "y": 2720.2237854003906,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9cb60767.3dae68",
+    "id": "5dd066fb.8bb21",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4870.216827392578,
-    "y": 2142.883331298828,
-    "z": "7062000.f761",
+    "x": 4838.216827392578,
+    "y": 2135.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "20305f15.4fc8"
+        "4dd18012.7f83e"
       ]
     ]
   },
   {
-    "id": "20305f15.4fc8",
+    "id": "4dd18012.7f83e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5047.216827392578,
-    "y": 2134.883331298828,
-    "z": "7062000.f761",
+    "x": 5015.216827392578,
+    "y": 2127.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f06ad939.b3afb8",
-        "eb592a74.9250f"
+        "cb357072.40504",
+        "41f4620d.06ac64"
       ]
     ]
   },
   {
-    "id": "ce45d16c.d5e628",
+    "id": "6d52f6e9.bcbf28",
     "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": 4472.216827392578,
-    "y": 2138.883331298828,
-    "z": "7062000.f761",
+    "x": 4440.216827392578,
+    "y": 2131.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "836b2028.73fa6"
+        "1558a590.3c3faa"
       ]
     ]
   },
   {
-    "id": "836b2028.73fa6",
+    "id": "1558a590.3c3faa",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4667.216827392578,
-    "y": 2138.883331298828,
-    "z": "7062000.f761",
+    "x": 4635.216827392578,
+    "y": 2131.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9cb60767.3dae68",
-        "1e4a18fb.74350f"
+        "5dd066fb.8bb21",
+        "a026e3da.a47c68"
       ]
     ]
   },
   {
-    "id": "eb592a74.9250f",
+    "id": "41f4620d.06ac64",
     "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": 5255.216827392578,
-    "y": 2141.883331298828,
-    "z": "7062000.f761",
+    "x": 5223.216827392578,
+    "y": 2134.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b94c1f46.28b1b8",
-        "73a98c16.ea7094",
-        "1e6cb9ce.e34866"
+        "304be603.33560a",
+        "7b7d3ebe.8d439",
+        "4d809924.5591a8"
       ]
     ]
   },
   {
-    "id": "4be3f63c.7d65d8",
+    "id": "e13819fd.c513e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5049.216827392578,
-    "y": 2207.883331298828,
-    "z": "7062000.f761",
+    "x": 5017.216827392578,
+    "y": 2200.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "573bcde0.7ae984"
+        "b46e83ff.b91008"
       ]
     ]
   },
   {
-    "id": "1e4a18fb.74350f",
+    "id": "a026e3da.a47c68",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4872.216827392578,
-    "y": 2215.883331298828,
-    "z": "7062000.f761",
+    "x": 4840.216827392578,
+    "y": 2208.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4be3f63c.7d65d8"
+        "e13819fd.c513e8"
       ]
     ]
   },
   {
-    "id": "f06ad939.b3afb8",
+    "id": "cb357072.40504",
     "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": 5285.216827392578,
-    "y": 2089.883331298828,
-    "z": "7062000.f761",
+    "x": 5253.216827392578,
+    "y": 2082.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "573bcde0.7ae984",
+    "id": "b46e83ff.b91008",
     "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": 5284.216827392578,
-    "y": 2331.883331298828,
-    "z": "7062000.f761",
+    "x": 5252.216827392578,
+    "y": 2324.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b94c1f46.28b1b8",
+    "id": "304be603.33560a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5465.216827392578,
-    "y": 2132.883331298828,
-    "z": "7062000.f761",
+    "x": 5433.216827392578,
+    "y": 2125.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9cca84a4.69e27"
+        "d9386700.ef3558"
       ]
     ]
   },
   {
-    "id": "73a98c16.ea7094",
+    "id": "7b7d3ebe.8d439",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5457.216827392578,
-    "y": 2187.883331298828,
-    "z": "7062000.f761",
+    "x": 5425.216827392578,
+    "y": 2180.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e1e079f9.7a9848"
+        "b1a122b9.2b3df"
       ]
     ]
   },
   {
-    "id": "1e6cb9ce.e34866",
+    "id": "4d809924.5591a8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5462.216827392578,
-    "y": 2244.883331298828,
-    "z": "7062000.f761",
+    "x": 5430.216827392578,
+    "y": 2237.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9609b4db.95e4f"
+        "7206a51a.368f14"
       ]
     ]
   },
   {
-    "id": "9609b4db.95e4f",
+    "id": "7206a51a.368f14",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5614.216827392578,
-    "y": 2245.883331298828,
-    "z": "7062000.f761",
+    "x": 5582.216827392578,
+    "y": 2238.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e1e079f9.7a9848",
+    "id": "b1a122b9.2b3df",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5625.216827392578,
-    "y": 2190.883331298828,
-    "z": "7062000.f761",
+    "x": 5593.216827392578,
+    "y": 2183.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9cca84a4.69e27",
+    "id": "d9386700.ef3558",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5609.599151611328,
-    "y": 2130.5390014648438,
-    "z": "7062000.f761",
+    "x": 5577.599151611328,
+    "y": 2123.5390014648438,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b8027aff.eb46b"
+        "c475367c.4940f8"
       ]
     ]
   },
   {
-    "id": "b8027aff.eb46b",
+    "id": "c475367c.4940f8",
     "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": 5824.216827392578,
-    "y": 2126.883331298828,
-    "z": "7062000.f761",
+    "x": 5792.216827392578,
+    "y": 2119.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "cdada9b0.2f3a48",
+    "id": "6b01ec04.e8e8dc",
     "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`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
+    "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": 3322.883331298828,
-    "y": 1736.8833312988281,
-    "z": "7062000.f761",
+    "x": 3290.883331298828,
+    "y": 1729.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "95e31216.278c48",
+    "id": "6404a595.2767cc",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4544.883331298828,
-    "y": 1019.8833312988281,
-    "z": "7062000.f761",
+    "x": 4512.883331298828,
+    "y": 1012.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e1b848f1.cea8f8",
+    "id": "fdf288f5.399238",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4536.883331298828,
-    "y": 1109.8833312988281,
-    "z": "7062000.f761",
+    "x": 4504.883331298828,
+    "y": 1102.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "850e2800.badf2",
+    "id": "ce90c6ec.193398",
     "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`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
+    "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": 3303.883331298828,
-    "y": 2592.883331298828,
-    "z": "7062000.f761",
+    "x": 3271.883331298828,
+    "y": 2585.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2b1064a0.eade7c",
+    "id": "323cec2c.88d45c",
     "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": 3454.883331298828,
-    "y": 2840.883331298828,
-    "z": "7062000.f761",
+    "x": 3422.883331298828,
+    "y": 2833.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a5bcbd5b.23b83",
+    "id": "fba2883c.72d2",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3331.883331298828,
-    "y": 2950.883331298828,
-    "z": "7062000.f761",
+    "x": 3299.883331298828,
+    "y": 2943.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6b05a347.83dffc",
-        "734dd518.f869ec"
+        "b06a53c9.6a23c",
+        "52a66ca0.57e87c"
       ]
     ]
   },
   {
-    "id": "6b05a347.83dffc",
+    "id": "b06a53c9.6a23c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3515.883331298828,
-    "y": 2929.883331298828,
-    "z": "7062000.f761",
+    "x": 3483.883331298828,
+    "y": 2922.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "81013cf2.231a08"
+        "d4c9f2dc.11912"
       ]
     ]
   },
   {
-    "id": "734dd518.f869ec",
+    "id": "52a66ca0.57e87c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3051.883331298828,
-    "y": 4515.883331298828,
-    "z": "7062000.f761",
+    "x": 3019.883331298828,
+    "y": 4508.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "adcb6448.ea7478"
+        "7ebd19ad.940af8"
       ]
     ]
   },
   {
-    "id": "68da37f9.05cc18",
+    "id": "d74b6b50.22dd88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3562.883331298828,
-    "y": 5100.883331298828,
-    "z": "7062000.f761",
+    "x": 3530.883331298828,
+    "y": 5093.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d849eb29.b778b",
-        "fb71ca0a.fe8928",
-        "c01640bb.f526e8",
-        "298d7f45.2553b",
-        "4ebb86dc.a0713"
+        "b3935092.c652b8",
+        "28b03e50.9f7992",
+        "980b4828.96504",
+        "17af28da.ceda4f",
+        "2c43e5ee.399d8a"
       ]
     ]
   },
   {
-    "id": "81013cf2.231a08",
+    "id": "d4c9f2dc.11912",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6634.883331298828,
-    "y": 2959.883331298828,
-    "z": "7062000.f761",
+    "x": 6602.883331298828,
+    "y": 2952.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8a2aea1.11dcc18",
-        "f98cf202.f36e28",
-        "90c516f3.625c7",
-        "2f838a6e.450ff6",
-        "1aed0e7e.f8efea",
-        "c314ffe6.755b68",
-        "92f41cb.d6037e",
-        "1663311a.25772f",
-        "12533815.a962b",
-        "110e6104.d57bd7",
-        "9037ac75.0bc238",
-        "3017f19.9b8270e",
-        "b384a7be.8178a",
-        "bc57a86f.472ff",
-        "ca7cd34b.bc2bf",
-        "139339a2.2c6a06",
-        "3b830a4d.e803be",
-        "9ce39c8b.582fa",
-        "79c8e0a2.e2d0f"
+        "1d7e1faa.548828",
+        "85f258da.5f0598",
+        "4b074654.080e5",
+        "5d8ffada.d10fc4",
+        "ea403b0c.aaf7e",
+        "1235d80a.544f18",
+        "af33968a.8315c",
+        "9cfe0ae9.258d58",
+        "65dbbd5b.a49b4c",
+        "1d15547d.10576c",
+        "89a6c1ea.eb5688",
+        "2f9ad2ef.1013a6",
+        "a5dc8f9.8a79df",
+        "e38bf422.7c8768",
+        "43d0f5c9.60220c",
+        "2b09e0eb.8326d",
+        "1698c025.c5ee78",
+        "1d008796.234d18",
+        "76e889a9.7e8db8"
       ]
     ]
   },
   {
-    "id": "12533815.a962b",
+    "id": "65dbbd5b.a49b4c",
     "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": 6945.883331298828,
-    "y": 3314.883331298828,
-    "z": "7062000.f761",
+    "x": 6913.883331298828,
+    "y": 3307.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8a2aea1.11dcc18",
+    "id": "1d7e1faa.548828",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 6899.883331298828,
-    "y": 3412.883331298828,
-    "z": "7062000.f761",
+    "x": 6867.883331298828,
+    "y": 3405.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "f98cf202.f36e28",
+    "id": "85f258da.5f0598",
     "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": 7035.883331298828,
-    "y": 3459.883331298828,
-    "z": "7062000.f761",
+    "x": 7003.883331298828,
+    "y": 3452.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "c27f6f12.2b7db",
+    "id": "7c12d148.f08d78",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6866.883331298828,
-    "y": 3263.883331298828,
-    "z": "7062000.f761",
+    "x": 6834.883331298828,
+    "y": 3256.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "c8ec9937.7e8ac",
+    "id": "8342cd90.5a2f6",
     "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": 7392.883331298828,
-    "y": 3754.883331298828,
-    "z": "7062000.f761",
+    "x": 7360.883331298828,
+    "y": 3747.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "90c516f3.625c7",
+    "id": "4b074654.080e5",
     "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": 6956.883331298828,
-    "y": 3793.883331298828,
-    "z": "7062000.f761",
+    "x": 6924.883331298828,
+    "y": 3786.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f838a6e.450ff6",
+    "id": "5d8ffada.d10fc4",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 6904.883331298828,
-    "y": 3844.883331298828,
-    "z": "7062000.f761",
+    "x": 6872.883331298828,
+    "y": 3837.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "1aed0e7e.f8efea",
+    "id": "ea403b0c.aaf7e",
     "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": 7040.883331298828,
-    "y": 3891.883331298828,
-    "z": "7062000.f761",
+    "x": 7008.883331298828,
+    "y": 3884.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "26cc918c.53f13e",
+    "id": "18aaa2dc.b37a3d",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6897.883331298828,
-    "y": 3753.883331298828,
-    "z": "7062000.f761",
+    "x": 6865.883331298828,
+    "y": 3746.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "4f7a1677.0cc04",
+    "id": "b8a58f62.fd6f68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 7327.883331298828,
-    "y": 3950.883331298828,
-    "z": "7062000.f761",
+    "x": 7295.883331298828,
+    "y": 3943.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "c314ffe6.755b68",
+    "id": "1235d80a.544f18",
     "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": 6918.883331298828,
-    "y": 3997.883331298828,
-    "z": "7062000.f761",
+    "x": 6886.883331298828,
+    "y": 3990.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b94a6109.4587b8",
-        "244569e0.e8b39e",
-        "f408fad5.acd5c"
+        "caaa8d0a.a400c",
+        "ba918a95.063018",
+        "73076382.d5d394"
       ]
     ]
   },
   {
-    "id": "b94a6109.4587b8",
+    "id": "caaa8d0a.a400c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7165.883331298828,
-    "y": 3951.883331298828,
-    "z": "7062000.f761",
+    "x": 7133.883331298828,
+    "y": 3944.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4f7a1677.0cc04"
+        "b8a58f62.fd6f68"
       ]
     ]
   },
   {
-    "id": "244569e0.e8b39e",
+    "id": "ba918a95.063018",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7166.374298095703,
-    "y": 3997.4573669433594,
-    "z": "7062000.f761",
+    "x": 7134.374298095703,
+    "y": 3990.4573669433594,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c4e6aa20.1e07c8"
+        "70335d13.df0d4c"
       ]
     ]
   },
   {
-    "id": "f408fad5.acd5c",
+    "id": "73076382.d5d394",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7163.883331298828,
-    "y": 4040.883331298828,
-    "z": "7062000.f761",
+    "x": 7131.883331298828,
+    "y": 4033.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5ee0d1d0.ddd63"
+        "3d4cb88b.ddae8"
       ]
     ]
   },
   {
-    "id": "c4e6aa20.1e07c8",
+    "id": "70335d13.df0d4c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 7328.945709228516,
-    "y": 3997.7431030273438,
-    "z": "7062000.f761",
+    "x": 7296.945709228516,
+    "y": 3990.7431030273438,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5ee0d1d0.ddd63",
+    "id": "3d4cb88b.ddae8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 7332.883331298828,
-    "y": 4041.883331298828,
-    "z": "7062000.f761",
+    "x": 7300.883331298828,
+    "y": 4034.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "ca7cd34b.bc2bf",
+    "id": "43d0f5c9.60220c",
     "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": 6975.883331298828,
-    "y": 4276.883331298828,
-    "z": "7062000.f761",
+    "x": 6943.883331298828,
+    "y": 4269.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "139339a2.2c6a06",
+    "id": "2b09e0eb.8326d",
     "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": 6978.883331298828,
-    "y": 4321.883331298828,
-    "z": "7062000.f761",
+    "x": 6946.883331298828,
+    "y": 4314.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "9ce39c8b.582fa",
+    "id": "1d008796.234d18",
     "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": 6967.883331298828,
-    "y": 4112.883331298828,
-    "z": "7062000.f761",
+    "x": 6935.883331298828,
+    "y": 4105.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "79c8e0a2.e2d0f",
+    "id": "76e889a9.7e8db8",
     "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": 6969.883331298828,
-    "y": 4159.883331298828,
-    "z": "7062000.f761",
+    "x": 6937.883331298828,
+    "y": 4152.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a0361928.318ac8",
+    "id": "2304ec84.74d9f4",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6891.883331298828,
-    "y": 4229.883331298828,
-    "z": "7062000.f761",
+    "x": 6859.883331298828,
+    "y": 4222.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d342acdf.02b8f",
+    "id": "175b5cd1.9f40e3",
     "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": 4521.883087158203,
-    "y": 5380.883331298828,
-    "z": "7062000.f761",
+    "x": 4489.883087158203,
+    "y": 5373.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "d849eb29.b778b",
+    "id": "b3935092.c652b8",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3777.883331298828,
-    "y": 5081.883331298828,
-    "z": "7062000.f761",
+    "x": 3745.883331298828,
+    "y": 5074.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ef9ce74a.0aa3e",
-        "75834f94.5997b"
+        "b8e9bffb.cdc88",
+        "256198d1.5f7cf8"
       ]
     ]
   },
   {
-    "id": "75834f94.5997b",
+    "id": "256198d1.5f7cf8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3949.883331298828,
-    "y": 5078.883331298828,
-    "z": "7062000.f761",
+    "x": 3917.883331298828,
+    "y": 5071.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f997d531.6d1e2"
+        "30a42efe.828c8a"
       ]
     ]
   },
   {
-    "id": "ef9ce74a.0aa3e",
+    "id": "b8e9bffb.cdc88",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3901.883331298828,
-    "y": 5925.883331298828,
-    "z": "7062000.f761",
+    "x": 3869.883331298828,
+    "y": 5918.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7f678eb1.f9d898"
+        "2ed5b6b9.722642"
       ]
     ]
   },
   {
-    "id": "94fb7d78.dd39a8",
+    "id": "9dc6e8a7.9c1158",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3962.883331298828,
-    "y": 5048.883331298828,
-    "z": "7062000.f761",
+    "x": 3930.883331298828,
+    "y": 5041.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d898a291.dc858",
+    "id": "e1ff48b3.343b9",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3972.883331298828,
-    "y": 5883.883331298828,
-    "z": "7062000.f761",
+    "x": 3940.883331298828,
+    "y": 5876.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "92f41cb.d6037e",
+    "id": "af33968a.8315c",
     "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": 6975.883331298828,
-    "y": 4385.883331298828,
-    "z": "7062000.f761",
+    "x": 6943.883331298828,
+    "y": 4378.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "f997d531.6d1e2",
+    "id": "30a42efe.828c8a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4125.883331298828,
-    "y": 5080.883331298828,
-    "z": "7062000.f761",
+    "x": 4093.883331298828,
+    "y": 5073.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "baabeea4.9ec638",
-        "fd2de0c3.4119c8",
-        "7962decb.29a4b8",
-        "1df2ddf.d8fc4a2",
-        "bb9baf34.d0edd",
-        "983065a0.b74e08",
-        "d342acdf.02b8f"
+        "2892dc09.31fadc",
+        "afa31c79.54acd8",
+        "e8807ba5.c313d8",
+        "f07ffbda.6acb28",
+        "78d94074.f38b7",
+        "95bef4a8.5a7ff8",
+        "175b5cd1.9f40e3"
       ]
     ]
   },
   {
-    "id": "4b2297b2.c2986",
+    "id": "d52f0d8d.4208d8",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5569.883087158203,
-    "y": 5005.883331298828,
-    "z": "7062000.f761",
+    "x": 5537.883087158203,
+    "y": 4998.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "baabeea4.9ec638",
+    "id": "2892dc09.31fadc",
     "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": 4516.883087158203,
-    "y": 5683.883331298828,
-    "z": "7062000.f761",
+    "x": 4484.883087158203,
+    "y": 5676.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "1663311a.25772f",
+    "id": "9cfe0ae9.258d58",
     "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": 6951.883331298828,
-    "y": 3653.883331298828,
-    "z": "7062000.f761",
+    "x": 6919.883331298828,
+    "y": 3646.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac7755ab.b0ef2",
+    "id": "753d3ee1.bef8a",
     "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 = $prop.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": 3435.883331298828,
-    "y": 1842.8833312988281,
-    "z": "7062000.f761",
+    "x": 3403.883331298828,
+    "y": 1835.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "2976ed1.40d8712",
+    "id": "564c1334.4c1554",
     "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-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3342.883331298828,
-    "y": 1789.8833312988281,
-    "z": "7062000.f761",
+    "x": 3310.883331298828,
+    "y": 1782.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "7c3bd1f7.b32788",
+    "id": "514b6193.3ff5b",
     "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": 7001.883331298828,
-    "y": 3356.883331298828,
-    "z": "7062000.f761",
+    "x": 6969.883331298828,
+    "y": 3349.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "110e6104.d57bd7",
+    "id": "1d15547d.10576c",
     "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": 6948.883331298828,
-    "y": 2944.883331298828,
-    "z": "7062000.f761",
+    "x": 6916.883331298828,
+    "y": 2937.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "9037ac75.0bc238",
+    "id": "89a6c1ea.eb5688",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 6896.883331298828,
-    "y": 2992.883331298828,
-    "z": "7062000.f761",
+    "x": 6864.883331298828,
+    "y": 2985.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "3017f19.9b8270e",
+    "id": "2f9ad2ef.1013a6",
     "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": 7024.883331298828,
-    "y": 3039.883331298828,
-    "z": "7062000.f761",
+    "x": 6992.883331298828,
+    "y": 3032.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "2b4caca8.ebe43c",
+    "id": "baf2c2db.c807d8",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6861.883331298828,
-    "y": 2902.883331298828,
-    "z": "7062000.f761",
+    "x": 6829.883331298828,
+    "y": 2895.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b384a7be.8178a",
+    "id": "a5dc8f9.8a79df",
     "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": 6858.883331298828,
-    "y": 3130.883331298828,
-    "z": "7062000.f761",
+    "x": 6826.883331298828,
+    "y": 3123.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "bc57a86f.472ff",
+    "id": "e38bf422.7c8768",
     "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": 6951.883331298828,
-    "y": 3183.883331298828,
-    "z": "7062000.f761",
+    "x": 6919.883331298828,
+    "y": 3176.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a5d38ce2.eac838",
+    "id": "5474c24a.9f6dac",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6842.883331298828,
-    "y": 3086.883331298828,
-    "z": "7062000.f761",
+    "x": 6810.883331298828,
+    "y": 3079.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "232bd10a.a8b54e",
+    "id": "63adea28.503954",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6848.883331298828,
-    "y": 3536.883331298828,
-    "z": "7062000.f761",
+    "x": 6816.883331298828,
+    "y": 3529.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1df2ddf.d8fc4a2",
+    "id": "f07ffbda.6acb28",
     "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": 4438.883087158203,
-    "y": 5013.883331298828,
-    "z": "7062000.f761",
+    "x": 4406.883087158203,
+    "y": 5006.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "5696f41b.05cf84",
+    "id": "5623ebdb.1a4534",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4422.883087158203,
-    "y": 4969.883331298828,
-    "z": "7062000.f761",
+    "x": 4390.883087158203,
+    "y": 4962.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "462a954a.4cebb4",
+    "id": "4b470452.112d8c",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5169.883087158203,
-    "y": 5000.883331298828,
-    "z": "7062000.f761",
+    "x": 5137.883087158203,
+    "y": 4993.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5bab7896.e13d9",
+    "id": "effc1efd.4a1d3",
     "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": 5256.883087158203,
-    "y": 5042.883331298828,
-    "z": "7062000.f761",
+    "x": 5224.883087158203,
+    "y": 5035.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ec708b2b.d3c6e",
+    "id": "5c8eea0c.68cc14",
     "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='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-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": 5204.883087158203,
-    "y": 5090.883331298828,
-    "z": "7062000.f761",
+    "x": 5172.883087158203,
+    "y": 5083.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "dea6b450.126ae",
+    "id": "e7adda57.489d68",
     "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": 5332.883087158203,
-    "y": 5137.883331298828,
-    "z": "7062000.f761",
+    "x": 5300.883087158203,
+    "y": 5130.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "983065a0.b74e08",
+    "id": "95bef4a8.5a7ff8",
     "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": 4509.883087158203,
-    "y": 5422.883331298828,
-    "z": "7062000.f761",
+    "x": 4477.883087158203,
+    "y": 5415.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "e263a78e.c8cba",
+    "id": "63c65355.a8cec4",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4492.883087158203,
-    "y": 5484.883331298828,
-    "z": "7062000.f761",
+    "x": 4460.883087158203,
+    "y": 5477.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "fd2de0c3.4119c8",
+    "id": "afa31c79.54acd8",
     "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": 4603.883087158203,
-    "y": 5526.883331298828,
-    "z": "7062000.f761",
+    "x": 4571.883087158203,
+    "y": 5519.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "631f5baa.6a836c",
+    "id": "be0ea96a.8229",
     "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": 5051.883087158203,
-    "y": 5579.883331298828,
-    "z": "7062000.f761",
+    "x": 5019.883087158203,
+    "y": 5572.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "4505fb5a.3099fc",
+    "id": "4ebf5b73.f18c34",
     "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": 4361.883087158203,
-    "y": 6277.883331298828,
-    "z": "7062000.f761",
+    "x": 4329.883087158203,
+    "y": 6270.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "78bf173f.567498",
+    "id": "58b6c88a.c0b81",
     "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": 4294.883087158203,
-    "y": 6231.883331298828,
-    "z": "7062000.f761",
+    "x": 4262.883087158203,
+    "y": 6224.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "79075338.970b1c",
+    "id": "cd721269.4316d8",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4243.883087158203,
-    "y": 6182.883331298828,
-    "z": "7062000.f761",
+    "x": 4211.883087158203,
+    "y": 6175.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "552d64d8.079684",
+    "id": "be012245.15127",
     "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": 5026.883331298828,
-    "y": 6388.883331298828,
-    "z": "7062000.f761",
+    "x": 4994.883331298828,
+    "y": 6381.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "7962decb.29a4b8",
+    "id": "e8807ba5.c313d8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4430.883087158203,
-    "y": 5583.883331298828,
-    "z": "7062000.f761",
+    "x": 4398.883087158203,
+    "y": 5576.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a8868823.64a65",
-        "f3d79a89.da5f"
+        "572d7988.ef657",
+        "f53c00f0.cf63b8"
       ]
     ]
   },
   {
-    "id": "a8868823.64a65",
+    "id": "572d7988.ef657",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4641.883087158203,
-    "y": 5583.883331298828,
-    "z": "7062000.f761",
+    "x": 4609.883087158203,
+    "y": 5576.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8c7e9ec3.edd538"
+        "a96de56.d3d4f18"
       ]
     ]
   },
   {
-    "id": "8c7e9ec3.edd538",
+    "id": "a96de56.d3d4f18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4797.883087158203,
-    "y": 5579.883331298828,
-    "z": "7062000.f761",
+    "x": 4765.883087158203,
+    "y": 5572.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "631f5baa.6a836c",
-        "e719db8e.3b76c8",
-        "63d85a3d.4103fc"
+        "be0ea96a.8229",
+        "d676c28d.645a28",
+        "bc2e1526.9ae628"
       ]
     ]
   },
   {
-    "id": "f3d79a89.da5f",
+    "id": "f53c00f0.cf63b8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4637.883087158203,
-    "y": 5631.883331298828,
-    "z": "7062000.f761",
+    "x": 4605.883087158203,
+    "y": 5624.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c9509718.d9f2e8"
+        "d258f77c.8cc748"
       ]
     ]
   },
   {
-    "id": "c9509718.d9f2e8",
+    "id": "d258f77c.8cc748",
     "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": 4785.883087158203,
-    "y": 5626.883331298828,
-    "z": "7062000.f761",
+    "x": 4753.883087158203,
+    "y": 5619.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "10f1aa00.faee3e",
+    "id": "5438b6e6.1482f8",
     "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": 5293.883087158203,
-    "y": 5208.883331298828,
-    "z": "7062000.f761",
+    "x": 5261.883087158203,
+    "y": 5201.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "dca67cc5.30d2f8",
+    "id": "42097510.f58b64",
     "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": 2460.883331298828,
-    "y": 167.88333129882812,
-    "z": "7062000.f761",
+    "x": 2428.883331298828,
+    "y": 160.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce64f5e6.94469",
+    "id": "7a55e6a1.70e4b",
     "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": 2394.883331298828,
-    "y": 203.88333129882812,
-    "z": "7062000.f761",
+    "x": 2362.883331298828,
+    "y": 196.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "10c1b340.47f61d",
+    "id": "bf79a82b.b4ff98",
     "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": 2579.883331298828,
-    "y": 130.88333129882812,
-    "z": "7062000.f761",
+    "x": 2547.883331298828,
+    "y": 123.88333129882812,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7299a42e.833c84",
+    "id": "7675dfe3.26b5f8",
     "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": 4328.883087158203,
-    "y": 6343.883331298828,
-    "z": "7062000.f761",
+    "x": 4296.883087158203,
+    "y": 6336.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "14b14bf.2fcb6b4",
+    "id": "ce5c7ab5.bd83c8",
     "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": 4461.883087158203,
-    "y": 6391.883331298828,
-    "z": "7062000.f761",
+    "x": 4429.883087158203,
+    "y": 6384.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "787fc902.6b8688",
+    "id": "60efc6f5.6c666",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4280.883087158203,
-    "y": 6449.883331298828,
-    "z": "7062000.f761",
+    "x": 4248.883087158203,
+    "y": 6442.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "17a7dc18.0b8f9c",
-        "f762f.a378f1d18"
+        "f080a66c.4f7ec8",
+        "652b319b.ab8708"
       ]
     ]
   },
   {
-    "id": "17a7dc18.0b8f9c",
+    "id": "f080a66c.4f7ec8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4473.883087158203,
-    "y": 6450.883331298828,
-    "z": "7062000.f761",
+    "x": 4441.883087158203,
+    "y": 6443.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "22a4f0b9.5cc3f"
+        "10a44adb.d38a25"
       ]
     ]
   },
   {
-    "id": "22a4f0b9.5cc3f",
+    "id": "10a44adb.d38a25",
     "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": 4629.883087158203,
-    "y": 6447.883331298828,
-    "z": "7062000.f761",
+    "x": 4597.883087158203,
+    "y": 6440.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f762f.a378f1d18",
+    "id": "652b319b.ab8708",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4477.883087158203,
-    "y": 6494.883331298828,
-    "z": "7062000.f761",
+    "x": 4445.883087158203,
+    "y": 6487.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "82673a8f.5388f"
+        "a7138657.394d98"
       ]
     ]
   },
   {
-    "id": "82673a8f.5388f",
+    "id": "a7138657.394d98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4616.883087158203,
-    "y": 6489.883331298828,
-    "z": "7062000.f761",
+    "x": 4584.883087158203,
+    "y": 6482.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "552d64d8.079684",
-        "b152a028.0e0e48",
-        "df3932b1.5cfd1",
-        "dd853f0d.c675b",
-        "6a2f520.9e626b",
-        "4ac1ad89.6ecd0c",
-        "5a7c34be.0eee64",
-        "f8b3148.1a90a68",
-        "506cbb81.2befbc",
-        "e29af13.61a371",
-        "1a8fecd4.39509b",
-        "2374b67.d3b424a"
+        "be012245.15127",
+        "cc830633.a13cc",
+        "cd9f0573.3ee2f8",
+        "a5be208e.ddaeb8",
+        "eaad5657.8cd72",
+        "eb39c4f9.289008",
+        "f25bfca7.d75338",
+        "ea968dfa.497e7",
+        "11d506a.c6a64f9",
+        "d968015c.39cda8",
+        "54a65e87.65172",
+        "11c77751.f259a1",
+        "9efae615.dd5ab"
       ]
     ]
   },
   {
-    "id": "5a7c34be.0eee64",
+    "id": "f25bfca7.d75338",
     "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": 4813.883087158203,
-    "y": 7168.883331298828,
-    "z": "7062000.f761",
+    "x": 4781.883087158203,
+    "y": 7161.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8d3fe228.0e9ab8",
-        "92f94e1c.33687",
-        "710bd5c.e65692c"
+        "3dba1ed8.091bf2",
+        "7f8f7997.fe796",
+        "d8010c15.3a2778"
       ]
     ]
   },
   {
-    "id": "8d3fe228.0e9ab8",
+    "id": "3dba1ed8.091bf2",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5018.883087158203,
-    "y": 7165.883331298828,
-    "z": "7062000.f761",
+    "x": 4976.88330078125,
+    "y": 7137.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "867b5387.a77e68"
+        "1b65a6f4.4e2729"
       ]
     ]
   },
   {
-    "id": "92f94e1c.33687",
+    "id": "7f8f7997.fe796",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5002.374053955078,
-    "y": 7227.457366943359,
-    "z": "7062000.f761",
+    "x": 4969.374267578125,
+    "y": 7174.457336425781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "32a9210e.f5a66e"
+        "403902c8.70c854"
       ]
     ]
   },
   {
-    "id": "710bd5c.e65692c",
+    "id": "d8010c15.3a2778",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4999.883087158203,
-    "y": 7270.883331298828,
-    "z": "7062000.f761",
+    "x": 4966.88330078125,
+    "y": 7217.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5f13dad2.143724"
+        "ab2fcd35.01c098"
       ]
     ]
   },
   {
-    "id": "867b5387.a77e68",
+    "id": "1b65a6f4.4e2729",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5186.883331298828,
-    "y": 7160.883331298828,
-    "z": "7062000.f761",
+    "x": 5148.88330078125,
+    "y": 7135.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a6483ec8.fd095"
+        "c7100026.09f848"
       ]
     ]
   },
   {
-    "id": "32a9210e.f5a66e",
+    "id": "403902c8.70c854",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5164.945465087891,
-    "y": 7227.743103027344,
-    "z": "7062000.f761",
+    "x": 5131.9456787109375,
+    "y": 7174.743072509766,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5f13dad2.143724",
+    "id": "ab2fcd35.01c098",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5166.883087158203,
-    "y": 7269.883331298828,
-    "z": "7062000.f761",
+    "x": 5133.88330078125,
+    "y": 7216.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a6483ec8.fd095",
+    "id": "c7100026.09f848",
     "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": 5421.883087158203,
-    "y": 7176.883331298828,
-    "z": "7062000.f761",
+    "x": 5389.883087158203,
+    "y": 7169.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2bfd9e0f.b0b65a"
+        "746d723d.92756c"
       ]
     ]
   },
   {
-    "id": "2bfd9e0f.b0b65a",
+    "id": "746d723d.92756c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5658.883087158203,
-    "y": 7172.883331298828,
-    "z": "7062000.f761",
+    "x": 5626.883087158203,
+    "y": 7165.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f7d1e8ad.4dc7b8"
+        "c84e8944.ab748"
       ]
     ]
   },
   {
-    "id": "58dab986.f5f5a",
+    "id": "9e3ec759.f9e0d",
     "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": 5925.883087158203,
-    "y": 7138.883331298828,
-    "z": "7062000.f761",
+    "x": 5893.883087158203,
+    "y": 7131.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "25d3132f.f14084",
-        "88844ebd.a9a5b"
+        "4fee4c24.360bcc",
+        "4314046.5a68afc"
       ]
     ]
   },
   {
-    "id": "25d3132f.f14084",
+    "id": "4fee4c24.360bcc",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6106.883087158203,
-    "y": 7164.883331298828,
-    "z": "7062000.f761",
+    "x": 6074.883087158203,
+    "y": 7157.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f7d1e8ad.4dc7b8"
+        "c84e8944.ab748"
       ]
     ]
   },
   {
-    "id": "88844ebd.a9a5b",
+    "id": "4314046.5a68afc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6105.883087158203,
-    "y": 7117.883331298828,
-    "z": "7062000.f761",
+    "x": 6073.883087158203,
+    "y": 7110.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "f7d1e8ad.4dc7b8",
+    "id": "c84e8944.ab748",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4849.883087158203,
-    "y": 7439.883331298828,
-    "z": "7062000.f761",
+    "x": 4590.88330078125,
+    "y": 7305.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a21574dc.7f1048"
+        "cbf296b5.4a44d"
       ]
     ]
   },
   {
-    "id": "da2d189.a0c85e8",
+    "id": "1eeaf51a.0f85d3",
     "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": 5698.883087158203,
-    "y": 7344.883331298828,
-    "z": "7062000.f761",
+    "x": 5666.883087158203,
+    "y": 7337.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9ec2c103.e591",
+    "id": "75dd5c17.2526e4",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4911.883087158203,
-    "y": 7115.883331298828,
-    "z": "7062000.f761",
+    "x": 4879.88330078125,
+    "y": 7073.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "4ac1ad89.6ecd0c",
+    "id": "eb39c4f9.289008",
     "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": 4795.883087158203,
-    "y": 6964.883331298828,
-    "z": "7062000.f761",
+    "x": 4763.883087158203,
+    "y": 6957.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2add06b4.24634a",
+    "id": "5dce4a96.7e6e5c",
     "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": 5140.883087158203,
-    "y": 6795.883331298828,
-    "z": "7062000.f761",
+    "x": 5108.883087158203,
+    "y": 6788.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a410e22f.bcf42"
+        "f4b6cbdd.4872c"
       ]
     ]
   },
   {
-    "id": "a410e22f.bcf42",
+    "id": "f4b6cbdd.4872c",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5360.883087158203,
-    "y": 6801.883331298828,
-    "z": "7062000.f761",
+    "x": 5328.883087158203,
+    "y": 6794.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "22269296.bf623e"
+        "49771dd5.9b717c"
       ]
     ]
   },
   {
-    "id": "22269296.bf623e",
+    "id": "49771dd5.9b717c",
     "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": 5545.883087158203,
-    "y": 6800.883331298828,
-    "z": "7062000.f761",
+    "x": 5513.883087158203,
+    "y": 6793.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "66b1e6be.5824e"
+        "444eff53.bd878"
       ]
     ]
   },
   {
-    "id": "66b1e6be.5824e",
+    "id": "444eff53.bd878",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5737.883087158203,
-    "y": 6803.883331298828,
-    "z": "7062000.f761",
+    "x": 5705.883087158203,
+    "y": 6796.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "19dd27ef.ab039"
+        "149f57f1.fd7a"
       ]
     ]
   },
   {
-    "id": "19dd27ef.ab039",
+    "id": "149f57f1.fd7a",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5946.883087158203,
-    "y": 6801.883331298828,
-    "z": "7062000.f761",
+    "x": 5914.883087158203,
+    "y": 6794.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f8b3148.1a90a68",
+    "id": "ea968dfa.497e7",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4847.883087158203,
-    "y": 6789.883331298828,
-    "z": "7062000.f761",
+    "x": 4815.883087158203,
+    "y": 6782.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2add06b4.24634a"
+        "5dce4a96.7e6e5c"
       ]
     ]
   },
   {
-    "id": "df3932b1.5cfd1",
+    "id": "cd9f0573.3ee2f8",
     "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": 4855.883087158203,
-    "y": 6682.883331298828,
-    "z": "7062000.f761",
+    "x": 4823.883087158203,
+    "y": 6675.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6d632da3.ca2994",
-        "65bd7037.bc9ea",
-        "29b67365.cad774"
+        "e6c84893.53204",
+        "5e294103.3f0c78",
+        "8261318b.eb457"
       ]
     ]
   },
   {
-    "id": "6d632da3.ca2994",
+    "id": "e6c84893.53204",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5091.883087158203,
-    "y": 6665.883331298828,
-    "z": "7062000.f761",
+    "x": 5059.883087158203,
+    "y": 6658.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "65bd7037.bc9ea",
+    "id": "5e294103.3f0c78",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5088.883087158203,
-    "y": 6706.883331298828,
-    "z": "7062000.f761",
+    "x": 5056.883087158203,
+    "y": 6699.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "29b67365.cad774",
+    "id": "8261318b.eb457",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5102.883087158203,
-    "y": 6746.883331298828,
-    "z": "7062000.f761",
+    "x": 5070.883087158203,
+    "y": 6739.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "dd853f0d.c675b",
+    "id": "a5be208e.ddaeb8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4791.883087158203,
-    "y": 6841.883331298828,
-    "z": "7062000.f761",
+    "x": 4759.883087158203,
+    "y": 6834.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6a2f520.9e626b",
+    "id": "eaad5657.8cd72",
     "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": 4799.883087158203,
-    "y": 6899.883331298828,
-    "z": "7062000.f761",
+    "x": 4767.883087158203,
+    "y": 6892.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b152a028.0e0e48",
+    "id": "cc830633.a13cc",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4804.883087158203,
-    "y": 6639.883331298828,
-    "z": "7062000.f761",
+    "x": 4772.883087158203,
+    "y": 6632.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3d7b7763.09cfd",
+    "id": "904e1ae5.bbd558",
     "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": 4919.883087158203,
-    "y": 6591.883331298828,
-    "z": "7062000.f761",
+    "x": 4887.883087158203,
+    "y": 6584.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a21574dc.7f1048",
+    "id": "cbf296b5.4a44d",
     "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": 5092.883087158203,
-    "y": 7436.883331298828,
-    "z": "7062000.f761",
+    "x": 4880.88330078125,
+    "y": 7300.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b03df3ba.8ce8d8",
-        "c15c4a9f.54e778"
+        "a993ecb7.4e75a",
+        "50a501d.eb089"
       ]
     ]
   },
   {
-    "id": "b03df3ba.8ce8d8",
+    "id": "a993ecb7.4e75a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5321.883087158203,
-    "y": 7413.883331298828,
-    "z": "7062000.f761",
+    "x": 5136.88330078125,
+    "y": 7272.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b68c7fcf.24567"
+        "2f3de295.447b1e"
       ]
     ]
   },
   {
-    "id": "c15c4a9f.54e778",
+    "id": "50a501d.eb089",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5321.883087158203,
-    "y": 7462.883331298828,
-    "z": "7062000.f761",
+    "x": 5136.88330078125,
+    "y": 7321.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "b68c7fcf.24567",
+    "id": "ed22a86b.d791b8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5482.883087158203,
-    "y": 7418.883331298828,
-    "z": "7062000.f761",
+    "x": 5402.88330078125,
+    "y": 7313.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "57615513.3c37ac",
-        "da2d189.a0c85e8",
-        "aa5be19c.b28bd"
+        "5c9c1b49.b9b35c",
+        "1eeaf51a.0f85d3",
+        "e4035d6c.e05158"
       ]
     ]
   },
   {
-    "id": "41927c2c.53b90c",
+    "id": "f63796a1.344c48",
     "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": 5826.883087158203,
-    "y": 7398.883331298828,
-    "z": "7062000.f761",
+    "x": 5794.883087158203,
+    "y": 7391.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "aa5be19c.b28bd",
+    "id": "e4035d6c.e05158",
     "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": 5796.883087158203,
-    "y": 7458.883331298828,
-    "z": "7062000.f761",
+    "x": 5764.883087158203,
+    "y": 7451.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "57615513.3c37ac",
+    "id": "5c9c1b49.b9b35c",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5703.883087158203,
-    "y": 7286.883331298828,
-    "z": "7062000.f761",
+    "x": 5671.883087158203,
+    "y": 7279.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7f678eb1.f9d898",
+    "id": "2ed5b6b9.722642",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4053.883331298828,
-    "y": 5924.883331298828,
-    "z": "7062000.f761",
+    "x": 4021.883331298828,
+    "y": 5917.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "78bf173f.567498",
-        "7299a42e.833c84",
-        "14b14bf.2fcb6b4",
-        "787fc902.6b8688",
-        "4505fb5a.3099fc"
+        "58b6c88a.c0b81",
+        "7675dfe3.26b5f8",
+        "ce5c7ab5.bd83c8",
+        "60efc6f5.6c666",
+        "4ebf5b73.f18c34"
       ]
     ]
   },
   {
-    "id": "950e3220.8c6648",
+    "id": "8e0e6c35.35f418",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4796.883087158203,
-    "y": 6739.883331298828,
-    "z": "7062000.f761",
+    "x": 4764.883087158203,
+    "y": 6732.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "506cbb81.2befbc",
+    "id": "11d506a.c6a64f9",
     "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": 4919.883331298828,
-    "y": 6469.883331298828,
-    "z": "7062000.f761",
+    "x": 4887.883331298828,
+    "y": 6462.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce6bcae6.279bf",
+    "id": "4d39072e.34b5f8",
     "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": 5056.883331298828,
-    "y": 6419.883331298828,
-    "z": "7062000.f761",
+    "x": 5024.883331298828,
+    "y": 6412.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3b830a4d.e803be",
+    "id": "1698c025.c5ee78",
     "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": 6864.883331298828,
-    "y": 3595.883331298828,
-    "z": "7062000.f761",
+    "x": 6832.883331298828,
+    "y": 3588.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "debea5ca.c5efb8",
+    "id": "63d6aa7c.b5a514",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4070.883331298828,
-    "y": 1820.8833312988281,
-    "z": "7062000.f761",
+    "x": 4038.883331298828,
+    "y": 1813.8833312988281,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "dcf5d1.89c23a3",
+    "id": "3aa74194.8661ee",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4048.883331298828,
-    "y": 2690.883331298828,
-    "z": "7062000.f761",
+    "x": 4016.883331298828,
+    "y": 2683.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3dc14de7.91d75a",
+    "id": "b098a36d.e0c3e",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6855.883331298828,
-    "y": 4062.883331298828,
-    "z": "7062000.f761",
+    "x": 6823.883331298828,
+    "y": 4055.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2530e84c.0abb78",
+    "id": "2f2ed9c0.e0663e",
     "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": 3560.883331298828,
-    "y": 6064.883331298828,
-    "z": "7062000.f761",
+    "x": 3528.883331298828,
+    "y": 6057.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "fb71ca0a.fe8928",
+    "id": "28b03e50.9f7992",
     "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": 3771.883331298828,
-    "y": 4941.883331298828,
-    "z": "7062000.f761",
+    "x": 3739.883331298828,
+    "y": 4934.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "c01640bb.f526e8",
+    "id": "980b4828.96504",
     "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": 3904.883331298828,
-    "y": 4989.883331298828,
-    "z": "7062000.f761",
+    "x": 3872.883331298828,
+    "y": 4982.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "bb9baf34.d0edd",
+    "id": "78d94074.f38b7",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4449.883087158203,
-    "y": 5069.883331298828,
-    "z": "7062000.f761",
+    "x": 4417.883087158203,
+    "y": 5062.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9b70cfc4.c55e3",
-        "fdbb8f8a.783248"
+        "bc43fa2d.411608",
+        "7dd6f63d.8487f"
       ]
     ]
   },
   {
-    "id": "9b70cfc4.c55e3",
+    "id": "bc43fa2d.411608",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4642.883087158203,
-    "y": 5070.883331298828,
-    "z": "7062000.f761",
+    "x": 4610.883087158203,
+    "y": 5063.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c1e58440.70184"
+        "c471dfd.f92dba"
       ]
     ]
   },
   {
-    "id": "fdbb8f8a.783248",
+    "id": "7dd6f63d.8487f",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4646.883087158203,
-    "y": 5114.883331298828,
-    "z": "7062000.f761",
+    "x": 4614.883087158203,
+    "y": 5107.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "75c1affe.0ddba8"
+        "a8ff6a7c.81ae98"
       ]
     ]
   },
   {
-    "id": "75c1affe.0ddba8",
+    "id": "a8ff6a7c.81ae98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4785.883087158203,
-    "y": 5109.883331298828,
-    "z": "7062000.f761",
+    "x": 4753.883087158203,
+    "y": 5102.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4c2b44d5.f7301c",
-        "6ccb98db.74d4e8",
-        "d416487a.185998"
+        "a2ef082b.b2f048",
+        "fa92cb40.708c7",
+        "c4bba10e.ae5948"
       ]
     ]
   },
   {
-    "id": "c1e58440.70184",
+    "id": "c471dfd.f92dba",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4785.883087158203,
-    "y": 5066.883331298828,
-    "z": "7062000.f761",
+    "x": 4753.883087158203,
+    "y": 5059.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5bab7896.e13d9",
-        "ec708b2b.d3c6e",
-        "dea6b450.126ae",
-        "10f1aa00.faee3e"
+        "effc1efd.4a1d3",
+        "5c8eea0c.68cc14",
+        "e7adda57.489d68",
+        "5438b6e6.1482f8"
       ]
     ]
   },
   {
-    "id": "4c2b44d5.f7301c",
+    "id": "a2ef082b.b2f048",
     "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": 5179.883087158203,
-    "y": 5360.883331298828,
-    "z": "7062000.f761",
+    "x": 5147.883087158203,
+    "y": 5353.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "eb20f196.54125",
+    "id": "963dc7de.4f275",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5186.883087158203,
-    "y": 5314.883331298828,
-    "z": "7062000.f761",
+    "x": 5154.883087158203,
+    "y": 5307.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e29af13.61a371",
+    "id": "d968015c.39cda8",
     "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": 4984.883087158203,
-    "y": 7064.883331298828,
-    "z": "7062000.f761",
+    "x": 4944.88330078125,
+    "y": 7022.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "6ccb98db.74d4e8",
+    "id": "fa92cb40.708c7",
     "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": 5298.883087158203,
-    "y": 5413.883331298828,
-    "z": "7062000.f761",
+    "x": 5266.883087158203,
+    "y": 5406.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "e719db8e.3b76c8",
+    "id": "d676c28d.645a28",
     "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": 5180.883087158203,
-    "y": 5631.883331298828,
-    "z": "7062000.f761",
+    "x": 5148.883087158203,
+    "y": 5624.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "d1afb38c.0141a8",
+    "id": "3d7bbeb8.4fb6ea",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3735.883331298828,
-    "y": 4539.883331298828,
-    "z": "7062000.f761",
+    "x": 3703.883331298828,
+    "y": 4532.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "42d36cb1.4fa424",
+    "id": "b16bd91d.551568",
     "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": 4069.883331298828,
-    "y": 4722.883331298828,
-    "z": "7062000.f761",
+    "x": 4037.883331298828,
+    "y": 4715.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "298d7f45.2553b",
+    "id": "17af28da.ceda4f",
     "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": 3681.883331298828,
-    "y": 4589.883331298828,
-    "z": "7062000.f761",
+    "x": 3649.883331298828,
+    "y": 4582.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9ef5d43.2b0bca8",
-        "3ef07e30.e6e7da",
-        "f6dffd82.1f8af"
+        "1c28f8e9.5cfb07",
+        "7bdf0726.9bbbb8",
+        "d03c4576.8b0b7"
       ]
     ]
   },
   {
-    "id": "3ef07e30.e6e7da",
+    "id": "7bdf0726.9bbbb8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3909.374298095703,
-    "y": 4562.457305908203,
-    "z": "7062000.f761",
+    "x": 3877.374298095703,
+    "y": 4555.457305908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "afd7cfee.d60a88"
+        "6a9d8f.c783f27"
       ]
     ]
   },
   {
-    "id": "f6dffd82.1f8af",
+    "id": "d03c4576.8b0b7",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3904.883331298828,
-    "y": 4606.883270263672,
-    "z": "7062000.f761",
+    "x": 3872.883331298828,
+    "y": 4599.883270263672,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "718ca986.9a7a48"
+        "732d0fc7.ef1e4"
       ]
     ]
   },
   {
-    "id": "afd7cfee.d60a88",
+    "id": "6a9d8f.c783f27",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4071.945831298828,
-    "y": 4561.743011474609,
-    "z": "7062000.f761",
+    "x": 4039.945831298828,
+    "y": 4554.743011474609,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "718ca986.9a7a48",
+    "id": "732d0fc7.ef1e4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4072.883331298828,
-    "y": 4606.883270263672,
-    "z": "7062000.f761",
+    "x": 4040.883331298828,
+    "y": 4599.883270263672,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "bbe16e71.3e09e8",
+    "id": "2b632ac5.849276",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3857.883331298828,
-    "y": 4679.883331298828,
-    "z": "7062000.f761",
+    "x": 3825.883331298828,
+    "y": 4672.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "2abf34d.6a0b3cc",
-        "42d36cb1.4fa424"
+        "d3a7ff82.f011",
+        "b16bd91d.551568"
       ]
     ]
   },
   {
-    "id": "9ef5d43.2b0bca8",
+    "id": "1c28f8e9.5cfb07",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3688.883331298828,
-    "y": 4679.883331298828,
-    "z": "7062000.f761",
+    "x": 3656.883331298828,
+    "y": 4672.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "bbe16e71.3e09e8"
+        "2b632ac5.849276"
       ]
     ]
   },
   {
-    "id": "2abf34d.6a0b3cc",
+    "id": "d3a7ff82.f011",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4046.883331298828,
-    "y": 4671.883331298828,
-    "z": "7062000.f761",
+    "x": 4014.883331298828,
+    "y": 4664.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "4ebb86dc.a0713",
+    "id": "2c43e5ee.399d8a",
     "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": 3879.883331298828,
-    "y": 4817.883331298828,
-    "z": "7062000.f761",
+    "x": 3847.883331298828,
+    "y": 4810.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "e230ac3e.9cb188",
+    "id": "97722063.27aea",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3662.883331298828,
-    "y": 2900.883331298828,
-    "z": "7062000.f761",
+    "x": 3630.883331298828,
+    "y": 2893.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3d29417.d2eee3e",
+    "id": "65778a7a.89ed44",
     "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": 3517.883331298828,
-    "y": 4467.883331298828,
-    "z": "7062000.f761",
+    "x": 3485.883331298828,
+    "y": 4460.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "c01a7bbf.331a48",
+    "id": "a2d538df.980d68",
     "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": 3290.883331298828,
-    "y": 4735.883331298828,
-    "z": "7062000.f761",
+    "x": 3258.883331298828,
+    "y": 4728.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "19c2896c.95fdb7",
-        "cde01ebb.100c6"
+        "43a12633.7a37a8",
+        "6d14b300.778b24"
       ]
     ]
   },
   {
-    "id": "adcb6448.ea7478",
+    "id": "7ebd19ad.940af8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3122.883331298828,
-    "y": 4738.883331298828,
-    "z": "7062000.f761",
+    "x": 3090.883331298828,
+    "y": 4731.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c01a7bbf.331a48"
+        "a2d538df.980d68"
       ]
     ]
   },
   {
-    "id": "cde01ebb.100c6",
+    "id": "6d14b300.778b24",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3453.883331298828,
-    "y": 4754.883331298828,
-    "z": "7062000.f761",
+    "x": 3421.883331298828,
+    "y": 4747.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "68da37f9.05cc18"
+        "d74b6b50.22dd88"
       ]
     ]
   },
   {
-    "id": "19c2896c.95fdb7",
+    "id": "43a12633.7a37a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3489.883331298828,
-    "y": 3361.883331298828,
-    "z": "7062000.f761",
+    "x": 3457.883331298828,
+    "y": 3354.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b19d09a1.5b2a5"
+        "fd9ecd52.f0eec"
       ]
     ]
   },
   {
-    "id": "e9cce0c6.04cdf8",
+    "id": "58f27ca9.e6694c",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3805.883331298828,
-    "y": 3413.883331298828,
-    "z": "7062000.f761",
+    "x": 3773.883331298828,
+    "y": 3406.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "24dd4d51.dc7852",
-        "a81116be.6c3738"
+        "f8970eb9.db20d",
+        "767d527f.e764f4"
       ]
     ]
   },
   {
-    "id": "24dd4d51.dc7852",
+    "id": "f8970eb9.db20d",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4010.883331298828,
-    "y": 3409.883331298828,
-    "z": "7062000.f761",
+    "x": 3978.883331298828,
+    "y": 3402.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a81116be.6c3738",
+    "id": "767d527f.e764f4",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4012.883331298828,
-    "y": 3459.883331298828,
-    "z": "7062000.f761",
+    "x": 3980.883331298828,
+    "y": 3452.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "29997430.010c94"
+        "e0571d8f.b0d5c"
       ]
     ]
   },
   {
-    "id": "29997430.010c94",
+    "id": "e0571d8f.b0d5c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4168.883331298828,
-    "y": 3465.883331298828,
-    "z": "7062000.f761",
+    "x": 4136.883331298828,
+    "y": 3458.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f4475341.93d378",
-        "4264dea0.b43bb8",
-        "5f09d2da.19bfa4",
-        "c71fd59.dfc0428"
+        "29bbf41c.92a224",
+        "892518e7.2c6e68",
+        "36c28209.5e5a0e",
+        "b822f518.1b138"
       ]
     ]
   },
   {
-    "id": "f4475341.93d378",
+    "id": "29bbf41c.92a224",
     "type": "set",
     "name": "set bwModified",
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 4394.883575439453,
-    "y": 3206.883331298828,
-    "z": "7062000.f761",
+    "x": 4362.883575439453,
+    "y": 3199.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5f1f0cb4.e46a84",
+    "id": "f218f6e.d910588",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4926.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4894.883056640625,
+    "y": 4286.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "293be2f2.0d66a6",
-        "898be63d.63497"
+        "a5aad4b.a7f08a8",
+        "7594985d.bdad18"
       ]
     ]
   },
   {
-    "id": "898be63d.63497",
+    "id": "7594985d.bdad18",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5128.8828125,
-    "y": 4260.88330078125,
-    "z": "7062000.f761",
+    "x": 5096.8828125,
+    "y": 4253.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "853d7a8b.2e02f",
+    "id": "a04d2a4d.17b14",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4812.88330078125,
-    "y": 4470.883056640625,
-    "z": "7062000.f761",
+    "x": 4780.88330078125,
+    "y": 4463.883056640625,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1915e47b.7ebf64",
+    "id": "3892fdc5.2518b2",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4809.9454345703125,
-    "y": 4419.743072509766,
-    "z": "7062000.f761",
+    "x": 4777.9454345703125,
+    "y": 4412.743072509766,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "caf66330.b1b298",
+    "id": "809a6f2e.e2cff",
     "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": 4392.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4360.883056640625,
+    "y": 4286.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ee97b865.b6783"
+        "663c1b4b.a64fcc"
       ]
     ]
   },
   {
-    "id": "ee97b865.b6783",
+    "id": "663c1b4b.a64fcc",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4597.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4565.883056640625,
+    "y": 4286.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c8ca8353.4e5678"
+        "4c765f5a.bea65"
       ]
     ]
   },
   {
-    "id": "c8ca8353.4e5678",
+    "id": "4c765f5a.bea65",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4763.883056640625,
-    "y": 4293.88330078125,
-    "z": "7062000.f761",
+    "x": 4731.883056640625,
+    "y": 4286.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5f1f0cb4.e46a84"
+        "f218f6e.d910588"
       ]
     ]
   },
   {
-    "id": "293be2f2.0d66a6",
+    "id": "a5aad4b.a7f08a8",
     "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": 4435.883056640625,
-    "y": 4371.88330078125,
-    "z": "7062000.f761",
+    "x": 4403.883056640625,
+    "y": 4364.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "82c1720.e28a61",
-        "745eb7b1.5e824",
-        "fa83b701.248a2"
+        "6b0b4a54.7d0dd4",
+        "c44b1722.eadf8",
+        "30cd81de.fee396"
       ]
     ]
   },
   {
-    "id": "82c1720.e28a61",
+    "id": "6b0b4a54.7d0dd4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4646.883056640625,
-    "y": 4373.88330078125,
-    "z": "7062000.f761",
+    "x": 4614.883056640625,
+    "y": 4366.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "74de082.69b8bf8"
+        "d1d7ad20.29b52"
       ]
     ]
   },
   {
-    "id": "745eb7b1.5e824",
+    "id": "c44b1722.eadf8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4647.3740234375,
-    "y": 4419.457336425781,
-    "z": "7062000.f761",
+    "x": 4615.3740234375,
+    "y": 4412.457336425781,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1915e47b.7ebf64"
+        "3892fdc5.2518b2"
       ]
     ]
   },
   {
-    "id": "fa83b701.248a2",
+    "id": "30cd81de.fee396",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4644.883056640625,
-    "y": 4462.88330078125,
-    "z": "7062000.f761",
+    "x": 4612.883056640625,
+    "y": 4455.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "853d7a8b.2e02f"
+        "a04d2a4d.17b14"
       ]
     ]
   },
   {
-    "id": "b19d09a1.5b2a5",
+    "id": "fd9ecd52.f0eec",
     "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": 3679.883331298828,
-    "y": 3256.883331298828,
-    "z": "7062000.f761",
+    "x": 3647.883331298828,
+    "y": 3249.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9b46823e.72756",
-        "35aaafce.bf5cc8",
-        "d1f12cfb.14a2c8"
+        "3062cdfd.42c69a",
+        "db9f52e5.d7dfa8",
+        "aae84cfb.f1edc"
       ]
     ]
   },
   {
-    "id": "35aaafce.bf5cc8",
+    "id": "db9f52e5.d7dfa8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3907.374298095703,
-    "y": 3229.457305908203,
-    "z": "7062000.f761",
+    "x": 3875.374298095703,
+    "y": 3222.457305908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c379ee48.9a04a"
+        "557116c4.068f88"
       ]
     ]
   },
   {
-    "id": "d1f12cfb.14a2c8",
+    "id": "aae84cfb.f1edc",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3902.883331298828,
-    "y": 3273.883270263672,
-    "z": "7062000.f761",
+    "x": 3870.883331298828,
+    "y": 3266.883270263672,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7e073ce5.e1fbec"
+        "270e15a6.70575a"
       ]
     ]
   },
   {
-    "id": "c379ee48.9a04a",
+    "id": "557116c4.068f88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4069.945831298828,
-    "y": 3228.7430114746094,
-    "z": "7062000.f761",
+    "x": 4037.945831298828,
+    "y": 3221.7430114746094,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7e073ce5.e1fbec",
+    "id": "270e15a6.70575a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4070.883331298828,
-    "y": 3273.883270263672,
-    "z": "7062000.f761",
+    "x": 4038.883331298828,
+    "y": 3266.883270263672,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9b46823e.72756",
+    "id": "3062cdfd.42c69a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3914.883331298828,
-    "y": 3323.883331298828,
-    "z": "7062000.f761",
+    "x": 3882.883331298828,
+    "y": 3316.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e9cce0c6.04cdf8"
+        "58f27ca9.e6694c"
       ]
     ]
   },
   {
-    "id": "715dcd2e.3d9a6c",
+    "id": "d823dcb2.3ea1b",
     "type": "comment",
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
     "info": "",
     "comments": "",
-    "x": 3804.7666625976562,
-    "y": 3514.7666625976562,
-    "z": "7062000.f761",
+    "x": 3772.7666625976562,
+    "y": 3507.7666625976562,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "b78f20d3.5b466",
+    "id": "a7eccb2d.bd2018",
     "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": 3819.483428955078,
-    "y": 3866.566680908203,
-    "z": "7062000.f761",
+    "x": 3787.483428955078,
+    "y": 3859.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9e72dea1.067a48",
+    "id": "a53a5ddb.dd60f",
     "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": 3957.483428955078,
-    "y": 3924.566680908203,
-    "z": "7062000.f761",
+    "x": 3925.483428955078,
+    "y": 3917.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "4264dea0.b43bb8",
+    "id": "892518e7.2c6e68",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3535.483428955078,
-    "y": 3605.966583251953,
-    "z": "7062000.f761",
+    "x": 3503.483428955078,
+    "y": 3598.966583251953,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ea9a5f5d.8f9bf8",
-        "1c248a70.8f6db6",
-        "1f0e75d7.8b5a2a"
+        "b4ed3622.c08",
+        "c0c356fb.babc",
+        "67daf127.7e6a38"
       ]
     ]
   },
   {
-    "id": "d32411c9.b56a18",
+    "id": "fce3ea32.0915b",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3776.483428955078,
-    "y": 4034.366729736328,
-    "z": "7062000.f761",
+    "x": 3744.483428955078,
+    "y": 4027.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e283eb67.9ec4b",
-        "f5e18bc8.e6b668"
+        "fda5acc2.f20fe",
+        "e480dda8.f10d98"
       ]
     ]
   },
   {
-    "id": "e283eb67.9ec4b",
+    "id": "fda5acc2.f20fe",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3969.483428955078,
-    "y": 4035.366729736328,
-    "z": "7062000.f761",
+    "x": 3937.483428955078,
+    "y": 4028.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ead422bf.e71108"
+        "90393c50.c5c688"
       ]
     ]
   },
   {
-    "id": "f5e18bc8.e6b668",
+    "id": "e480dda8.f10d98",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3973.483428955078,
-    "y": 4079.366729736328,
-    "z": "7062000.f761",
+    "x": 3941.483428955078,
+    "y": 4072.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c6dc9f70.44622"
+        "c7e0a8ee.d6f32"
       ]
     ]
   },
   {
-    "id": "c6dc9f70.44622",
+    "id": "c7e0a8ee.d6f32",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4112.483428955078,
-    "y": 4074.366729736328,
-    "z": "7062000.f761",
+    "x": 4080.483428955078,
+    "y": 4067.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "caf66330.b1b298"
+        "809a6f2e.e2cff"
       ]
     ]
   },
   {
-    "id": "ead422bf.e71108",
+    "id": "90393c50.c5c688",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4113.483428955078,
-    "y": 4031.566680908203,
-    "z": "7062000.f761",
+    "x": 4081.483428955078,
+    "y": 4024.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5f09d2da.19bfa4",
+    "id": "36c28209.5e5a0e",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4428.600372314453,
-    "y": 3463.166778564453,
-    "z": "7062000.f761",
+    "x": 4396.600372314453,
+    "y": 3456.166778564453,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d442302c.ca32e",
-        "7bb1b9a.4551dc8"
+        "beb5c16.4204b4",
+        "cf431e74.d4d548"
       ]
     ]
   },
   {
-    "id": "d442302c.ca32e",
+    "id": "beb5c16.4204b4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4627.767364501953,
-    "y": 3529.766632080078,
-    "z": "7062000.f761",
+    "x": 4595.767364501953,
+    "y": 3522.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7e28b551.d4ae3c"
+        "105d466c.be1d02"
       ]
     ]
   },
   {
-    "id": "7bb1b9a.4551dc8",
+    "id": "cf431e74.d4d548",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4649.767364501953,
-    "y": 3374.766632080078,
-    "z": "7062000.f761",
+    "x": 4617.767364501953,
+    "y": 3367.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ff62768e.03d4d"
+        "8c32ddc1.dc0d4"
       ]
     ]
   },
   {
-    "id": "c71fd59.dfc0428",
+    "id": "b822f518.1b138",
     "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": 4427.600372314453,
-    "y": 3318.366729736328,
-    "z": "7062000.f761",
+    "x": 4395.600372314453,
+    "y": 3311.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "5004b561.86b324",
+    "id": "3f7a0e0a.9d9b82",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4443.767364501953,
-    "y": 3271.766632080078,
-    "z": "7062000.f761",
+    "x": 4411.767364501953,
+    "y": 3264.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3679700e.bfb9b8",
+    "id": "fd150e87.231aa",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5112.533966064453,
-    "y": 3248.766632080078,
-    "z": "7062000.f761",
+    "x": 5080.533966064453,
+    "y": 3241.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "180c72db.e0ca25",
+    "id": "c5a29e92.7207c",
     "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": 5714.533966064453,
-    "y": 3353.766632080078,
-    "z": "7062000.f761",
+    "x": 5682.533966064453,
+    "y": 3346.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "eaf2956b.f5da68",
+    "id": "be41e2f.9cfd32",
     "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": 5104.533721923828,
-    "y": 3294.766632080078,
-    "z": "7062000.f761",
+    "x": 5072.533721923828,
+    "y": 3287.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "94b5c3f.97615c",
-        "5f9fd4c2.f09244",
-        "be126d8d.81e41"
+        "2e2379b.d7f7006",
+        "db5acda.eac92b",
+        "bc7f8b0.aa27df8"
       ]
     ]
   },
   {
-    "id": "5f9fd4c2.f09244",
+    "id": "db5acda.eac92b",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5332.024688720703,
-    "y": 3267.340606689453,
-    "z": "7062000.f761",
+    "x": 5300.024688720703,
+    "y": 3260.340606689453,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7b864f73.0d50b8"
+        "ac17b57a.282248"
       ]
     ]
   },
   {
-    "id": "be126d8d.81e41",
+    "id": "bc7f8b0.aa27df8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5327.533721923828,
-    "y": 3311.766571044922,
-    "z": "7062000.f761",
+    "x": 5295.533721923828,
+    "y": 3304.766571044922,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "20abe4f.26a359c"
+        "57de8cb.81497f4"
       ]
     ]
   },
   {
-    "id": "7b864f73.0d50b8",
+    "id": "ac17b57a.282248",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5494.596221923828,
-    "y": 3266.6263122558594,
-    "z": "7062000.f761",
+    "x": 5462.596221923828,
+    "y": 3259.6263122558594,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "20abe4f.26a359c",
+    "id": "57de8cb.81497f4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5495.533721923828,
-    "y": 3311.766571044922,
-    "z": "7062000.f761",
+    "x": 5463.533721923828,
+    "y": 3304.766571044922,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "cd6b80d0.dac0d8",
+    "id": "9014714c.903978",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5492.533721923828,
-    "y": 3361.766632080078,
-    "z": "7062000.f761",
+    "x": 5460.533721923828,
+    "y": 3354.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c08f6988.b1e668",
-        "180c72db.e0ca25"
+        "cb023eec.a5c808",
+        "c5a29e92.7207c"
       ]
     ]
   },
   {
-    "id": "94b5c3f.97615c",
+    "id": "2e2379b.d7f7006",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5323.533721923828,
-    "y": 3361.766632080078,
-    "z": "7062000.f761",
+    "x": 5291.533721923828,
+    "y": 3354.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cd6b80d0.dac0d8"
+        "9014714c.903978"
       ]
     ]
   },
   {
-    "id": "c08f6988.b1e668",
+    "id": "cb023eec.a5c808",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5674.534454345703,
-    "y": 3303.766632080078,
-    "z": "7062000.f761",
+    "x": 5642.534454345703,
+    "y": 3296.766632080078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "96b13181.04b1f8",
+    "id": "6d766032.1486b8",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4641.766662597656,
-    "y": 3336.7666625976562,
-    "z": "7062000.f761",
+    "x": 4609.766662597656,
+    "y": 3329.7666625976562,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a39bd08a.5e567",
+    "id": "56336637.740a88",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4640.600372314453,
-    "y": 3493.566680908203,
-    "z": "7062000.f761",
+    "x": 4608.600372314453,
+    "y": 3486.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "ca05c492.e4ea9",
+    "id": "e142830c.8ce718",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5089.600372314453,
-    "y": 3451.566680908203,
-    "z": "7062000.f761",
+    "x": 5057.600372314453,
+    "y": 3444.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6af65c6b.88b2a4",
+    "id": "253cc252.2e7476",
     "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": 5691.600372314453,
-    "y": 3556.566680908203,
-    "z": "7062000.f761",
+    "x": 5659.600372314453,
+    "y": 3549.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "e7dc732b.754658",
+    "id": "e936a38f.06f2b",
     "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": 5081.600128173828,
-    "y": 3497.566680908203,
-    "z": "7062000.f761",
+    "x": 5049.600128173828,
+    "y": 3490.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5192fc04.bc79ac",
-        "9675a219.e39ec8",
-        "491e7a3e.fd6efc"
+        "6f1b7a54.b4f3a4",
+        "7ba2b9f4.ea954",
+        "c55de303.d0cb4"
       ]
     ]
   },
   {
-    "id": "9675a219.e39ec8",
+    "id": "7ba2b9f4.ea954",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5309.091094970703,
-    "y": 3470.140655517578,
-    "z": "7062000.f761",
+    "x": 5277.091094970703,
+    "y": 3463.140655517578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "9eb1719c.df987"
+        "426bf991.15b6a8"
       ]
     ]
   },
   {
-    "id": "491e7a3e.fd6efc",
+    "id": "c55de303.d0cb4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5304.600128173828,
-    "y": 3514.566619873047,
-    "z": "7062000.f761",
+    "x": 5272.600128173828,
+    "y": 3507.566619873047,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "73d5ba80.efe18c"
+        "fe0c112c.8fb4f"
       ]
     ]
   },
   {
-    "id": "9eb1719c.df987",
+    "id": "426bf991.15b6a8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 5471.662628173828,
-    "y": 3469.4263610839844,
-    "z": "7062000.f761",
+    "x": 5439.662628173828,
+    "y": 3462.4263610839844,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "73d5ba80.efe18c",
+    "id": "fe0c112c.8fb4f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5472.600128173828,
-    "y": 3514.566619873047,
-    "z": "7062000.f761",
+    "x": 5440.600128173828,
+    "y": 3507.566619873047,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "49e14e2.90e413",
+    "id": "4702676.988cf18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5469.600128173828,
-    "y": 3564.566680908203,
-    "z": "7062000.f761",
+    "x": 5437.600128173828,
+    "y": 3557.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fc162869.747088",
-        "6af65c6b.88b2a4"
+        "2f82a117.e4a2be",
+        "253cc252.2e7476"
       ]
     ]
   },
   {
-    "id": "5192fc04.bc79ac",
+    "id": "6f1b7a54.b4f3a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5300.600128173828,
-    "y": 3564.566680908203,
-    "z": "7062000.f761",
+    "x": 5268.600128173828,
+    "y": 3557.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "49e14e2.90e413"
+        "4702676.988cf18"
       ]
     ]
   },
   {
-    "id": "fc162869.747088",
+    "id": "2f82a117.e4a2be",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5651.600860595703,
-    "y": 3506.566680908203,
-    "z": "7062000.f761",
+    "x": 5619.600860595703,
+    "y": 3499.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "af7611a6.c24d8",
+    "id": "f5580ce3.db6eb8",
     "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": 5006.600128173828,
-    "y": 3410.566680908203,
-    "z": "7062000.f761",
+    "x": 4974.600128173828,
+    "y": 3403.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "7e28b551.d4ae3c",
+    "id": "105d466c.be1d02",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4799.766662597656,
-    "y": 3518.7666625976562,
-    "z": "7062000.f761",
+    "x": 4767.766662597656,
+    "y": 3511.7666625976562,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "af7611a6.c24d8",
-        "e7dc732b.754658"
+        "f5580ce3.db6eb8",
+        "e936a38f.06f2b"
       ]
     ]
   },
   {
-    "id": "ff62768e.03d4d",
+    "id": "8c32ddc1.dc0d4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4820.500030517578,
-    "y": 3345.566680908203,
-    "z": "7062000.f761",
+    "x": 4788.500030517578,
+    "y": 3338.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d835bd5d.93ef8",
-        "eaf2956b.f5da68"
+        "b0b6c683.a43628",
+        "be41e2f.9cfd32"
       ]
     ]
   },
   {
-    "id": "d835bd5d.93ef8",
+    "id": "b0b6c683.a43628",
     "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": 5019.333526611328,
-    "y": 3163.366729736328,
-    "z": "7062000.f761",
+    "x": 4987.333526611328,
+    "y": 3156.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "2025b954.4fbac6",
+    "id": "c2cf98a5.f5859",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4414.649932861328,
-    "y": 3418.566680908203,
-    "z": "7062000.f761",
+    "x": 4382.649932861328,
+    "y": 3411.566680908203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "976feb0e.893a98",
+    "id": "53815df2.f3fe8c",
     "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": 3916.9833984375,
-    "y": 4197.3671875,
-    "z": "7062000.f761",
+    "x": 3884.9833984375,
+    "y": 4190.3671875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "a99b9bcd.cfe81",
+    "id": "1f65c294.737a2d",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3751.9833984375,
-    "y": 4269.567138671875,
-    "z": "7062000.f761",
+    "x": 3719.9833984375,
+    "y": 4262.567138671875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "98f48307.654f08",
-        "d531b9e1.8374e"
+        "d304f78f.a9e16",
+        "fe02c5f8.83fd58"
       ]
     ]
   },
   {
-    "id": "98f48307.654f08",
+    "id": "d304f78f.a9e16",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3962.9833984375,
-    "y": 4269.567138671875,
-    "z": "7062000.f761",
+    "x": 3930.9833984375,
+    "y": 4262.567138671875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c74f3bbd.636d88"
+        "632bbee5.d51fe8"
       ]
     ]
   },
   {
-    "id": "d531b9e1.8374e",
+    "id": "fe02c5f8.83fd58",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3958.9833984375,
-    "y": 4317.567138671875,
-    "z": "7062000.f761",
+    "x": 3926.9833984375,
+    "y": 4310.567138671875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7e7563eb.7c66dc"
+        "670f8deb.e1038c"
       ]
     ]
   },
   {
-    "id": "c74f3bbd.636d88",
+    "id": "632bbee5.d51fe8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4118.9833984375,
-    "y": 4265.567138671875,
-    "z": "7062000.f761",
+    "x": 4086.9833984375,
+    "y": 4258.567138671875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "6a777147.b443f8"
+        "e27123aa.cc28d"
       ]
     ]
   },
   {
-    "id": "7e7563eb.7c66dc",
+    "id": "670f8deb.e1038c",
     "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": 4106.9833984375,
-    "y": 4312.567138671875,
-    "z": "7062000.f761",
+    "x": 4074.9833984375,
+    "y": 4305.567138671875,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d69512d3.73027",
+    "id": "88c84935.d74a7",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4959.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4927.949493408203,
+    "y": 4572.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "cae5635c.9a1e2",
-        "6f0b5fb4.a1fb4"
+        "c788c95c.77178",
+        "1fda418f.a21f6e"
       ]
     ]
   },
   {
-    "id": "6f0b5fb4.a1fb4",
+    "id": "1fda418f.a21f6e",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5202.949737548828,
-    "y": 4548.765899658203,
-    "z": "7062000.f761",
+    "x": 5170.949737548828,
+    "y": 4541.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e903ccd1.487f98",
+    "id": "bffc0dc9.a62e08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4819.949493408203,
-    "y": 4689.765899658203,
-    "z": "7062000.f761",
+    "x": 4787.949493408203,
+    "y": 4682.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e80670f4.672e68"
+        "1b45b5a2.80df72"
       ]
     ]
   },
   {
-    "id": "c7ea39a3.498988",
+    "id": "5a207984.9538",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4807.949737548828,
-    "y": 4782.766143798828,
-    "z": "7062000.f761",
+    "x": 4775.949737548828,
+    "y": 4775.766143798828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3f0dd5a.ea39aaa",
+    "id": "ff47d1c6.a1d1",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4810.011871337891,
-    "y": 4737.625671386719,
-    "z": "7062000.f761",
+    "x": 4778.011871337891,
+    "y": 4730.625671386719,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "6a777147.b443f8",
+    "id": "e27123aa.cc28d",
     "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": 4425.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4393.949493408203,
+    "y": 4572.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b25b3b22.1646d"
+        "bdd7e518.23e34"
       ]
     ]
   },
   {
-    "id": "b25b3b22.1646d",
+    "id": "bdd7e518.23e34",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4630.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4598.949493408203,
+    "y": 4572.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e858f590.02822"
+        "e5bca59.0771c58"
       ]
     ]
   },
   {
-    "id": "e858f590.02822",
+    "id": "e5bca59.0771c58",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4796.949493408203,
-    "y": 4579.765899658203,
-    "z": "7062000.f761",
+    "x": 4764.949493408203,
+    "y": 4572.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d69512d3.73027"
+        "88c84935.d74a7"
       ]
     ]
   },
   {
-    "id": "cae5635c.9a1e2",
+    "id": "c788c95c.77178",
     "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": 4435.949493408203,
-    "y": 4689.765899658203,
-    "z": "7062000.f761",
+    "x": 4403.949493408203,
+    "y": 4682.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a8297a32.4725f",
-        "102b4f2b.1cfcf9",
-        "6f0b5913.92db28"
+        "9cbfda8d.34d6e8",
+        "7093291a.080b6",
+        "8f2c4a9c.eaf89"
       ]
     ]
   },
   {
-    "id": "a8297a32.4725f",
+    "id": "9cbfda8d.34d6e8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4646.949493408203,
-    "y": 4691.765899658203,
-    "z": "7062000.f761",
+    "x": 4614.949493408203,
+    "y": 4684.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e903ccd1.487f98"
+        "bffc0dc9.a62e08"
       ]
     ]
   },
   {
-    "id": "102b4f2b.1cfcf9",
+    "id": "7093291a.080b6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4647.440460205078,
-    "y": 4737.339935302734,
-    "z": "7062000.f761",
+    "x": 4615.440460205078,
+    "y": 4730.339935302734,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3f0dd5a.ea39aaa"
+        "ff47d1c6.a1d1"
       ]
     ]
   },
   {
-    "id": "6f0b5913.92db28",
+    "id": "8f2c4a9c.eaf89",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4644.949493408203,
-    "y": 4780.765899658203,
-    "z": "7062000.f761",
+    "x": 4612.949493408203,
+    "y": 4773.765899658203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c7ea39a3.498988"
+        "5a207984.9538"
       ]
     ]
   },
   {
-    "id": "e8e91e40.c50e3",
+    "id": "31c1ab24.2782c4",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 6055.766387939453,
-    "y": 7078.966827392578,
-    "z": "7062000.f761",
+    "x": 6023.766387939453,
+    "y": 7071.966827392578,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "12a072b1.a1936d",
+    "id": "3272cf3c.df27d8",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5324.2333984375,
-    "y": 4310.16650390625,
-    "z": "7062000.f761",
+    "x": 5292.2333984375,
+    "y": 4303.16650390625,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "74de082.69b8bf8",
+    "id": "d1d7ad20.29b52",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4826.233642578125,
-    "y": 4376.16650390625,
-    "z": "7062000.f761",
+    "x": 4794.233642578125,
+    "y": 4369.16650390625,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac63c59c.83048",
+    "id": "3f823260.f76936",
     "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": 5357.2333984375,
-    "y": 4378.16650390625,
-    "z": "7062000.f761",
+    "x": 5325.2333984375,
+    "y": 4371.16650390625,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e6f065d2.aee8e",
-        "6b430222.42764c"
+        "de937f43.9aff7",
+        "af59f95b.0de0c8"
       ]
     ]
   },
   {
-    "id": "e6f065d2.aee8e",
+    "id": "de937f43.9aff7",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5482.2333984375,
-    "y": 4276.166259765625,
-    "z": "7062000.f761",
+    "x": 5450.2333984375,
+    "y": 4269.166259765625,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3f51a421.f29684"
+        "31c7669e.9273ea"
       ]
     ]
   },
   {
-    "id": "6b430222.42764c",
+    "id": "af59f95b.0de0c8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5601.233428955078,
-    "y": 4350.166290283203,
-    "z": "7062000.f761",
+    "x": 5569.233428955078,
+    "y": 4343.166290283203,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "b946186b.4be33",
+    "id": "361b2cba.676744",
     "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": 4569.916534423828,
-    "y": 3921.883331298828,
-    "z": "7062000.f761",
+    "x": 4537.916534423828,
+    "y": 3914.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "402f3aa1.dbe4cc",
+    "id": "37ee69b4.cc11f6",
     "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": 4914.916534423828,
-    "y": 3783.883331298828,
-    "z": "7062000.f761",
+    "x": 4882.916534423828,
+    "y": 3776.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a579376d.bc3"
+        "35c1fec6.57172a"
       ]
     ]
   },
   {
-    "id": "d26cf0c5.68acc",
+    "id": "a8388031.3aed68",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4621.916534423828,
-    "y": 3777.883331298828,
-    "z": "7062000.f761",
+    "x": 4589.916534423828,
+    "y": 3770.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "402f3aa1.dbe4cc"
+        "37ee69b4.cc11f6"
       ]
     ]
   },
   {
-    "id": "e2cb41dc.f4c8f8",
+    "id": "a8458e1d.db654",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4876.916534423828,
-    "y": 3734.883331298828,
-    "z": "7062000.f761",
+    "x": 4844.916534423828,
+    "y": 3727.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "72812dae.8552e4",
+    "id": "f592965f.32c0e8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4565.916534423828,
-    "y": 3829.883331298828,
-    "z": "7062000.f761",
+    "x": 4533.916534423828,
+    "y": 3822.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "82192f60.51b328",
+    "id": "5ddf33c1.65a594",
     "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": 4573.916534423828,
-    "y": 3874.883331298828,
-    "z": "7062000.f761",
+    "x": 4541.916534423828,
+    "y": 3867.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "37b8f0e0.bc121",
+    "id": "76b17a13.8ea0bc",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4570.916534423828,
-    "y": 3727.883331298828,
-    "z": "7062000.f761",
+    "x": 4538.916534423828,
+    "y": 3720.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a579376d.bc3",
+    "id": "35c1fec6.57172a",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4823.916534423828,
-    "y": 3851.883331298828,
-    "z": "7062000.f761",
+    "x": 4791.916534423828,
+    "y": 3844.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "bcbc46d8.da70d8"
+        "a725ab73.c73ac"
       ]
     ]
   },
   {
-    "id": "bcbc46d8.da70d8",
+    "id": "a725ab73.c73ac",
     "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": 5008.916534423828,
-    "y": 3850.883331298828,
-    "z": "7062000.f761",
+    "x": 4976.916534423828,
+    "y": 3843.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "df0e838b.1a8"
+        "d15b8b2d.be0c58"
       ]
     ]
   },
   {
-    "id": "df0e838b.1a8",
+    "id": "d15b8b2d.be0c58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5200.916534423828,
-    "y": 3853.883331298828,
-    "z": "7062000.f761",
+    "x": 5168.916534423828,
+    "y": 3846.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "b552c813.211c2"
+        "8eebb571.fd6c9"
       ]
     ]
   },
   {
-    "id": "b552c813.211c2",
+    "id": "8eebb571.fd6c9",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5372.916534423828,
-    "y": 3849.883331298828,
-    "z": "7062000.f761",
+    "x": 5340.916534423828,
+    "y": 3842.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "9806e019.ad2a",
+    "id": "4b7e80ea.96d268",
     "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": 4748.916534423828,
-    "y": 3964.883331298828,
-    "z": "7062000.f761",
+    "x": 4716.916534423828,
+    "y": 3957.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea9a5f5d.8f9bf8",
+    "id": "b4ed3622.c08",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4265.916534423828,
-    "y": 3749.883331298828,
-    "z": "7062000.f761",
+    "x": 4233.916534423828,
+    "y": 3742.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4c3bbf42.6f3d68",
-        "e37c29b1.ce632",
-        "72812dae.8552e4",
-        "82192f60.51b328",
-        "b946186b.4be33",
-        "d26cf0c5.68acc",
-        "9806e019.ad2a"
+        "26ef8b2b.34003c",
+        "269ffcd4.c70e7c",
+        "f592965f.32c0e8",
+        "5ddf33c1.65a594",
+        "361b2cba.676744",
+        "a8388031.3aed68",
+        "4b7e80ea.96d268"
       ]
     ]
   },
   {
-    "id": "805d495b.3d6b18",
+    "id": "ce279396.ecc818",
     "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": 4250.916534423828,
-    "y": 3683.883331298828,
-    "z": "7062000.f761",
+    "x": 4218.916534423828,
+    "y": 3676.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e37c29b1.ce632",
+    "id": "269ffcd4.c70e7c",
     "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": 4629.916534423828,
-    "y": 3670.883331298828,
-    "z": "7062000.f761",
+    "x": 4597.916534423828,
+    "y": 3663.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "942a4caf.d868d8",
-        "8905a79d.0fb76",
-        "e2cb41dc.f4c8f8"
+        "2b1251d3.218d36",
+        "69b1ddc7.bc8184",
+        "a8458e1d.db654"
       ]
     ]
   },
   {
-    "id": "942a4caf.d868d8",
+    "id": "2b1251d3.218d36",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4865.916534423828,
-    "y": 3653.883331298828,
-    "z": "7062000.f761",
+    "x": 4833.916534423828,
+    "y": 3646.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8905a79d.0fb76",
+    "id": "69b1ddc7.bc8184",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4862.916534423828,
-    "y": 3694.883331298828,
-    "z": "7062000.f761",
+    "x": 4830.916534423828,
+    "y": 3687.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "4c3bbf42.6f3d68",
+    "id": "26ef8b2b.34003c",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4578.916534423828,
-    "y": 3627.883331298828,
-    "z": "7062000.f761",
+    "x": 4546.916534423828,
+    "y": 3620.883331298828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "94da922f.c01d98",
+    "id": "a7d12ef0.b4e948",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5308.316436767578,
-    "y": 4677.283233642578,
-    "z": "7062000.f761",
+    "x": 5276.316436767578,
+    "y": 4670.283233642578,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e80670f4.672e68",
+    "id": "1b45b5a2.80df72",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5097.316436767578,
-    "y": 4739.283233642578,
-    "z": "7062000.f761",
+    "x": 5065.316436767578,
+    "y": 4732.283233642578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ed69a679.8ddb2"
+        "ed1b64d5.33faa"
       ]
     ]
   },
   {
-    "id": "ed69a679.8ddb2",
+    "id": "ed1b64d5.33faa",
     "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": 5341.316436767578,
-    "y": 4745.283233642578,
-    "z": "7062000.f761",
+    "x": 5309.316436767578,
+    "y": 4738.283233642578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "90bf5e35.d23788",
-        "6659c466.b510dc"
+        "230e8d7f.cf5b82",
+        "8c0eb7af.7df34"
       ]
     ]
   },
   {
-    "id": "90bf5e35.d23788",
+    "id": "230e8d7f.cf5b82",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5572.316436767578,
-    "y": 4723.283233642578,
-    "z": "7062000.f761",
+    "x": 5540.316436767578,
+    "y": 4716.283233642578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5ef895fb.b1bf7c"
+        "626950bd.12ae3"
       ]
     ]
   },
   {
-    "id": "6659c466.b510dc",
+    "id": "8c0eb7af.7df34",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5577.316436767578,
-    "y": 4790.283233642578,
-    "z": "7062000.f761",
+    "x": 5545.316436767578,
+    "y": 4783.283233642578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ef985380.75ae68",
+    "id": "a8be8ed1.6d85c",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5826.2001953125,
-    "y": 4287.965576171875,
-    "z": "7062000.f761",
+    "x": 5794.2001953125,
+    "y": 4280.965576171875,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "76a7bc4a.dd01dc",
-        "c64cf61b.17568"
+        "5f515b8.97d0aa4",
+        "e3c5fe18.dd7758"
       ]
     ]
   },
   {
-    "id": "76a7bc4a.dd01dc",
+    "id": "5f515b8.97d0aa4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5981.200225830078,
-    "y": 4215.965850830078,
-    "z": "7062000.f761",
+    "x": 5949.200225830078,
+    "y": 4208.965850830078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "79b64e60.35626"
+        "b9ddbbac.4ceb18"
       ]
     ]
   },
   {
-    "id": "c64cf61b.17568",
+    "id": "e3c5fe18.dd7758",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5982.200225830078,
-    "y": 4348.965850830078,
-    "z": "7062000.f761",
+    "x": 5950.200225830078,
+    "y": 4341.965850830078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "d1f760ec.7590a"
+        "7f4f722.c77710c"
       ]
     ]
   },
   {
-    "id": "79b64e60.35626",
+    "id": "b9ddbbac.4ceb18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6126.200225830078,
-    "y": 4215.966094970703,
-    "z": "7062000.f761",
+    "x": 6094.200225830078,
+    "y": 4208.966094970703,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "a1fc801a.8dde7",
-        "f7199aa1.5a0618"
+        "c99d2def.311358",
+        "6bec6ba7.e1cedc"
       ]
     ]
   },
   {
-    "id": "a1fc801a.8dde7",
+    "id": "c99d2def.311358",
     "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": 6419.200225830078,
-    "y": 4193.965850830078,
-    "z": "7062000.f761",
+    "x": 6387.200225830078,
+    "y": 4186.965850830078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "f7199aa1.5a0618",
+    "id": "6bec6ba7.e1cedc",
     "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": 6370.850128173828,
-    "y": 4241.282745361328,
-    "z": "7062000.f761",
+    "x": 6338.850128173828,
+    "y": 4234.282745361328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "598a3c97.c62cd4",
+    "id": "9711fbcd.9495e8",
     "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": 6443.200225830078,
-    "y": 4154.965850830078,
-    "z": "7062000.f761",
+    "x": 6412.2001953125,
+    "y": 4135.965576171875,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d1f760ec.7590a",
+    "id": "7f4f722.c77710c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6138.200225830078,
-    "y": 4347.966094970703,
-    "z": "7062000.f761",
+    "x": 6106.200225830078,
+    "y": 4340.966094970703,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e43682b5.56552",
-        "8aed809d.a72bd8"
+        "59431729.1fb158",
+        "1fc311b.d897f6e"
       ]
     ]
   },
   {
-    "id": "e43682b5.56552",
+    "id": "59431729.1fb158",
     "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": 6431.200225830078,
-    "y": 4325.965850830078,
-    "z": "7062000.f761",
+    "x": 6399.200225830078,
+    "y": 4318.965850830078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8aed809d.a72bd8",
+    "id": "1fc311b.d897f6e",
     "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": 6382.850128173828,
-    "y": 4373.282745361328,
-    "z": "7062000.f761",
+    "x": 6350.850128173828,
+    "y": 4366.282745361328,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "3a2ab7c7.d2dab8",
+    "id": "1617355e.191edb",
     "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": 6455.200225830078,
-    "y": 4286.965850830078,
-    "z": "7062000.f761",
+    "x": 6423.200225830078,
+    "y": 4279.965850830078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5ef895fb.b1bf7c",
+    "id": "626950bd.12ae3",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5777.433135986328,
-    "y": 4730.166534423828,
-    "z": "7062000.f761",
+    "x": 5745.433135986328,
+    "y": 4723.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "3e55897.59031f6",
-        "a1d97b4a.208e4"
+        "a17c6b6f.2c879",
+        "a4050844.87c708"
       ]
     ]
   },
   {
-    "id": "3e55897.59031f6",
+    "id": "a17c6b6f.2c879",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5972.433135986328,
-    "y": 4658.166534423828,
-    "z": "7062000.f761",
+    "x": 5940.433135986328,
+    "y": 4651.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "1661a8d0.f6d65f"
+        "cccf95aa.d66d78"
       ]
     ]
   },
   {
-    "id": "a1d97b4a.208e4",
+    "id": "a4050844.87c708",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5973.433135986328,
-    "y": 4791.166534423828,
-    "z": "7062000.f761",
+    "x": 5941.433135986328,
+    "y": 4784.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "5810f31a.0a9ed4"
+        "90ce4884.5c53c8"
       ]
     ]
   },
   {
-    "id": "1661a8d0.f6d65f",
+    "id": "cccf95aa.d66d78",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6117.433135986328,
-    "y": 4658.166778564453,
-    "z": "7062000.f761",
+    "x": 6085.433135986328,
+    "y": 4651.166778564453,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "da6580ac.af986",
-        "ee810baa.63495"
+        "c37b260.db0c1d8",
+        "742aa3a0.c04704"
       ]
     ]
   },
   {
-    "id": "da6580ac.af986",
+    "id": "c37b260.db0c1d8",
     "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": 6410.433135986328,
-    "y": 4636.166534423828,
-    "z": "7062000.f761",
+    "x": 6378.433135986328,
+    "y": 4629.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "ee810baa.63495",
+    "id": "742aa3a0.c04704",
     "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": 6362.083038330078,
-    "y": 4683.483428955078,
-    "z": "7062000.f761",
+    "x": 6330.083038330078,
+    "y": 4676.483428955078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "87cf660.a2b3f18",
+    "id": "5708f1c2.de612",
     "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": 6434.433135986328,
-    "y": 4597.166534423828,
-    "z": "7062000.f761",
+    "x": 6402.433135986328,
+    "y": 4590.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5810f31a.0a9ed4",
+    "id": "90ce4884.5c53c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6129.433135986328,
-    "y": 4790.166778564453,
-    "z": "7062000.f761",
+    "x": 6097.433135986328,
+    "y": 4783.166778564453,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "80c260b2.6af7a",
-        "9a874787.276bd"
+        "9bebcf2c.a35908",
+        "bf7ecccc.77e158"
       ]
     ]
   },
   {
-    "id": "80c260b2.6af7a",
+    "id": "9bebcf2c.a35908",
     "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": 6422.433135986328,
-    "y": 4768.166534423828,
-    "z": "7062000.f761",
+    "x": 6390.433135986328,
+    "y": 4761.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "9a874787.276bd",
+    "id": "bf7ecccc.77e158",
     "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": 6374.083038330078,
-    "y": 4815.483428955078,
-    "z": "7062000.f761",
+    "x": 6342.083038330078,
+    "y": 4808.483428955078,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "815fc293.94d2f8",
+    "id": "898aa8ca.144488",
     "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": 6446.433135986328,
-    "y": 4729.166534423828,
-    "z": "7062000.f761",
+    "x": 6414.433135986328,
+    "y": 4722.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a537e9a.90f0c98",
+    "id": "3302d733.17cb08",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5185.283233642578,
-    "y": 5470.366729736328,
-    "z": "7062000.f761",
+    "x": 5153.283233642578,
+    "y": 5463.366729736328,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "d416487a.185998",
+    "id": "c4bba10e.ae5948",
     "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": 5183.066436767578,
-    "y": 5510.566925048828,
-    "z": "7062000.f761",
+    "x": 5151.066436767578,
+    "y": 5503.566925048828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "7898de27.66a698",
+    "id": "fba1ca00.18c228",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5058.316680908203,
-    "y": 5695.049835205078,
-    "z": "7062000.f761",
+    "x": 5026.316680908203,
+    "y": 5688.049835205078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "63d85a3d.4103fc",
+    "id": "bc2e1526.9ae628",
     "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": 5056.099884033203,
-    "y": 5735.250030517578,
-    "z": "7062000.f761",
+    "x": 5024.099884033203,
+    "y": 5728.250030517578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "105ea6a7.242f79",
+    "id": "c14b3eb1.3ce2b",
     "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": 5160.433135986328,
-    "y": 6178.166534423828,
-    "z": "7062000.f761",
+    "x": 5128.433135986328,
+    "y": 6171.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "8f43e7c7.1c41b8",
+    "id": "78d24bb0.4c8ea4",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4987.433135986328,
-    "y": 6235.166534423828,
-    "z": "7062000.f761",
+    "x": 4955.433135986328,
+    "y": 6228.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "4e0d7b1b.4cc2ec",
-        "609ed3b9.40f534"
+        "8d0d07ba.6f81c8",
+        "4ae3fa7f.c7968c"
       ]
     ]
   },
   {
-    "id": "4e0d7b1b.4cc2ec",
+    "id": "8d0d07ba.6f81c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5198.433135986328,
-    "y": 6235.166534423828,
-    "z": "7062000.f761",
+    "x": 5166.433135986328,
+    "y": 6228.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c2d7112c.1b117"
+        "7c55c647.3c8228"
       ]
     ]
   },
   {
-    "id": "609ed3b9.40f534",
+    "id": "4ae3fa7f.c7968c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5194.433135986328,
-    "y": 6283.166534423828,
-    "z": "7062000.f761",
+    "x": 5162.433135986328,
+    "y": 6276.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "fd4c4e47.075cf8"
+        "2e757361.f3de2c"
       ]
     ]
   },
   {
-    "id": "c2d7112c.1b117",
+    "id": "7c55c647.3c8228",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5354.433135986328,
-    "y": 6231.166534423828,
-    "z": "7062000.f761",
+    "x": 5322.433135986328,
+    "y": 6224.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "c4eacefe.2b5518",
-        "773bf221.e0586c",
-        "f38f117c.80c7b8"
+        "2cbacdde.26f332",
+        "94ab2e80.b69ba8",
+        "d5533498.f6f7f"
       ]
     ]
   },
   {
-    "id": "fd4c4e47.075cf8",
+    "id": "2e757361.f3de2c",
     "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": 5342.433135986328,
-    "y": 6278.166534423828,
-    "z": "7062000.f761",
+    "x": 5310.433135986328,
+    "y": 6271.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "a5cbc756.e321b8",
+    "id": "510063da.63ac6c",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5620.316925048828,
-    "y": 6331.049835205078,
-    "z": "7062000.f761",
+    "x": 5588.316925048828,
+    "y": 6324.049835205078,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "f38f117c.80c7b8",
+    "id": "d5533498.f6f7f",
     "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": 5618.100128173828,
-    "y": 6371.250030517578,
-    "z": "7062000.f761",
+    "x": 5586.100128173828,
+    "y": 6364.250030517578,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "773bf221.e0586c",
+    "id": "94ab2e80.b69ba8",
     "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": 5737.433135986328,
-    "y": 6283.166534423828,
-    "z": "7062000.f761",
+    "x": 5705.433135986328,
+    "y": 6276.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "c4eacefe.2b5518",
+    "id": "2cbacdde.26f332",
     "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": 5608.433135986328,
-    "y": 6231.166534423828,
-    "z": "7062000.f761",
+    "x": 5576.433135986328,
+    "y": 6224.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "5ff4d90f.61eca8",
+    "id": "d8a0b134.770b1",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5049.433135986328,
-    "y": 6136.166534423828,
-    "z": "7062000.f761",
+    "x": 5017.433135986328,
+    "y": 6129.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1a8fecd4.39509b",
+    "id": "54a65e87.65172",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4756.766143798828,
-    "y": 6218.166534423828,
-    "z": "7062000.f761",
+    "x": 4724.766143798828,
+    "y": 6211.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "105ea6a7.242f79",
-        "8f43e7c7.1c41b8"
+        "c14b3eb1.3ce2b",
+        "78d24bb0.4c8ea4"
       ]
     ]
   },
   {
-    "id": "2374b67.d3b424a",
+    "id": "11c77751.f259a1",
     "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": 5035.516632080078,
-    "y": 6533.166534423828,
-    "z": "7062000.f761",
+    "x": 5003.516632080078,
+    "y": 6526.166534423828,
+    "z": "1854297c.6f0f4f",
     "wires": [
       []
     ]
   },
   {
-    "id": "5d1aa304.0ec964",
+    "id": "7eabc766.dd7c8",
     "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": 3740.8837890625,
-    "y": 3809.88330078125,
-    "z": "7062000.f761",
+    "x": 3708.8837890625,
+    "y": 3802.88330078125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "1c248a70.8f6db6",
+    "id": "c0c356fb.babc",
     "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": 4493.4169921875,
-    "y": 4084,
-    "z": "7062000.f761",
+    "x": 4461.4169921875,
+    "y": 4077,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "e8d15ab4.54c49",
-        "20b8f97c.98322e",
-        "6302d7c5.b6ebe8"
+        "b8196ee9.4b3808",
+        "80c1418b.2150d8",
+        "56405931.8c65f8"
       ]
     ]
   },
   {
-    "id": "3d05d16c.2a1566",
+    "id": "eb18f7d.31abf88",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4595.4169921875,
-    "y": 4049,
-    "z": "7062000.f761",
+    "x": 4569.417236328125,
+    "y": 4033,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "e8d15ab4.54c49",
+    "id": "b8196ee9.4b3808",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4698.4169921875,
-    "y": 4081,
-    "z": "7062000.f761",
+    "x": 4666.4169921875,
+    "y": 4074,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "7ec23daa.6a0bc4"
+        "9aacf189.24898"
       ]
     ]
   },
   {
-    "id": "20b8f97c.98322e",
+    "id": "80c1418b.2150d8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4681.907958984375,
-    "y": 4142.574035644531,
-    "z": "7062000.f761",
+    "x": 4649.907958984375,
+    "y": 4135.574035644531,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "36ba2eea.c2f3b2"
+        "de469de6.448a8"
       ]
     ]
   },
   {
-    "id": "6302d7c5.b6ebe8",
+    "id": "56405931.8c65f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4679.4169921875,
-    "y": 4186,
-    "z": "7062000.f761",
+    "x": 4647.4169921875,
+    "y": 4179,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "949d59bf.9e67a"
+        "6c1db7b.a15c7c8"
       ]
     ]
   },
   {
-    "id": "7ec23daa.6a0bc4",
+    "id": "9aacf189.24898",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4866.417236328125,
-    "y": 4076,
-    "z": "7062000.f761",
+    "x": 4834.417236328125,
+    "y": 4069,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "df77d6a9.222ef"
+        "3b0478b5.ff78"
       ]
     ]
   },
   {
-    "id": "36ba2eea.c2f3b2",
+    "id": "de469de6.448a8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return 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": 4844.4793701171875,
-    "y": 4142.859771728516,
-    "z": "7062000.f761",
+    "x": 4812.4793701171875,
+    "y": 4135.859771728516,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "949d59bf.9e67a",
+    "id": "6c1db7b.a15c7c8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4846.4169921875,
-    "y": 4185,
-    "z": "7062000.f761",
+    "x": 4814.4169921875,
+    "y": 4178,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "df77d6a9.222ef",
+    "id": "3b0478b5.ff78",
     "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": 5104.417236328125,
-    "y": 4081,
-    "z": "7062000.f761",
+    "x": 5072.417236328125,
+    "y": 4074,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "abc8ebdb.52f0a8"
+        "b59112.09635ef"
       ]
     ]
   },
   {
-    "id": "abc8ebdb.52f0a8",
+    "id": "b59112.09635ef",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5338.4169921875,
-    "y": 4088,
-    "z": "7062000.f761",
+    "x": 5306.4169921875,
+    "y": 4081,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ac63c59c.83048"
+        "3f823260.f76936"
       ]
     ]
   },
   {
-    "id": "1f0e75d7.8b5a2a",
+    "id": "67daf127.7e6a38",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4472.11669921875,
-    "y": 4010,
-    "z": "7062000.f761",
+    "x": 4440.11669921875,
+    "y": 4003,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "bffd072f.5e512",
+    "id": "11444ec1.8e4d01",
     "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": 5755.2666015625,
-    "y": 4098.5830078125,
-    "z": "7062000.f761",
+    "x": 5723.2666015625,
+    "y": 4091.5830078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "f3f61fe0.c57dd"
+        "f98d1d31.14c4f8"
       ]
     ]
   },
   {
-    "id": "f3f61fe0.c57dd",
+    "id": "f98d1d31.14c4f8",
     "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": 5947.2666015625,
-    "y": 4087.583251953125,
-    "z": "7062000.f761",
+    "x": 5915.2666015625,
+    "y": 4080.583251953125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "8cedd329.3f3c9"
+        "894c5e31.55f348"
       ]
     ]
   },
   {
-    "id": "8cedd329.3f3c9",
+    "id": "894c5e31.55f348",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6129.2666015625,
-    "y": 4066.583251953125,
-    "z": "7062000.f761",
+    "x": 6097.2666015625,
+    "y": 4059.583251953125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "86e0777f.9370f"
+        "2837af93.7fedb8"
       ]
     ]
   },
   {
-    "id": "86e0777f.9370f",
+    "id": "2837af93.7fedb8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 6291.2666015625,
-    "y": 4055.583251953125,
-    "z": "7062000.f761",
+    "x": 6259.2666015625,
+    "y": 4048.583251953125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "869c4324.9670f",
-        "bbb484a7.96add8"
+        "75575304.c30724",
+        "fb102e8c.f8d02"
       ]
     ]
   },
   {
-    "id": "869c4324.9670f",
+    "id": "75575304.c30724",
     "type": "set",
     "name": "unset tmp.the-connectivity",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
     "comments": "",
-    "x": 6488.2666015625,
-    "y": 3984.583251953125,
-    "z": "7062000.f761",
+    "x": 6456.2666015625,
+    "y": 3977.583251953125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "3f51a421.f29684",
+    "id": "812bc4de.8330d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5609.216796875,
-    "y": 4214.582763671875,
-    "z": "7062000.f761",
+    "x": 5630.216796875,
+    "y": 4206.5830078125,
+    "z": "1854297c.6f0f4f",
     "wires": [
       [
-        "ef985380.75ae68",
-        "bffd072f.5e512",
-        "bbf89c4c.2b2c98",
-        "55e59a7f.53654c"
+        "a8be8ed1.6d85c",
+        "11444ec1.8e4d01",
+        "7f9cffe2.08c768",
+        "8c2c4043.586498"
       ]
     ]
   },
   {
-    "id": "bbf89c4c.2b2c98",
+    "id": "7f9cffe2.08c768",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5793.783203125,
-    "y": 3988.800048828125,
-    "z": "7062000.f761",
+    "x": 5761.783203125,
+    "y": 3981.800048828125,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "55e59a7f.53654c",
+    "id": "8c2c4043.586498",
     "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": 5785.783203125,
-    "y": 4037.800048828125,
-    "z": "7062000.f761",
+    "x": 5753.783203125,
+    "y": 4030.800048828125,
+    "z": "1854297c.6f0f4f",
+    "wires": []
+  },
+  {
+    "id": "fb102e8c.f8d02",
+    "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": 6461.7333984375,
+    "y": 4086.800048828125,
+    "z": "1854297c.6f0f4f",
+    "wires": []
+  },
+  {
+    "id": "a9133f1b.8373c8",
+    "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": 5755,
+    "y": 3805,
+    "z": "1854297c.6f0f4f",
+    "wires": []
+  },
+  {
+    "id": "4b95d87b.bccc58",
+    "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": 5909,
+    "y": 3857,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "31c7669e.9273ea",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5500,
+    "y": 3924,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "4b95d87b.bccc58",
+        "26b17ecc.f40902",
+        "a9133f1b.8373c8"
+      ]
+    ]
+  },
+  {
+    "id": "26b17ecc.f40902",
+    "type": "switchNode",
+    "name": "switch $foundVpnName",
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5754,
+    "y": 3912,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "245d39b1.fcc7b6"
+      ]
+    ]
+  },
+  {
+    "id": "245d39b1.fcc7b6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5933,
+    "y": 3911,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "812bc4de.8330d"
+      ]
+    ]
+  },
+  {
+    "id": "2f3de295.447b1e",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4631,
+    "y": 7429,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "48382561.04ccdc",
+        "a0fe64b2.d649a",
+        "3a51bb36.70835c"
+      ]
+    ]
+  },
+  {
+    "id": "3a51bb36.70835c",
+    "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": 4854,
+    "y": 7373,
+    "z": "1854297c.6f0f4f",
     "wires": []
   },
   {
-    "id": "bbb484a7.96add8",
+    "id": "48382561.04ccdc",
+    "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": 5033,
+    "y": 7416,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a0fe64b2.d649a",
+    "type": "switchNode",
+    "name": "switch $foundVpnName",
+    "xml": "<switch test=\"`$foundVpnName`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4878,
+    "y": 7471,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "e761a2b0.d43cc"
+      ]
+    ]
+  },
+  {
+    "id": "e761a2b0.d43cc",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5057,
+    "y": 7470,
+    "z": "1854297c.6f0f4f",
+    "wires": [
+      [
+        "ed22a86b.d791b8"
+      ]
+    ]
+  },
+  {
+    "id": "9efae615.dd5ab",
     "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",
+    "name": "unset tmp.aai.all-vpn-bindings",
+    "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 6485.7333984375,
-    "y": 4083.800048828125,
-    "z": "7062000.f761",
+    "x": 4788,
+    "y": 7109,
+    "z": "1854297c.6f0f4f",
     "wires": []
   }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.json
new file mode 100644
index 00000000..53740880
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.json
@@ -0,0 +1,678 @@
+[
+  {
+    "id": "31e5d2b5.0599fe",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='mmridx' start='0' end='`$tmp.aai.mmrconnectivity.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 236,
+    "y": 993,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "a78d056.b5ab7f8",
+        "e1cdc8ba.a395c"
+      ]
+    ]
+  },
+  {
+    "id": "e1cdc8ba.a395c",
+    "type": "set",
+    "name": "unset tmp.aai.mmrvpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.mmrvpn-binding.' value='' />\n",
+    "comments": "",
+    "x": 482,
+    "y": 949,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "a78d056.b5ab7f8",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$mmridx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 442,
+    "y": 993,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "7bf078a.9be4108"
+      ]
+    ]
+  },
+  {
+    "id": "7bf078a.9be4108",
+    "type": "outcome",
+    "name": "vpn-binding",
+    "xml": "<outcome value='vpn-binding'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 625.28564453125,
+    "y": 992.82177734375,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "215d3faa.f51c98"
+      ]
+    ]
+  },
+  {
+    "id": "215d3faa.f51c98",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 225,
+    "y": 1037,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "b17f0df1.95c4d8"
+      ]
+    ]
+  },
+  {
+    "id": "b17f0df1.95c4d8",
+    "type": "switchNode",
+    "name": "switch vpnNameToSearch",
+    "xml": "<switch test='`$vpnNameToSearch == $middle-man-conn.relationship-list.relationship[$mmridx].related-to-property[0].property-value`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 430,
+    "y": 1038,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "21e2127f.8c1dd6"
+      ]
+    ]
+  },
+  {
+    "id": "be70d08a.d902c8",
+    "type": "set",
+    "name": "unset foundVpnName",
+    "xml": "<set>\n<parameter name='foundVpnName' value='false' />\n",
+    "comments": "",
+    "x": 957,
+    "y": 136,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "21e2127f.8c1dd6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 610,
+    "y": 1038,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "de7119e9.e6ede"
+      ]
+    ]
+  },
+  {
+    "id": "de7119e9.e6ede",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 731,
+    "y": 1035,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "fd90809a.6ecd2",
+        "99d884af.46fd"
+      ]
+    ]
+  },
+  {
+    "id": "fd90809a.6ecd2",
+    "type": "set",
+    "name": "set foundVpnName",
+    "xml": "<set>\n<parameter name='foundVpnName' value='true' />\n",
+    "comments": "",
+    "x": 896,
+    "y": 1004,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "99d884af.46fd",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 859,
+    "y": 1049,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "6c40187e.e79158",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 157,
+    "y": 62,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "3a7938e1.994d7"
+      ]
+    ]
+  },
+  {
+    "id": "3a7938e1.994d7",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "outputs": 1,
+    "x": 441.2856903076172,
+    "y": 123.23810863494873,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "f46afc6.271308"
+      ]
+    ]
+  },
+  {
+    "id": "f46afc6.271308",
+    "type": "method",
+    "name": "method cll-vnf-topology-operation-cll-searchVpnName",
+    "xml": "<method rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 447.42860412597656,
+    "y": 208.00003051757812,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "45b2ac64.9618cc"
+      ]
+    ]
+  },
+  {
+    "id": "45b2ac64.9618cc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 757.238037109375,
+    "y": 199.66668701171875,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "be70d08a.d902c8",
+        "c0805bdc.60a32"
+      ]
+    ]
+  },
+  {
+    "id": "c0805bdc.60a32",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='mmridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 856,
+    "y": 289,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "7c17985e.24b9a8",
+        "2b1d3c50.df6fdc",
+        "cfff50b2.fe63"
+      ]
+    ]
+  },
+  {
+    "id": "2b1d3c50.df6fdc",
+    "type": "set",
+    "name": "unset tmp.aai.mmrconnectivity",
+    "xml": "<set>\n<parameter name='tmp.aai.mmrconnectivity.' value='' />\n",
+    "comments": "",
+    "x": 1078,
+    "y": 245,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "7c17985e.24b9a8",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$mmridx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1062,
+    "y": 289,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "f9896c6a.7a3708"
+      ]
+    ]
+  },
+  {
+    "id": "f9896c6a.7a3708",
+    "type": "outcome",
+    "name": "connectivity",
+    "xml": "<outcome value='connectivity'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1245.28564453125,
+    "y": 288.82177734375,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "30ebd3e5.770cf4"
+      ]
+    ]
+  },
+  {
+    "id": "30ebd3e5.770cf4",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 273,
+    "y": 394,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "82504752.c08ad8"
+      ]
+    ]
+  },
+  {
+    "id": "82504752.c08ad8",
+    "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[$mmridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.mmrconnectivity\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 480,
+    "y": 394,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "5f90d2a5.9f7054",
+        "65dc53f7.8e7784",
+        "1a9e510a.adb4e7"
+      ]
+    ]
+  },
+  {
+    "id": "5f90d2a5.9f7054",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 701,
+    "y": 367,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "87fec7ad.f202"
+      ]
+    ]
+  },
+  {
+    "id": "754c7814.0e8a58",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 855,
+    "y": 448,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "d131384d.b16ff8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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": 851.0623779296875,
+    "y": 403.8597717285156,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "65dc53f7.8e7784",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 688.490966796875,
+    "y": 403.57403564453125,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "d131384d.b16ff8"
+      ]
+    ]
+  },
+  {
+    "id": "1a9e510a.adb4e7",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 686,
+    "y": 447,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "754c7814.0e8a58"
+      ]
+    ]
+  },
+  {
+    "id": "ab4fd3e7.8abc6",
+    "type": "switchNode",
+    "name": "switch conn vlan same as curr ll",
+    "xml": "<!--<switch test=\"`$tmp.aai.all-connectivities.connectivity[$connidx].cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `\">-->\n<switch test=\"`$tmp.aai.mmrconnectivity.cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 285,
+    "y": 665,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "2c46c2f6.973bfe",
+        "85b72055.4d73f"
+      ]
+    ]
+  },
+  {
+    "id": "2c46c2f6.973bfe",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 496,
+    "y": 635,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "d5af698e.25e738"
+      ]
+    ]
+  },
+  {
+    "id": "85b72055.4d73f",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 494,
+    "y": 687,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "7ec9db69.7abb2c"
+      ]
+    ]
+  },
+  {
+    "id": "d5af698e.25e738",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 651,
+    "y": 636,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7ec9db69.7abb2c",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='connrelidx' start='0' end='`$tmp.aai.mmrconnectivity.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 678,
+    "y": 685,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "e28e2052.a958a",
+        "63bf8e12.beb788"
+      ]
+    ]
+  },
+  {
+    "id": "e28e2052.a958a",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 884,
+    "y": 685,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "f0e6ef1c.3db2d"
+      ]
+    ]
+  },
+  {
+    "id": "f0e6ef1c.3db2d",
+    "type": "outcome",
+    "name": "vpn-binding",
+    "xml": "<outcome value='vpn-binding'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1048.28564453125,
+    "y": 684.82177734375,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "402026e2.423eb8"
+      ]
+    ]
+  },
+  {
+    "id": "87fec7ad.f202",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 856,
+    "y": 362,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "ab4fd3e7.8abc6",
+        "8d8a1b19.f80f38"
+      ]
+    ]
+  },
+  {
+    "id": "63bf8e12.beb788",
+    "type": "set",
+    "name": "unset tmp.aai.mmrvpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.mmrvpn-binding.' value='' />\n",
+    "comments": "",
+    "x": 914,
+    "y": 623,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "402026e2.423eb8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 273,
+    "y": 804,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "d52369a5.e7da38"
+      ]
+    ]
+  },
+  {
+    "id": "d52369a5.e7da38",
+    "type": "switchNode",
+    "name": "switch vpnNameToSearch",
+    "xml": "<switch test='`$vpnNameToSearch == $tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].related-to-property[0].property-value`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 478,
+    "y": 805,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "24a01305.62ce64"
+      ]
+    ]
+  },
+  {
+    "id": "24a01305.62ce64",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 658,
+    "y": 805,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "9ddcd462.0017f"
+      ]
+    ]
+  },
+  {
+    "id": "9ddcd462.0017f",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 779,
+    "y": 802,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "fa3ceefe.cff1a",
+        "4d6041d5.dfff38"
+      ]
+    ]
+  },
+  {
+    "id": "fa3ceefe.cff1a",
+    "type": "set",
+    "name": "set foundVpnName",
+    "xml": "<set>\n<parameter name='foundVpnName' value='true' />\n",
+    "comments": "",
+    "x": 944,
+    "y": 771,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "4d6041d5.dfff38",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 907,
+    "y": 816,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "cfff50b2.fe63",
+    "type": "switchNode",
+    "name": "switch foundVpnName",
+    "xml": "<switch test='`$foundVpnName`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1103,
+    "y": 356,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "778f874f.3433e"
+      ]
+    ]
+  },
+  {
+    "id": "778f874f.3433e",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1283,
+    "y": 356,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      [
+        "4c396aea.bd0a8c"
+      ]
+    ]
+  },
+  {
+    "id": "4c396aea.bd0a8c",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 1417,
+    "y": 357,
+    "z": "c2ab5565.41fe58",
+    "wires": []
+  },
+  {
+    "id": "8d8a1b19.f80f38",
+    "type": "record",
+    "name": "record tmp.pce-src and dst node",
+    "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=\"`$tmp.aai.mmrconnectivity.cvlan`\"/>\n<parameter name=\"field2\" value=\"`$tmp.aai.network-route-LEAF.logical-interface-id`\"/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 290,
+    "y": 599,
+    "z": "c2ab5565.41fe58",
+    "wires": [
+      []
+    ]
+  }
+]
\ No newline at end of file
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 6af72c11..5c897a5b 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -299,3 +299,4 @@ GENERIC-RESOURCE-API cll-vnf-topology-operation-find-maximum-used-tpn ${project.
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-delete ${project.version} sync
 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
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
index 9a35f126..b2057862 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
@@ -565,7 +565,7 @@
                                                                                     <outcome value='success'>
                                                                                         <block atomic="true">
                                                                                             <set>
-                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -3]`' />
+                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
                                                                                             </set>
                                                                                         </block>
                                                                                     </outcome>
@@ -828,7 +828,7 @@
                                                                                     <outcome value='success'>
                                                                                         <block atomic="true">
                                                                                             <set>
-                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -3]`' />
+                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
                                                                                             </set>
                                                                                         </block>
                                                                                     </outcome>
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 0fc5dcd4..b928dba4 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
@@ -492,7 +492,7 @@
                                                    $param-prefix-domainA-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />
-                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`" />
                                                                                                         <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />
                                                                                                     </set>
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
@@ -693,7 +693,7 @@
                                                    $param-prefix-domainB-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />
-                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
                                                                                                     </set>
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>
@@ -1342,19 +1342,29 @@
                                                                                                                                                                     <outcome value='true'>
                                                                                                                                                                         <block atomic='true'>
                                                                                                                                                                             <set>
-                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />
                                                                                                                                                                             </set>
-                                                                                                                                                                            <set>
-                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                                                                                                                                                            </set>
-                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
-                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
-                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                            </update>
+                                                                                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>
+                                                                                                                                                                            <switch test="`$foundVpnName`">
+                                                                                                                                                                                <outcome value='true'>
+                                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                                        <set>
+                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                        </set>
+                                                                                                                                                                                        <set>
+                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                        </set>
+                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                            <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
+                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
+                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                        </update>
+                                                                                                                                                                                    </block>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                            </switch>
                                                                                                                                                                         </block>
                                                                                                                                                                     </outcome>
                                                                                                                                                                     <outcome value='false'></outcome>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
index dcc3d696..de311094 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
@@ -492,7 +492,7 @@
                                                    $param-prefix-domainA-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />
-                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`" />
                                                                                                         <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />
                                                                                                     </set>
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
@@ -693,7 +693,7 @@
                                                    $param-prefix-domainB-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />
-                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
                                                                                                     </set>
                                                                                                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
@@ -973,19 +973,29 @@
                                                                                                                                                                 <outcome value='true'>
                                                                                                                                                                     <block atomic='true'>
                                                                                                                                                                         <set>
-                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                            <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />
                                                                                                                                                                         </set>
-                                                                                                                                                                        <set>
-                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                                                                                                                                                        </set>
-                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
-                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />
-                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                        </update>
+                                                                                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>
+                                                                                                                                                                        <switch test="`$foundVpnName`">
+                                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                                <block atomic='true'>
+                                                                                                                                                                                    <set>
+                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                    </set>
+                                                                                                                                                                                    <set>
+                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                    </set>
+                                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                        <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                                        <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                        <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $bwToBeDecreased`' />
+                                                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                    </update>
+                                                                                                                                                                                </block>
+                                                                                                                                                                            </outcome>
+                                                                                                                                                                        </switch>
                                                                                                                                                                     </block>
                                                                                                                                                                 </outcome>
                                                                                                                                                                 <outcome value='false'></outcome>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml
index bb86aacf..58104d50 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml
@@ -9,6 +9,9 @@
             <set>
                 <parameter name='tmp.aai.ROOT.connectivity.' value="" />
             </set>
+            <set>
+                <parameter name='tmp.aai.helper-root-all-connectivities.' value="" />
+            </set>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                           resource="connectivities"
                           key="selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'"
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml
index 6e279384..87498016 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-connectivity.xml
@@ -9,6 +9,9 @@
             <set>
                 <parameter name='tmp.the-connectivity.' value="" />
             </set>
+            <set>
+                <parameter name='tmp.aai.helper-all-connectivities.' value="" />
+            </set>
             <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                           resource="connectivities"
                           key="selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'"
@@ -18,19 +21,51 @@
                     <block atomic="true">
                         <for index='helpconnidx' start='0' end='`$tmp.aai.helper-all-connectivities.connectivity_length`' >
                             <block atomic='true'>
-                                <switch test="`$tmp.current-provider-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`">
+                                <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                    <parameter name="logger" value="message-log" />
+                                    <parameter name="level" value="info" />
+                                    <parameter name="field1" value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`"/>
+                                </record>
+                                <switch test='`length($tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id) == 0`'>
                                     <outcome value='true'>
-                                        <block atomic='true'>
-                                            <switch test="`$tmp.current-cvlan-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].cvlan`">
+                                        <block></block>
+                                    </outcome>
+                                    <outcome value='false'>
+                                        <block>
+                                            <switch test="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id != ''`">
+                                                <outcome value='false'>
+                                                    <block></block>
+                                                </outcome>
                                                 <outcome value='true'>
-                                                    <block atomic='true'>
-                                                        <set>
-                                                            <parameter name='found-connectivity' value="true" />
-                                                        </set>
-                                                        <set>
-                                                            <parameter name='tmp.the-connectivity.' value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].`" />
-                                                        </set>
-                                                        <break/>
+                                                    <block>
+                                                        <switch test="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].vpn-type != 'mdsc' `">
+                                                            <outcome value='false'>
+                                                                <block></block>
+                                                            </outcome>
+                                                            <outcome value='true'>
+                                                                <block>
+                                                                    <switch test="`$tmp.current-provider-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].access-provider-id`">
+                                                                        <outcome value='true'>
+                                                                            <block atomic='true'>
+                                                                                <switch test="`$tmp.current-cvlan-id == $tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].cvlan`">
+                                                                                    <outcome value='true'>
+                                                                                        <block atomic='true'>
+                                                                                            <set>
+                                                                                                <parameter name='found-connectivity' value="true" />
+                                                                                            </set>
+                                                                                            <set>
+                                                                                                <parameter name='tmp.the-connectivity.' value="`$tmp.aai.helper-all-connectivities.connectivity[$helpconnidx].`" />
+                                                                                            </set>
+                                                                                            <break/>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
                                                     </block>
                                                 </outcome>
                                             </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.xml
index a9562ab5..3ad3c860 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-logic.xml
@@ -144,6 +144,7 @@
                                                                                                                                         <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
                                                                                                                                             <parameter name="filename" value="`$filenamebb`" />
                                                                                                                                         </execute>
+                                                                                                                                        <break/>
                                                                                                                                     </block>
                                                                                                                                 </outcome>
                                                                                                                             </switch>
@@ -190,6 +191,7 @@
                                                             </outcome>
                                                         </switch>
                                                     </for>
+                                                    <break/>
                                                 </block>
                                             </outcome>
                                         </switch>
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 76cea192..d01140f6 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
@@ -492,7 +492,7 @@
                                                    $param-prefix-domainA-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />
-                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop + '-' + $tmp.aai.network-route-A.logical-interface-id`" />
                                                                                                         <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />
                                                                                                     </set>
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
@@ -693,7 +693,7 @@
                                                    $param-prefix-domainB-pnfName[8]`" />
                                                                                                         <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
                                                                                                         <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />
-                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
                                                                                                     </set>
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>
@@ -1127,64 +1127,74 @@
                                                                                                                                                                         <outcome value='true'>
                                                                                                                                                                             <block atomic='true'>
                                                                                                                                                                                 <set>
-                                                                                                                                                                                    <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                    <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />
                                                                                                                                                                                 </set>
-                                                                                                                                                                                <set>
-                                                                                                                                                                                    <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                                                                                                                                                                </set>
-                                                                                                                                                                                <for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >
-                                                                                                                                                                                    <switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>
-                                                                                                                                                                                        <outcome value='connectivity'>
-                                                                                                                                                                                            <block atomic="true">
-                                                                                                                                                                                                <set>
-                                                                                                                                                                                                    <parameter name='tmp.the-connectivity.' value='' />
-                                                                                                                                                                                                </set>
-                                                                                                                                                                                                <set>
-                                                                                                                                                                                                    <parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />
-                                                                                                                                                                                                </set>
-                                                                                                                                                                                            </block>
-                                                                                                                                                                                        </outcome>
-                                                                                                                                                                                    </switch>
-                                                                                                                                                                                </for>
-                                                                                                                                                                                <switch test="`$tmp.isBwIncreased`">
+                                                                                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>
+                                                                                                                                                                                <switch test="`$foundVpnName`">
                                                                                                                                                                                     <outcome value='true'>
                                                                                                                                                                                         <block atomic='true'>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
-                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                            </update>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
-                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
-                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                            </update>
-                                                                                                                                                                                        </block>
-                                                                                                                                                                                    </outcome>
-                                                                                                                                                                                    <outcome value='false'>
-                                                                                                                                                                                        <block atomic='true'>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
-                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                            </update>
-                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
-                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
-                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
-                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
-                                                                                                                                                                                            </update>
+                                                                                                                                                                                            <set>
+                                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                            </set>
+                                                                                                                                                                                            <set>
+                                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                            </set>
+                                                                                                                                                                                            <for silentFailure='true' index='vpnbridx' start='0' end='`$tmp.aai.the-vpn-binding.relationship-list.relationship_length`' >
+                                                                                                                                                                                                <switch test='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].related-to`'>
+                                                                                                                                                                                                    <outcome value='connectivity'>
+                                                                                                                                                                                                        <block atomic="true">
+                                                                                                                                                                                                            <set>
+                                                                                                                                                                                                                <parameter name='tmp.the-connectivity.' value='' />
+                                                                                                                                                                                                            </set>
+                                                                                                                                                                                                            <set>
+                                                                                                                                                                                                                <parameter name='tmp.the-connectivity.connectivity-id' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />
+                                                                                                                                                                                                            </set>
+                                                                                                                                                                                                        </block>
+                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                </switch>
+                                                                                                                                                                                            </for>
+                                                                                                                                                                                            <switch test="`$tmp.isBwIncreased`">
+                                                                                                                                                                                                <outcome value='true'>
+                                                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $tmp.delta`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                                key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                            <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                            <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                            <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                            <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                    </block>
+                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                                <outcome value='false'>
+                                                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                            <parameter name='vpn-name' value='`$tmp.aai.the-vpn-binding.vpn-name`' />
+                                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher - $tmp.delta`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                                key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                            <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                            <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                            <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                            <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                        </update>
+                                                                                                                                                                                                    </block>
+                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                            </switch>
                                                                                                                                                                                         </block>
                                                                                                                                                                                     </outcome>
                                                                                                                                                                                 </switch>
@@ -1611,6 +1621,9 @@
                                                                                                                                                         <parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node`" />
                                                                                                                                                     </set>
                                                                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.aai.all-vpn-bindings.' value='' />
+                                                                                                                                                    </set>
                                                                                                                                                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                                                                                                                                                   resource="vpn-bindings"
                                                                                                                                                                   key="selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings"
@@ -1625,19 +1638,29 @@
                                                                                                                                                                                 <outcome value='true'>
                                                                                                                                                                                     <block atomic='true'>
                                                                                                                                                                                         <set>
-                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="" />
-                                                                                                                                                                                        </set>
-                                                                                                                                                                                        <set>
-                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                            <parameter name='vpnNameToSearch' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-name`" />
                                                                                                                                                                                         </set>
-                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                            <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
-                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
-                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                        </update>
+                                                                                                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync' ></call>
+                                                                                                                                                                                        <switch test="`$foundVpnName`">
+                                                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                                                <block atomic='true'>
+                                                                                                                                                                                                    <set>
+                                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                                    </set>
+                                                                                                                                                                                                    <set>
+                                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                                    </set>
+                                                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                                        <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
+                                                                                                                                                                                                        <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                        <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
+                                                                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                    </update>
+                                                                                                                                                                                                </block>
+                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                        </switch>
                                                                                                                                                                                     </block>
                                                                                                                                                                                 </outcome>
                                                                                                                                                                                 <outcome value='false'></outcome>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.xml
new file mode 100644
index 00000000..724f306b
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-searchVpnName.xml
@@ -0,0 +1,85 @@
+<service-logic
+        xmlns='http://www.onap.org/sdnc/svclogic'
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='cll-vnf-topology-operation-cll-searchVpnName' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='foundVpnName' value='false' />
+            </set>
+            <for silentFailure='true' index='mmridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >
+                <set>
+                    <parameter name='tmp.aai.mmrconnectivity.' value='' />
+                </set>
+                <switch test='`$middle-man-conn.relationship-list.relationship[$mmridx].related-to`'>
+                    <outcome value='connectivity'>
+                        <block atomic="true">
+                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                          resource="connectivity"
+                                          key="connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$mmridx].relationship-data[0].relationship-value"
+                                          local-only="false"
+                                          pfx="tmp.aai.mmrconnectivity" >
+                                <outcome value='success'>
+                                    <block>
+                                        <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+                                            <parameter name="logger" value="message-log" />
+                                            <parameter name="level" value="info" />
+                                            <parameter name="field1" value="`$tmp.aai.mmrconnectivity.cvlan`"/>
+                                            <parameter name="field2" value="`$tmp.aai.network-route-LEAF.logical-interface-id`"/>
+                                        </record>
+                                        <!--<switch test="`$tmp.aai.all-connectivities.connectivity[$connidx].cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `">-->
+                                        <switch test="`$tmp.aai.mmrconnectivity.cvlan == $tmp.aai.network-route-LEAF.logical-interface-id `">
+                                            <outcome value='false'>
+                                                <block></block>
+                                            </outcome>
+                                            <outcome value='true'>
+                                                <for silentFailure='true' index='connrelidx' start='0' end='`$tmp.aai.mmrconnectivity.relationship-list.relationship_length`' >
+                                                    <set>
+                                                        <parameter name='tmp.aai.mmrvpn-binding.' value='' />
+                                                    </set>
+                                                    <switch test='`$tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].related-to`'>
+                                                        <outcome value='vpn-binding'>
+                                                            <block atomic="true">
+                                                                <switch test='`$vpnNameToSearch == $tmp.aai.mmrconnectivity.relationship-list.relationship[$connrelidx].related-to-property[0].property-value`'>
+                                                                    <outcome value='true'>
+                                                                        <block>
+                                                                            <set>
+                                                                                <parameter name='foundVpnName' value='true' />
+                                                                            </set>
+                                                                            <break/>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </switch>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </outcome>
+                                        </switch>
+                                    </block>
+                                </outcome>
+                                <outcome value='not-found'>
+                                    <return status='failure'>
+                                        <parameter name='ack-final' value='Y'/>
+                                        <parameter name="error-code" value="500" />
+                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                    </return>
+                                </outcome>
+                                <outcome value='failure'>
+                                    <return status='failure'>
+                                        <parameter name='error-code' value='' />
+                                        <parameter name='error-message' value='' />
+                                    </return>
+                                </outcome>
+                            </get-resource>
+                        </block>
+                    </outcome>
+                </switch>
+                <switch test='`$foundVpnName`'>
+                    <outcome value='true'>
+                        <break/>
+                    </outcome>
+                </switch>
+            </for>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
-- 
cgit 1.2.3-korg